Issue 4269 - Regression(2.031): invalid type accepted if evaluated wh…

…ile errors are gagged
dlang · Feb 7, 2012 · 75ccf8c · 75ccf8c · braddr · Feb 7, 2012
1 parent 7cd2d8b
commit 75ccf8c
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 23 deletions.
diff --git a/src/aggregate.h b/src/aggregate.h
@@ -51,7 +51,7 @@ struct AggregateDeclaration : ScopeDsymbol
                                 // 1: size is correct
                                 // 2: cannot determine size; fwd referenced
     Dsymbol *deferred;          // any deferred semantic2() or semantic3() symbol
-    int isdeprecated;           // !=0 if deprecated
+    bool isdeprecated;          // !=0 if deprecated
 
 #if DMDV2
     int isnested;               // !=0 if is nested

diff --git a/src/class.c b/src/class.c
@@ -292,9 +292,11 @@ void ClassDeclaration::semantic(Scope *sc)
     methods.setDim(0);
 #endif
 
+    int errors = global.gaggedErrors;
+
     if (sc->stc & STCdeprecated)
     {
-        isdeprecated = 1;
+        isdeprecated = true;
     }
 
     if (sc->linkage == LINKcpp)
@@ -303,9 +305,7 @@ void ClassDeclaration::semantic(Scope *sc)
     // Expand any tuples in baseclasses[]
     for (size_t i = 0; i < baseclasses->dim; )
     {   BaseClass *b = baseclasses->tdata()[i];
-//printf("test1 %s %s\n", toChars(), b->type->toChars());
         b->type = b->type->semantic(loc, sc);
-//printf("test2\n");
         Type *tb = b->type->toBasetype();
 
         if (tb->ty == Ttuple)
@@ -345,7 +345,7 @@ void ClassDeclaration::semantic(Scope *sc)
                 if (!isDeprecated())
                 {
                     // Deriving from deprecated class makes this one deprecated too
-                    isdeprecated = 1;
+                    isdeprecated = true;
 
                     tc->checkDeprecated(loc, sc);
                 }
@@ -418,7 +418,7 @@ void ClassDeclaration::semantic(Scope *sc)
                 if (!isDeprecated())
                 {
                     // Deriving from deprecated class makes this one deprecated too
-                    isdeprecated = 1;
+                    isdeprecated = true;
 
                     tc->checkDeprecated(loc, sc);
                 }
@@ -653,9 +653,17 @@ void ClassDeclaration::semantic(Scope *sc)
         s->semantic(sc);
     }
 
-    if (sizeok == 2)
-    {   // semantic() failed because of forward references.
+    if (global.gag && global.gaggedErrors != errors)
+    {   // The type is no good, yet the error messages were gagged.
+        type = Type::terror;
+    }
+
+    if (sizeok == 2)            // failed due to forward references
+    {   // semantic() failed due to forward references
         // Unwind what we did, and defer it for later
+        sizeok = 0;
+        symtab = NULL;
+
         fields.setDim(0);
         structsize = 0;
         alignsize = 0;
@@ -764,7 +772,7 @@ void ClassDeclaration::semantic(Scope *sc)
 #endif
     //printf("-ClassDeclaration::semantic(%s), type = %p\n", toChars(), type);
 
-    if (deferred)
+    if (deferred && !global.gag)
     {
         deferred->semantic2(sc);
         deferred->semantic3(sc);
@@ -1221,9 +1229,11 @@ void InterfaceDeclaration::semantic(Scope *sc)
         scope = NULL;
     }
 
+    int errors = global.gaggedErrors;
+
     if (sc->stc & STCdeprecated)
     {
-        isdeprecated = 1;
+        isdeprecated = true;
     }
 
     // Expand any tuples in baseclasses[]
@@ -1374,6 +1384,12 @@ void InterfaceDeclaration::semantic(Scope *sc)
         Dsymbol *s = members->tdata()[i];
         s->semantic(sc);
     }
+
+    if (global.gag && global.gaggedErrors != errors)
+    {   // The type is no good, yet the error messages were gagged.
+        type = Type::terror;
+    }
+
     inuse--;
     //members->print();
     sc->pop();

diff --git a/src/struct.c b/src/struct.c
@@ -40,7 +40,7 @@ AggregateDeclaration::AggregateDeclaration(Loc loc, Identifier *id)
     hasUnions = 0;
     sizeok = 0;                 // size not determined yet
     deferred = NULL;
-    isdeprecated = 0;
+    isdeprecated = false;
     inv = NULL;
     aggNew = NULL;
     aggDelete = NULL;
@@ -358,6 +358,8 @@ void StructDeclaration::semantic(Scope *sc)
         scope = NULL;
     }
 
