From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by sourceware.org (Postfix) with ESMTPS id C0CE23858D1E for ; Tue, 21 May 2024 07:31:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C0CE23858D1E 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 C0CE23858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32c ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276666; cv=none; b=s6ewTTgHBiIFEFsGPkp9QN8/Lwyn9hPK3a1P1kLtfl9P9u7qezs7MRty3EGkMm5u0AnHr9YD1B0gWqxuXUjSQ2FjfxLzx86Zud0riewn2hvRlMO/zZ5zRHXM4aBMPu/5J0E6ZVBSHrVS1nIBCOk9z4/ivhx7pyy8pFSk5vAu0HY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716276666; c=relaxed/simple; bh=Vml24HHbGuDV2HHROexFfhu7o9auC4rbfcjuqp3NlRM=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qkVirfEoJ4VK8PKQzH1bKlTZCzxs8biZqg4QP52FJKEEi7EQQjQToNOP0Jf7PGt7QUOXuO8uJQyJ3lsI/nNBbiR7oPdeCKnEUfnPESVFnch4jS9hN78B90unpTOhNYB+9cxm7HM/gUdx0VekuUv5GLge7N+H6QRUnzTgEewvT4c= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-4202cea9941so27151485e9.1 for ; Tue, 21 May 2024 00:31:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; t=1716276661; x=1716881461; 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=lzlciYcLFa2L8PMz45xDa0GSkdoxmwQI4KExM6bD4ic=; b=PrkioJ5nEfYwLYoODRvmjQuAVk+Rz+nexlctMNxDoBnGZYGrRRrdpIO5FojvZlBsnd qIbLaG4nHtN4sw3+nFNuoJ3gAKStKodY82KUQeeMYfNvc9NIBLv2D3wQ146sjdylwoxJ UmGaV/pLmj848OzgooeGVqQAngu1f9Ud8tNsM+QvMv2xjCfrjrOUfxsD82losC+6QUyB UhGgYrSfN0d0TUPgaIjjy2Sfl87zQD3u8hjsg+WRjdK/F136qUs4fnh21yPWJMrxHzwX gWS9WVJ02gY0jt7hjyQovu86EkzkEdmIEMXAzPCkXflw8g9IriM+Cw4k5o7CH0yAoNOi PMaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716276661; x=1716881461; 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=lzlciYcLFa2L8PMz45xDa0GSkdoxmwQI4KExM6bD4ic=; b=HtktoxGODYUpk0yevfRhhASIq8lBZckT2+xTbS+fZD1iD1USJqQoK9al5qpc/C5l/v 935BaMRp9iPIyiWfTfno6MIGIKbFsTwAMSu4UzaskAjA8uU9iDevOMW4dWwHpU7PBC/g bTgOaqSIwkBWvI5yR17isSjqdYGdl25nIOR8QvKfa8jwSh2wNVwcp6Rz/DdCbzKTmYNK +HQnA62v+uSmTWPskX7sieT36SM7KhTBgtMFp5llRyRfNn5j79wQC56wK1W6fFcfkv7S 1gAYE3vqs8EZwoteDjLXJ6Hvhp1RhXiOVACMEW1+I89l7lHBf71gIha8vnZwlR9Rpmzp E7ng== X-Gm-Message-State: AOJu0YzhSjIu0PtvsGu6U89q/H/C2bOHQQsqoTuYQzCe9V31qyHN76Pt qyqcq7scwfAEygPhyH8QHCilQdYphGm+pWGsGF+nClPxy/WY8zCrfVrkfGDt0vfoD3GdAGbhRYY = X-Google-Smtp-Source: AGHT+IEfKcnRI+1A+C0/bm6JQS7seaZKfj7m84Z5Q3j0VG+LrRcYQICWMrG+laQ7ePIkZxGEgPPyEQ== X-Received: by 2002:a05:600c:5487:b0:41b:851a:af43 with SMTP id 5b1f17b1804b1-41feaa38f9dmr214483365e9.11.1716276661188; Tue, 21 May 2024 00:31:01 -0700 (PDT) Received: from localhost.localdomain ([2001:861:3382:1a90:de37:8b1c:1f33:2610]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41fccee9292sm453333645e9.37.2024.05.21.00.31.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 00:31:00 -0700 (PDT) From: =?UTF-8?q?Marc=20Poulhi=C3=A8s?= To: gcc-patches@gcc.gnu.org Cc: Eric Botcazou Subject: [COMMITTED 17/31] ada: Fix oversight in previous change Date: Tue, 21 May 2024 09:30:20 +0200 Message-ID: <20240521073035.314024-17-poulhies@adacore.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240521073035.314024-1-poulhies@adacore.com> References: <20240521073035.314024-1-poulhies@adacore.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 List-Id: From: Eric Botcazou In rare cases, types using structural equality may reach relate_alias_sets. gcc/ada/ * gcc-interface/utils.cc (relate_alias_sets): Restore previous code when the type uses structural equality. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/gcc-interface/utils.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/ada/gcc-interface/utils.cc b/gcc/ada/gcc-interface/utils.cc index b628481335d..ae520542ace 100644 --- a/gcc/ada/gcc-interface/utils.cc +++ b/gcc/ada/gcc-interface/utils.cc @@ -1867,8 +1867,11 @@ relate_alias_sets (tree new_type, tree old_type, enum alias_set_op op) && TYPE_NONALIASED_COMPONENT (new_type) != TYPE_NONALIASED_COMPONENT (old_type))); - /* The alias set always lives on the TYPE_CANONICAL. */ - TYPE_ALIAS_SET (TYPE_CANONICAL (new_type)) = get_alias_set (old_type); + /* The alias set is a property of the TYPE_CANONICAL if it exists. */ + if (TYPE_STRUCTURAL_EQUALITY_P (new_type)) + TYPE_ALIAS_SET (new_type) = get_alias_set (old_type); + else + TYPE_ALIAS_SET (TYPE_CANONICAL (new_type)) = get_alias_set (old_type); break; case ALIAS_SET_SUBSET: -- 2.43.2