From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by sourceware.org (Postfix) with ESMTPS id 830FD384AB74 for ; Fri, 17 May 2024 08:32:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 830FD384AB74 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 830FD384AB74 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::334 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715934761; cv=none; b=CuMn7r9kvH+nSfA6uzfE8jVvYvHSYX77xG102I14xqInQWe220YQgXsana2Zl4L3CilSfDoJ4KoxPB4xnwvFbi6yTQ6bLgk2R7VvgzzHu4QD9ktr2pWCem5j1QBifyTmaiBAcTTt7TILcK3kI5ci0ROweukCtLFFmMKnbe1Ifzc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1715934761; c=relaxed/simple; bh=W3cqJl2LUjxtEQ06SuqkPlhA/Ui07lW7Eb8AKigiPnw=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Ufkr63f2GZjB95mZHiNHf0/59huF4Olunoz76iv1aErPJ5diUZbHq3omn7JnBGYyf6Mxfw0UTUglRKt6n7KNzOIvoo0xRrAmLq6fUKlHqHg8ibynSpr9J//SyXlRfT4seEjpWt71GCuo6JICJvWgWVYA4H3bmnpr2KDoqrzu/Nc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-420104e5336so38444475e9.1 for ; Fri, 17 May 2024 01:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1715934747; x=1716539547; 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=bCVdmeTFVTLUt+v01HqlaFDc4nnyl2Whgmsx+4CqvFM=; b=PkJM9kNYEjULhGXcBrpiS7XRfFDX/YcwwYI40YfXK/qq9KhgkyFT33q4p73PVgUZRl EMfSojaEJLEaWOMzI15lbapLPdcINvgjCG/USbU6jJnynUtgCSzDfHS1fD+OAf8DkujB OaJyG9OklFs44ZCLlcQycOwVTWlJEvQBjme7Znng2X6erIFsNkN/nAuhB1Oe8nlnFUwr iXXUMa7sMGHtLkHHNixj66mcImBFWItEAbUix5l0jpnT/OVXto24QeJiIcIUjIuQ7Hhv AfUa5pOkjZ5ZUspTl3Zv2KHvoS1TfedulLqpglk3M58diiUlH5K66+WZeGy3PaG2/d4e O7OQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715934747; x=1716539547; 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=bCVdmeTFVTLUt+v01HqlaFDc4nnyl2Whgmsx+4CqvFM=; b=htZ9A457c/25vvGffa8aK25Fm9tWcJIMwhzzrb/rNwCUUTc1vHHMAHpvmXOlldjSrF UWKTvWyjhYbsO2iVbjfrjoDvfq85/CKO59M+zBiJyG8Xrd2xkdVKtNkBKB3w4xjWPLlb mvKAXJNnT4CXHpTrBYoNs4+xxtTexoNRzxHRiCWz3JXdE9+7Bpo8Lvuget5u4nXqh9Zb SdsSWSV6xfVR+Ii0Imtm2hC7ZS2mCMHhFqhlDUiy44QvgFrJd3uLcUvvXMSPO3QzIXpg Q2MkYxHpK4/MhxVYguEYoGB/+BAu5lHWx8PYJfTI0eCW+6XFDukDwo46enT5i4kREYRN Rbgw== X-Gm-Message-State: AOJu0Ywbnxu2EyrG6N8G7LC7HS89Pwn1KfhZ3V9vHRRwVgbTtnhKL5xn jYRWk0tdSlNF9nT9S37Ua3papTRmJwZ1Uppe2BhuzPjR8T8bECZ+tttkUEe4wwu4ozbYnBEmGeg = X-Google-Smtp-Source: AGHT+IGOmeGHUDqndEAsR9mH2WKb8RPDUwl5szEr7Aoxa9hxp0fZAu8qCW9RWcSdns1zeZ/g7R0hlw== X-Received: by 2002:a05:600c:35cd:b0:420:1a72:69dd with SMTP id 5b1f17b1804b1-4201a726bfamr116213585e9.10.1715934747399; Fri, 17 May 2024 01:32:27 -0700 (PDT) Received: from poulhies-Precision-5550.lan ([2001:861:3382:1a90:de37:8b1c:1f33:2610]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-420273cff03sm75197045e9.26.2024.05.17.01.32.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 May 2024 01:32:27 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Piotr Trojanek Subject: [COMMITTED 10/35] ada: Only record types with discriminants can be unconstrained Date: Fri, 17 May 2024 10:31:42 +0200 Message-ID: <20240517083207.130391-10-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240517083207.130391-1-poulhies@adacore.com> References: <20240517083207.130391-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.9 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 List-Id: From: Piotr Trojanek Remove redundant condition for detecting unconstrained record types. Code cleanup; behavior is unaffected. gcc/ada/ * sem_prag.adb (Is_Unconstrained_Or_Tagged_Item): Remove call to Has_Discriminants; combine ELSIF branches. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/sem_prag.adb | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index e57f42d9a54..02aad4d1caa 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -32971,13 +32971,10 @@ package body Sem_Prag is if Is_Tagged_Type (Typ) then return True; - elsif Is_Array_Type (Typ) then - return not Is_Constrained (Typ); - - elsif Is_Record_Type (Typ) then - return Has_Discriminants (Typ) and then not Is_Constrained (Typ); - - elsif Is_Private_Type (Typ) then + elsif Is_Array_Type (Typ) + or else Is_Record_Type (Typ) + or else Is_Private_Type (Typ) + then return not Is_Constrained (Typ); else -- 2.43.2