+    int errors = global.gaggedErrors;
+
     unsigned dprogress_save = Module::dprogress;
 
     parent = sc->parent;
@@ -371,7 +373,7 @@ void StructDeclaration::semantic(Scope *sc)
     protection = sc->protection;
     storage_class |= sc->stc;
     if (sc->stc & STCdeprecated)
-        isdeprecated = 1;
+        isdeprecated = true;
     assert(!isAnonymous());
     if (sc->stc & STCabstract)
         error("structs, unions cannot be abstract");
@@ -609,7 +611,13 @@ void StructDeclaration::semantic(Scope *sc)
         semantic2(sc);
         semantic3(sc);
     }
-    if (deferred)
+
+    if (global.gag && global.gaggedErrors != errors)
+    {   // The type is no good, yet the error messages were gagged.
+        type = Type::terror;
+    }
+
+    if (deferred && !global.gag)
     {
         deferred->semantic2(sc);
         deferred->semantic3(sc);

diff --git a/src/toobj.c b/src/toobj.c
@@ -346,6 +346,11 @@ void ClassDeclaration::toObjFile(int multiobj)
 
     //printf("ClassDeclaration::toObjFile('%s')\n", toChars());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
     if (!members)
         return;
 
@@ -918,6 +923,11 @@ void InterfaceDeclaration::toObjFile(int multiobj)
 
     //printf("InterfaceDeclaration::toObjFile('%s')\n", toChars());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
     if (!members)
         return;
 
@@ -1083,6 +1093,11 @@ void StructDeclaration::toObjFile(int multiobj)
 {
     //printf("StructDeclaration::toObjFile('%s')\n", toChars());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
     if (multiobj && !hasStaticCtorOrDtor())
     {   obj_append(this);
         return;
@@ -1169,6 +1184,11 @@ void VarDeclaration::toObjFile(int multiobj)
     //printf("VarDeclaration::toObjFile(%p '%s' type=%s) protection %d\n", this, toChars(), type->toChars(), protection);
     //printf("\talign = %d\n", type->alignsize());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
     if (aliassym)
     {   toAlias()->toObjFile(0);
         return;
@@ -1299,6 +1319,11 @@ void TypedefDeclaration::toObjFile(int multiobj)
 {
     //printf("TypedefDeclaration::toObjFile('%s')\n", toChars());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
     if (global.params.symdebug)
         toDebug();
 
@@ -1334,6 +1359,11 @@ void EnumDeclaration::toObjFile(int multiobj)
 {
     //printf("EnumDeclaration::toObjFile('%s')\n", toChars());
 
+    if (type->ty == Terror)
+    {   error("had semantic errors when compiling");
+        return;
+    }
+
 #if DMDV2
     if (isAnonymous())
         return;

diff --git a/test/fail_compilation/fail4269a.d b/test/fail_compilation/fail4269a.d
@@ -1,4 +1,7 @@
-static if(is(typeof(X5.init))) {}
-typedef Y X5;
+enum bool WWW = is(typeof(A.x));
+
+interface A {
+    B blah;
+    void foo(B b){} 
+}
 
-void main() {}
diff --git a/test/fail_compilation/fail4269b.d b/test/fail_compilation/fail4269b.d
@@ -1,5 +1,7 @@
+enum bool WWW = is(typeof(A.x));
 
-static if(is(typeof(X16))) {}
-alias X16 X16;
+struct A {
+    B blah;
+    void foo(B b){} 
+}
 
-void main() {}
diff --git a/test/fail_compilation/fail4269c.d b/test/fail_compilation/fail4269c.d
@@ -1,6 +1,7 @@
+enum bool WWW = is(typeof(A.x));
 
-int[2] d;
-static if(is(typeof(Xg.init))) {}
-alias d[1] Xg;
+class A {
+    B blah;
+    void foo(B b){} 
+}
 
-void main() {}