Merge pull request #9789 from WalterBright/inferRetMangle

fix Issue 19857 - Name mangling mismatch when compiling with -dip1000 merged-on-behalf-of: Jacob Carlborg <jacob-carlborg@users.noreply.github.com>
dlang · May 14, 2019 · 021c674 · 021c674
2 parents 4ac1120 + 8007aa8
commit 021c674
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 4 deletions.
diff --git a/src/dmd/semantic3.d b/src/dmd/semantic3.d
@@ -1168,6 +1168,8 @@ private extern(C++) final class Semantic3Visitor : Visitor
                 if (funcdecl.type == f)
                     f = cast(TypeFunction)f.copy();
                 f.isreturn = true;
+                if (funcdecl.storage_class & STC.returninferred)
+                    f.isreturninferred = true;
             }
         }
 

diff --git a/test/compilable/scopeinfer.d b/test/compilable/scopeinfer.d
@@ -10,3 +10,21 @@ static assert(typeof(foo).mangleof == "FNaNbNiNfPvZi");
 auto bar(void* p) { return p; }
 static assert(typeof(bar).mangleof == "FNaNbNiNfPvZQd");
 
+// https://issues.dlang.org/show_bug.cgi?id=19857
+
+struct Stack()
+{
+@safe:
+    int** data;
+    ref int* top()
+    {
+        return *data;
+    }
+}
+
+alias S = Stack!();
+
+//pragma(msg, S.top.mangleof);
+
+version (Win32)
+static assert(S.top.mangleof == "_D10scopeinfer__T5StackZQh3topMFNaNbNcNiNfZPi");
diff --git a/test/fail_compilation/retscope.d b/test/fail_compilation/retscope.d
@@ -235,10 +235,10 @@ void* funretscope(scope dg_t ptr) @safe
 /*
 TEST_OUTPUT:
 ---
-fail_compilation/retscope.d(249): Error: cannot implicitly convert expression `__lambda1` of type `void* delegate() pure nothrow @nogc return @safe` to `void* delegate() @safe`
-fail_compilation/retscope.d(249): Error: cannot implicitly convert expression `__lambda1` of type `void* delegate() pure nothrow @nogc return @safe` to `void* delegate() @safe`
-fail_compilation/retscope.d(250): Error: cannot implicitly convert expression `__lambda2` of type `void* delegate() pure nothrow @nogc return @safe` to `void* delegate() @safe`
-fail_compilation/retscope.d(250): Error: cannot implicitly convert expression `__lambda2` of type `void* delegate() pure nothrow @nogc return @safe` to `void* delegate() @safe`
+fail_compilation/retscope.d(249): Error: cannot implicitly convert expression `__lambda1` of type `void* delegate() pure nothrow @nogc @safe` to `void* delegate() @safe`
+fail_compilation/retscope.d(249): Error: cannot implicitly convert expression `__lambda1` of type `void* delegate() pure nothrow @nogc @safe` to `void* delegate() @safe`
+fail_compilation/retscope.d(250): Error: cannot implicitly convert expression `__lambda2` of type `void* delegate() pure nothrow @nogc @safe` to `void* delegate() @safe`
+fail_compilation/retscope.d(250): Error: cannot implicitly convert expression `__lambda2` of type `void* delegate() pure nothrow @nogc @safe` to `void* delegate() @safe`
 ---
 */