Merge pull request #3797 from yebblies/cppscope

[DDMD] Issue 13182 - extern(C++) classes cause crash when allocated on the stack with scope
dlang · Jul 23, 2014 · 7602561 · 7602561
1 parent 118e1a8
commit 7602561
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/declaration.c b/src/declaration.c
@@ -2222,6 +2222,12 @@ Expression *VarDeclaration::callScopeDtor(Scope *sc)
              */
             //if (cd->isInterfaceDeclaration())
                 //error("interface %s cannot be scope", cd->toChars());
+
+            if (cd->cpp)
+            {
+                // Destructors are not supported on extern(C++) classes
+                break;
+            }
             if (1 || onstack || cd->dtors.dim)  // if any destructors
             {
                 // delete this;

diff --git a/test/runnable/xtest46.d b/test/runnable/xtest46.d
@@ -3367,6 +3367,17 @@ void test3559()
     }
 }
 
+/***************************************************/
+
+extern(C++)
+class C13182
+{
+}
+
+void test13182()
+{
+    scope C13182 c = new C13182();
+}
 
 /***************************************************/
 // 5897
@@ -7207,6 +7218,7 @@ int main()
     test159();
     test12824();
     test8283();
+    test13182();
     test8395();
     test5749();
     test8396();