Merge pull request #6014 from MartinNowak/fix16348

fix Issue 16348 - ICE with package visibility
dlang · Aug 8, 2016 · d400dff · d400dff
2 parents 5a16fbb + 93c3dcf
commit d400dff
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/statement.d b/src/statement.d
@@ -192,7 +192,9 @@ public:
     // Same as semanticNoScope(), but do create a new scope
     final Statement semanticScope(Scope* sc, Statement sbreak, Statement scontinue)
     {
-        Scope* scd = sc.push();
+        auto sym = new ScopeDsymbol();
+        sym.parent = sc.scopesym;
+        Scope* scd = sc.push(sym);
         if (sbreak)
             scd.sbreak = sbreak;
         if (scontinue)

diff --git a/test/compilable/imports/test16348.d b/test/compilable/imports/test16348.d
@@ -0,0 +1,6 @@
+module mypackage.bar;
+
+package bool bar()
+{
+    return false;
+}
diff --git a/test/compilable/test16348.d b/test/compilable/test16348.d
@@ -0,0 +1,13 @@
+// EXTRA_SOURCES: imports/test16348.d
+module mypackage.foo;
+
+void bug()
+{
+    // removing the if-else also removes the segfault
+    if (true) {}
+    else
+    {
+        import mypackage.bar;
+        auto b = bar();
+    }
+}