[committed] d: TypeInfo error when using slice copy on Structs (PR100964)

Message ID 20210609180529.3203910-1-ibuclaw@gdcproject.org
State New
Headers show
Series
  • [committed] d: TypeInfo error when using slice copy on Structs (PR100964)
Related show

Commit Message

Marek Polacek via Gcc-patches June 9, 2021, 6:05 p.m.
Hi,

This patch fixes a compiler error when using a slice copy on structs.
Known limitation: does not work for struct with postblit or dtor.

Bootstrapped and regression tested on x86_64-linux-gnu/-m32/-mx32,
committed to mainline, and backported to the gcc-9, gcc-10, and gcc-11
release branches.

Regards,
Iain.

---
gcc/d/ChangeLog:

	PR d/100964
	* dmd/MERGE: Merge upstream dmd 4a4e46a6f.
---
 gcc/d/dmd/MERGE                                  |  2 +-
 gcc/d/dmd/expression.c                           |  7 +++++--
 gcc/testsuite/gdc.test/compilable/betterCarray.d | 10 ++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

-- 
2.27.0

Patch

diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE
index e22e3d1ebf7..a617f285eac 100644
--- a/gcc/d/dmd/MERGE
+++ b/gcc/d/dmd/MERGE
@@ -1,4 +1,4 @@ 
-f3fdeb578f8cc6d9426d47d2fa144d2078f9ab29
+4a4e46a6f304a667e0c05d4455706ec2056ffddc
 
 The first line of this file holds the git revision number of the last
 merge done from the dlang/dmd repository.
diff --git a/gcc/d/dmd/expression.c b/gcc/d/dmd/expression.c
index 2592b38d961..88f13e9669b 100644
--- a/gcc/d/dmd/expression.c
+++ b/gcc/d/dmd/expression.c
@@ -1044,8 +1044,11 @@  bool Expression::checkPostblit(Scope *sc, Type *t)
     t = t->baseElemOf();
     if (t->ty == Tstruct)
     {
-        // Bugzilla 11395: Require TypeInfo generation for array concatenation
-        semanticTypeInfo(sc, t);
+        if (global.params.useTypeInfo)
+        {
+            // Bugzilla 11395: Require TypeInfo generation for array concatenation
+            semanticTypeInfo(sc, t);
+        }
 
         StructDeclaration *sd = ((TypeStruct *)t)->sym;
         if (sd->postblit)
diff --git a/gcc/testsuite/gdc.test/compilable/betterCarray.d b/gcc/testsuite/gdc.test/compilable/betterCarray.d
index 74c80be3b95..3f48b042bde 100644
--- a/gcc/testsuite/gdc.test/compilable/betterCarray.d
+++ b/gcc/testsuite/gdc.test/compilable/betterCarray.d
@@ -15,3 +15,13 @@  int foo(int[] a, int i)
 {
     return a[i];
 }
+
+/**********************************************/
+// https://issues.dlang.org/show_bug.cgi?id=19234
+void issue19234()
+{
+    static struct A {}
+    A[10] a;
+    A[10] b;
+    b[] = a[];
+}