From patchwork Thu Sep 11 09:18:46 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: 120040 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 6D90F385841C for ; Thu, 11 Sep 2025 09:30:58 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id A524C3858413 for ; Thu, 11 Sep 2025 09:19:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A524C3858413 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 A524C3858413 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757582368; cv=none; b=gPUiLWPaoA6GiE8KXJC0vrxNWlvLtWJDtITXuRTaHEqoRxQzbn3VZpQdG6o9l0RjYTTfRN7gr0r+m+a0R4edbUH1+3/VhlC0dXMNxCL1GExg70/7Nz9WaUsNibsibObJbzNl3Awvz9GO86hXbZHZWx/GnG9Ym7cVF2UBLRPraxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1757582368; c=relaxed/simple; bh=Xq30kS3n9IkbZ5RTy6IFV39ig8y4uvYcTvuMdCPbQPE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qxKJEk4x59JEurOy+eWnSjOtIDmRXMxjrf2wYX4qas/8fXwxXzk5uXVwltX+RE80vUtIWeQOIcn6qpCXCH54Y325uH17XyMxPDUYwhDFBBs8dY30f7GSF0hf5UcCP6/uo3IFhCtWzVN9rjdrPk07HVEw/AfNwqogjzmK8687dYM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A524C3858413 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=QDQC3Gsg Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3df726ecff3so294682f8f.3 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=voKtY9gXfuO1YTlrs0uNPgWFkgKxRq1zH+FTyN5wsYw=; b=QDQC3GsgI4q7a/c92P+hAFcw+vhNRRC3nAd5iHc3amB5WPwYV19wxP0lGff2ZxdVwq lP9m528cHtdIQRrQq3xe5eSbkInRmlLaIpmC7/dQTe+WTySU3q4MPeAxn7rZ8H8j1g2W QErutr6ebylGwHLQxBKfAf/sCuVduPjEdtntdLNrD7zsDDTn1FPGpKxDVX9Nxc37RCJs QjV314PfmDK2vdIKYcWFEd/CBO2jGpRwgt3Behfu9ybrPxTdXOc/JDYdPILPdVFf5Kmd 5UOV7zcTBo1qseP7mlEiideiuQaMDUn64tpZSdq2qsOFOO+moVx8As6asAZ3ioCSYFLL d8Lw== 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=voKtY9gXfuO1YTlrs0uNPgWFkgKxRq1zH+FTyN5wsYw=; b=vBpJLPmtSt4C0fgholDn9dVEiYETtABf/8lShFo1vGZ+YcWthNPK5I24Qcp9GKvfaI pXnH5JWgABiWlrxJ9gR6iPW5q+bYYFQAXfSoznrmEyQbQdulAp7Zy6QdkGEChLgUrXq+ ZRgbLCp7KncZV4IYMEaXwDQh7mxmUCoWU8kpRUaafEkTiI0N3+s+oMghNYx4aW+eS+LE Lb/AeS8z2WJD09+8ARMiGxsvCrhVCr1rUDlulPve4vluSEBFbfPSbeDfxlm5uC24jfCi 1KkrCxKKioDnEbOkqsF5n5v5jadZJkldf2BgDj30iVj+90Nd6WNkH9LYBVYWawysQ106 AUkQ== X-Gm-Message-State: AOJu0Yw1zu7tCgSKibIst7XFPm4aBOG0B/wB1qLQgiT+gjQq53nSU51h 1zosxxR44kUTtHi3NHmAfBOwcFI/mDdQncvlkvdAydWVsyDuLLmw8n3yq5g5zQ45L+GQ6Iy9SiY LaGM= X-Gm-Gg: ASbGncuSZXxMyQk6TcLm0YteLOkCbnR8890vkZ5yTLk7I5DPxH0mybIQ8VdWWPIOFV+ L03qNhG6E8MYhzFFXOGcDRih4BQoMrkGNX0ORNrpffcAbzpsBhw1iXjh+XZGAVG+jMbwt+OLlKU +g1WmGr+VIrJ6J3CHzvbNTXXqVTXNJcRmWYU30ukgqY9so1c13TzJBUVuByE/VUnuTj1+PNpNgI /43/Gt8IP1vhJ2q7E9whao7yOH1FIgInCp3rIWaeX1BI1YhYKUU5mPz+BGiywlTh23YGV62nrTm KI+ZGyqzVQslhuBVnFroL0pwDQTCnLCJf2BKbIRpbgDRphi9OPFIAhNyGwduL/rafZ+i4EcNzax b0i8tm5CNLK0lWiC9kVA2qBf9sai8xnKdyq+cXletDwBenX/ffJ/kbsv457G0ie7JNlYsWqESeG m/brDpPsQHhF1Sc4GuVfvLF6aAkZ62KtJyY5yklw== X-Google-Smtp-Source: AGHT+IF+r62P8nGXOPwbc9BBjAHp1jXke6TAaE/Sd7nqvLqxJXh+Gbr9tOrG8b3jayarYiVZwz/J/Q== X-Received: by 2002:a05:6000:24c4:b0:3e4:9dab:3f4d with SMTP id ffacd0b85a97d-3e643e08c96mr14344567f8f.48.1757582366490; Thu, 11 Sep 2025 02:19:26 -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.25 (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 14/31] ada: Fix regression in Root_Type Date: Thu, 11 Sep 2025 11:18:46 +0200 Message-ID: <20250911091904.1505690-14-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 Previous change, "Make pp and friends more robust (base type only)" introduced a bug in Root_Type. Etype (T) can, in fact, be Empty (but only in case of errors.) This patch fixes it. gcc/ada/ChangeLog: * einfo-utils.adb (Root_Type): Deal with missing Etype. (Root_Type_If_Set): Likewise. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/einfo-utils.adb | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gcc/ada/einfo-utils.adb b/gcc/ada/einfo-utils.adb index d84e562853cc..450d4c36b211 100644 --- a/gcc/ada/einfo-utils.adb +++ b/gcc/ada/einfo-utils.adb @@ -2585,7 +2585,11 @@ package body Einfo.Utils is loop Etyp := Etype (T); - exit when T = Etyp + if No (Etyp) then + Check_Error_Detected; + end if; + + exit when No (Etyp) or else T = Etyp or else (Is_Private_Type (T) and then Etyp = Full_View (T)) or else @@ -2609,6 +2613,10 @@ package body Einfo.Utils is end return; end Root_Type; + ---------------------- + -- Root_Type_If_Set -- + ---------------------- + function Root_Type_If_Set (Id : E) return Opt_N_Entity_Id is Etyp : Entity_Id; @@ -2620,12 +2628,7 @@ package body Einfo.Utils is loop Etyp := Etype (T); - if No (Etyp) then - T := Empty; - exit; - end if; - - exit when T = Etyp + exit when No (Etyp) or else T = Etyp or else (Is_Private_Type (T) and then Etyp = Full_View (T)) or else