From patchwork Mon Feb 12 16:16:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 199886 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp20621dyb; Mon, 12 Feb 2024 08:17:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVQDu499bpLVM4tuHIenBzDLqS/7XOODlV3v3Hb3/KHH1m7JQNTZ2CEuJx/P04h/Swh6v6nIYsYcEsMfT4alhrbw3vJgA== X-Google-Smtp-Source: AGHT+IEo0O/ym/iASsdtgwzBifRE0whk8s/4TVUEj3VCr6XBB4x3aCAWRidGqFmw1UU696fT+DQt X-Received: by 2002:ac8:5b8c:0:b0:42c:779f:3f9a with SMTP id a12-20020ac85b8c000000b0042c779f3f9amr3805898qta.59.1707754661906; Mon, 12 Feb 2024 08:17:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707754661; cv=pass; d=google.com; s=arc-20160816; b=OXK9fqhE1FMiwQ+fP0H6qYSz2o204kMg6/t4K4J0t1Jb2wKbbqk5l0wUhGH7id1ebI NNJxon6jpFD2Wa4evJfUQxlkJEeJ7ovNSm4HV3A+YoTcL84SRe5xRDDykoHjyZc1DMSP eWRKfNCjqUJvTOSqnq0my6zZzm8A+t7KxXLip2Ii24Q+mpY/hGzIJglGcBpdmg4mDsqd /5kuv7nq8k22iOgswnbqZ+6PTIWJ6W2e/6L6p4WduF303P0Ch7ha5nII+AIX7k+Dj2QC NXcXqSzbhU9qmO8QsGq46C7FGbAaVxsostii/hAj+RpcacBj0IHcT9SMxrUB9KHlndD1 l7RQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:cc:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=5gQremYmMnVXmQc/t658N+PmAFQghCPYeDkGAbzIX04=; fh=dcpZgVQ7WTQtceYJvIsUl1RNNujG7kTO0xZXk8qs/2g=; b=OjHvOV8RLchlXKbBCv0ynl1yEA4ej5YmkHYo8YSsIo6iHeoJbsWije+WCRErCt9DGp BmQdIWMDigg75GwoqKpmKcv7htL2gZt62HhZ8xHXwPGrIHBM44e7zJARc98lwjpbGRlL yMmGhEiWSdVSHwaL6sBIT31IfPhCUc9DbnnmFUTXZMGZVifnMygX4wCbVcvQbdmk+mgH gDI2AGzk9NL0NS/SvHXtdd0a3dCiGySDY65Cl2D5jLXgefyMTRry4AvXj1+mpGWorJ64 n5GcPO3xV7jlxOxGKTzygoiZgkkCH25K7W0YZD9FXk1P4L28ne3V4ADqStNH+z2YWLQ1 MHrA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@gdcproject.org header.s=MBO0001 header.b=dAmaBQnj; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=gdcproject.org X-Forwarded-Encrypted: i=2; AJvYcCUVOJfgbZ+j6vdjUDPnR0rhvzAhFXEVcQptvN5fQwiWeIwsAA9u/PNg8fe8pSDPz19fKAaxFIaQrspcFsxBy2fOvNM0iw== Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id u39-20020a05622a19a700b004283ab4f730si724145qtc.798.2024.02.12.08.17.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 08:17:41 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gdcproject.org header.s=MBO0001 header.b=dAmaBQnj; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=gdcproject.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 99A443858C2A for ; Mon, 12 Feb 2024 16:17:41 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id 4E7623858D38 for ; Mon, 12 Feb 2024 16:17:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4E7623858D38 Authentication-Results: sourceware.org; dmarc=pass (p=quarantine dis=none) header.from=gdcproject.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gdcproject.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 4E7623858D38 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2001:67c:2050:0:465::102 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707754623; cv=none; b=Gzdm3R7rMBYLkAtwVMNZZzAVFLqxGT1WHKA1DnGn8Qwfzn6lVqxMfXmR/IaG7mrr/nyqORUpEC7G7PG+jGsK+x6NOUfxj4brXANIb+NDnVhLpdqbglesOhphUwqhr+2MT8A/cMD5dyaxxNs0qaF8RhXw01xzRtkkSg6B8bkwUSQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707754623; c=relaxed/simple; bh=gyNdaJCvFtHlotBvqDfMvGyprbq8+SN+d06WtkuYW3k=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=MIDzw3Chk0WAA6gntoJKFk3uuPjkLyU0Wa8H5vcsS3SJEjSEg3audk6hnXsdx5Gdk9vDXlGVyYOYq9c5NDbAt8eKQasdG0X5Sqv+cXGfGYerfllMFwHE8BmwLPo26LdACmtLX0uMVG/iOV57S1CmTbwMD8pl3PpXBdqqxA3k64Q= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4TYV2z35KHz9t35; Mon, 12 Feb 2024 17:16:59 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gdcproject.org; s=MBO0001; t=1707754619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=5gQremYmMnVXmQc/t658N+PmAFQghCPYeDkGAbzIX04=; b=dAmaBQnjFwK5Z4l0fbkaUve7q2l9FZj2TtipazjuXvCRN+DC50sPB4OvtzopkGpoT8m4ZS 5q+s+UT+kyOBYor2geaIdrkdmZprugWXh5PmHKl+SF6/R/GIj9rws3BPLfbdxuhYZkOKu5 sYhpy2FX/3Kfe/6iQ92x+l1Hcz1IRP58GEoiKD5czAYn7/p79I0QJH7J7z9l/LC0uqRiAb nZV52nUhxlK0uKstaqR7Rx6He8e2qN7MjrnEW5WdlyWnCF+mbSaiVqN1Fn9ffuxoZjmwRd uHF2H8FeB1TgGDc02+lvF8P3anr6miucyfVoAf0D4OIJlLg78a7vapaa11igNg== From: Iain Buclaw To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Fix internal compiler error: in make_import, at d/imports.cc:48 [PR113125] Date: Mon, 12 Feb 2024 17:16:57 +0100 Message-Id: <20240212161657.1200645-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, URIBL_BLACK, WEIRD_PORT 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+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790710552446127217 X-GMAIL-MSGID: 1790710552446127217 Hi, This patch fixes an ICE triggered in the D front-end. The cause of the ICE was that TYPE_DECLs were only being generated for structs with members, not opaque structs. PR d/113125 Bootstrapped and regression tested on x86_64-linux-gnu/-m32, committed to mainline. Regards, Iain. --- gcc/d/ChangeLog: * types.cc (TypeVisitor::visit (TypeStruct *)): Generate TYPE_DECL and apply UDAs to opaque struct declarations. gcc/testsuite/ChangeLog: * gdc.dg/imports/pr113125.d: New test. * gdc.dg/pr113125.d: New test. --- gcc/d/types.cc | 5 +++++ gcc/testsuite/gdc.dg/imports/pr113125.d | 2 ++ gcc/testsuite/gdc.dg/pr113125.d | 4 ++++ 3 files changed, 11 insertions(+) create mode 100644 gcc/testsuite/gdc.dg/imports/pr113125.d create mode 100644 gcc/testsuite/gdc.dg/pr113125.d diff --git a/gcc/d/types.cc b/gcc/d/types.cc index af9aad8a412..ed97aa39cc5 100644 --- a/gcc/d/types.cc +++ b/gcc/d/types.cc @@ -1230,6 +1230,11 @@ public: apply_user_attributes (t->sym, t->ctype); finish_aggregate_type (structsize, alignsize, t->ctype); } + else + { + build_type_decl (t->ctype, t->sym); + apply_user_attributes (t->sym, t->ctype); + } /* For structs with a user defined postblit, copy constructor, or a destructor, also set TREE_ADDRESSABLE on the type and all variants. diff --git a/gcc/testsuite/gdc.dg/imports/pr113125.d b/gcc/testsuite/gdc.dg/imports/pr113125.d new file mode 100644 index 00000000000..761e613b055 --- /dev/null +++ b/gcc/testsuite/gdc.dg/imports/pr113125.d @@ -0,0 +1,2 @@ +module imports.pr113125; +struct S113125; diff --git a/gcc/testsuite/gdc.dg/pr113125.d b/gcc/testsuite/gdc.dg/pr113125.d new file mode 100644 index 00000000000..cb7300baa1a --- /dev/null +++ b/gcc/testsuite/gdc.dg/pr113125.d @@ -0,0 +1,4 @@ +// { dg-do compile } +// { dg-options "-I $srcdir/gdc.dg" } +module pr113125; +import imports.pr113125: S113125;