Merge pull request #17105 from dkorpel/hdrgen-ctor-scope

Fix bugzilla 24891 - Two scope attributes emitted as part of .di gene…
dlang · Dec 5, 2024 · 92bee16 · 92bee16
2 parents 6877e10 + 869ed9c
commit 92bee16
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 1 deletion.
diff --git a/compiler/src/dmd/hdrgen.d b/compiler/src/dmd/hdrgen.d
@@ -1696,7 +1696,10 @@ void toCBuffer(Dsymbol s, ref OutBuffer buf, ref HdrGenState hgs)
     void visitFuncDeclaration(FuncDeclaration f)
     {
         //printf("FuncDeclaration::toCBuffer() '%s'\n", f.toChars());
-        if (stcToBuffer(buf, f.storage_class))
+
+        // https://issues.dlang.org/show_bug.cgi?id=24891
+        // return/scope storage classes are printed as part of function type
+        if (stcToBuffer(buf, f.storage_class & ~(STC.scope_ | STC.return_ | STC.returnScope)))
             buf.writeByte(' ');
         typeToBuffer(f.type, f.ident, buf, hgs);
         auto tf = f.type.isTypeFunction();

diff --git a/compiler/test/compilable/extra-files/header1.d b/compiler/test/compilable/extra-files/header1.d
@@ -564,6 +564,11 @@ ref int* foo(scope return ref int* a) @safe
 
 struct SafeS
 {
+    this(int[1] x) scope {}
+	this(int[2] x) return scope {}
+	this(int[3] x) scope return {}
+	this(int[4] x) return {}
+
 @safe:
     ref SafeS foo() return
     {

diff --git a/compiler/test/compilable/extra-files/header1.di b/compiler/test/compilable/extra-files/header1.di
@@ -514,6 +514,10 @@ ref @safe int foo(return ref int a);
 ref @safe int* foo(return ref scope int* a);
 struct SafeS
 {
+	this(int[1] x) scope;
+	this(int[2] x) return scope;
+	this(int[3] x) scope return;
+	this(int[4] x) return;
 	@safe
 	{
 		ref SafeS foo() return;

diff --git a/compiler/test/compilable/extra-files/header1i.di b/compiler/test/compilable/extra-files/header1i.di
@@ -647,6 +647,18 @@ ref @safe int* foo(return ref scope int* a)
 }
 struct SafeS
 {
+	this(int[1] x) scope
+	{
+	}
+	this(int[2] x) return scope
+	{
+	}
+	this(int[3] x) scope return
+	{
+	}
+	this(int[4] x) return
+	{
+	}
 	@safe
 	{
 		ref SafeS foo() return