From patchwork Thu Sep 11 09:18:47 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc_Poulhi=C3=A8s?= X-Patchwork-Id: 120043 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 36E3E3858418 for ; Thu, 11 Sep 2025 09:32:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 36E3E3858418 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, secure) header.d=adacore.com header.i=@adacore.com header.a=rsa-sha256 header.s=google header.b=T99vk7Ph X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by sourceware.org (Postfix) with ESMTPS id DE3FF3858C66 for ; Thu, 11 Sep 2025 09:19:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DE3FF3858C66 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org DE3FF3858C66 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::332 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757582369; cv=none; b=m4djrVjqptUEgSiec9YXuXfh3Z1NW3lpbAVtuE0O+Rk8ho9EezlPYUofpBPjYWpXgeq1UPUR2skkCV+rsbM9hERTX7+u1unONTh3GJRF9WJtVlcRGgSQHBmfUs1l9+DZp6UBOvmFwvUX73gl8wFtpbAUmp1ZIRfm2+pk6Sz4jHs= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757582369; c=relaxed/simple; bh=p1FemgNkZ7X7G3BwCN/EqTkeWtgQfROr1/092K1v4h0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=e1wnsXWyvqxZOKqgCr/dPelKUq2tYVIN+FOOSWDF3dMLiyHN2u2O1i4q+MaCWE52scwVmnmGx5hlc1OiIbs2cVs5XNMzazjnYE1waadJ4NMbu1Lvnwpl9D1xfRVs+vKn5ukmvRZOpV+smJwTjFnupvwcKDeFbkEBhjJeF4Hllis= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DE3FF3858C66 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-45b9a856dc2so2970625e9.0 for ; Thu, 11 Sep 2025 02:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1757582367; x=1758187167; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=NrOseLxRzpwC2jwYJIKw52QNEN7hn2Qn4l4GSa8ZDIk=; b=T99vk7PhOErbm/4LqrNOa7+slG7TwidN1H/7QGRYLFzAs+K3B4aSeINBi0ksO6hQdR Rli4ZyCc6ozt6XLNXnZg1/ibNxQPuTSCQ8pgfnCbi4RbzkPtMnrqvLIr3iWLahQoFa7M EBJjDvS5MZLNcNNGomk5KsyW60jRT0PxgN9o0EYPNrROV1ZZ/a2/OMZ9Z9cHp2kSC400 V1wxYbJmnzuoAD3dclf+GIQrs+KFpcjLHHmPYIT/IXz02/TUXUhYhZv9P0tyfikO1+X+ iCB1H+g1unrUG5HBCdUVQwqvQmrSxddH3df764ahhOP+Clm+ATO0c230Wc7LIfEhBbBB mR2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1757582367; x=1758187167; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=NrOseLxRzpwC2jwYJIKw52QNEN7hn2Qn4l4GSa8ZDIk=; b=UFz2icg6eUcj6x0piiw9JRjrldh2a1dG8joSDKu0aw7ngdSdCN1GrM97CBTa+5h/8s gYAsQY7PO+cgevV04KdwDt4LdEdxnfbXqXqR+p2IMBQ9QRNCw7KRXupW0Dre1fBGPTTg nZlkAIwEeZo7YdE9iEcTXKS1mqlWC6kVnxOYwXJnKseweKaNwcyzcPgt20FlF9uLgOB/ nwFokBQYBw39up13uetev8uGohjBbO5c9dOq0mQ4IAH+XxfVvAVuq5W/6d8Ez0Fu2uEv e5J2SlG4N8HUPOVYWXypXOywy7XkYYhhAiN0oFdPgkx+Z2HrtEeEgnVi1rxwj+cNbds2 Z30Q== X-Gm-Message-State: AOJu0Yx70ZcyjMt1tD9nF+xoJo0PPmOOvqhXBeRMKsNEaecas2Tl+W/O uDBQ5CKKSd9lJrbqtwQ3bjchtrzPL7cc+g70CdZiAjSfSYu3UUwSt6nsvDX7M5xGXR5+VTIB3nb b/MM= X-Gm-Gg: ASbGncvZ5nDuYd3kf+YQ7NG3WuH1/lpdlwcFyr8EpoAsmlm3EB0Jfm1YA8J5cLA63c2 0V1cJzCzQcW7v5dnWGrupvSfKbsLofJoMGFaqR9QFYg4yj2itg1fNRodmN97oTWDE9TNThYTSwf 5BFFnwDtBkXlaNqzv0s7vMzLOqkm3y7ADbDXC+m31FfglNUirF07gZMH7nuwgxF0oud49mzq5Sh CvSpj4yJsyjNURrbyEjrX6UbylrvHXwRWVuqJ5GAX6KzRWKizub9FICvYESaROWoLW5hlYFjYsC CaLeZlO3u4teal6ZcFsanssrQx1gN0R4xbp3cVIIVVYmCI+ZJp8TZsm///AnBMVL4+0lZxVINP0 imfXuNoylSknpViUyW74jb1kC5d11tOPPK6nq1m3MPnEQ5TDhcgSEcu29W/jLBDTwoKkRTZ6Zyj 4ieQ9MySLXHgwpde/O27fJ5fFmpxNZ/RucnDuuaxGwHPQmOtYt X-Google-Smtp-Source: AGHT+IFAwH0acQBOc4M/z9nx8QKxDj2O0Moqygps4GghFTRdCWNdX44Zy4rzJKf4kmyGC2QUlvC1jg== X-Received: by 2002:a5d:64e4:0:b0:3d6:1610:1b6a with SMTP id ffacd0b85a97d-3e642f9154dmr13269529f8f.22.1757582367334; Thu, 11 Sep 2025 02:19:27 -0700 (PDT) Received: from poulhies-Precision-5550.telnowedge.local (lmontsouris-659-1-24-67.w81-250.abo.wanadoo.fr. [81.250.175.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3e7607cd27dsm1649971f8f.41.2025.09.11.02.19.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Sep 2025 02:19:26 -0700 (PDT) From: =?utf-8?q?Marc_Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Bob Duff Subject: [COMMITTED 15/31] ada: Fix regression in Root_Type -- adjustment Date: Thu, 11 Sep 2025 11:18:47 +0200 Message-ID: <20250911091904.1505690-15-poulhies@adacore.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250911091904.1505690-1-poulhies@adacore.com> References: <20250911091904.1505690-1-poulhies@adacore.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces~patchwork=sourceware.org@gcc.gnu.org From: Bob Duff Recent changes "Fix regression in Root_Type" and "Crash on b3a1004 with assertions enabled" are partially redundant; they are addressing the same bug. This patch adjusts the former in the case of Root_Type. But we leave Root_Type_If_Set alone; debugging printouts should survive bugs when possible. gcc/ada/ChangeLog: * einfo-utils.adb (Root_Type): Do not deal with missing Etype. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/einfo-utils.adb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb index 450d4c36b211..290ae331d37a 100644 --- a/gcc/ada/einfo-utils.adb +++ b/gcc/ada/einfo-utils.adb @@ -2585,11 +2585,7 @@ package body Einfo.Utils is loop Etyp := Etype (T); - if No (Etyp) then - Check_Error_Detected; - end if; - - exit when No (Etyp) or else T = Etyp + exit when T = Etyp or else (Is_Private_Type (T) and then Etyp = Full_View (T)) or else