Issue 4543 - Regression(1.054, 2.038) typedef circular definition and…

… segfault
dlang · Apr 19, 2011 · 930e029 · 930e029
1 parent f62ea9b
commit 930e029
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/attrib.c b/src/attrib.c
@@ -718,6 +718,12 @@ void AnonDeclaration::semantic(Scope *sc)
 {
     //printf("\tAnonDeclaration::semantic %s %p\n", isunion ? "union" : "struct", this);
 
+    if (sem == 1)
+    {   //printf("already completed\n");
+        scope = NULL;
+        return;             // semantic() already completed
+    }
+
     Scope *scx = NULL;
     if (scope)
     {   sc = scope;

diff --git a/src/class.c b/src/class.c
@@ -844,14 +844,14 @@ Dsymbol *ClassDeclaration::search(Loc loc, Identifier *ident, int flags)
     Dsymbol *s;
     //printf("%s.ClassDeclaration::search('%s')\n", toChars(), ident->toChars());
 
-    if (scope)
+    if (scope && !symtab)
     {   Scope *sc = scope;
         sc->mustsemantic++;
         semantic(sc);
         sc->mustsemantic--;
     }
 
-    if (!members || !symtab || scope)
+    if (!members || !symtab)
     {
         error("is forward referenced when looking for '%s'", ident->toChars());
         //*(char*)0=0;

diff --git a/src/struct.c b/src/struct.c
@@ -528,7 +528,7 @@ Dsymbol *StructDeclaration::search(Loc loc, Identifier *ident, int flags)
 {
     //printf("%s.StructDeclaration::search('%s')\n", toChars(), ident->toChars());
 
-    if (scope)
+    if (scope && !symtab)
         semantic(scope);
 
     if (!members || !symtab)