Fix Issue 11991 - Implicit catch picks up wrong 'Throwable'

dlang · Jan 29, 2014 · a7cffd0 · a7cffd0
1 parent bf6e00a
commit a7cffd0
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/src/statement.c b/src/statement.c
@@ -4738,7 +4738,13 @@ void Catch::semantic(Scope *sc)
     sc = sc->push(sym);
 
     if (!type)
-        type = new TypeIdentifier(Loc(), Id::Throwable);
+    {
+        // reference .object.Throwable
+        TypeIdentifier *tid = new TypeIdentifier(Loc(), Id::empty);
+        tid->addIdent(Id::object);
+        tid->addIdent(Id::Throwable);
+        type = tid;
+    }
     type = type->semantic(loc, sc);
     ClassDeclaration *cd = type->toBasetype()->isClassHandle();
     if (!cd || ((cd != ClassDeclaration::throwable) && !ClassDeclaration::throwable->isBaseOf(cd, NULL)))

diff --git a/test/compilable/compile1.d b/test/compilable/compile1.d
@@ -212,6 +212,22 @@ static assert( !is(typeof( (){
     ];
 })));
 
+/**************************************************
+    11991
+**************************************************/
+
+void main()
+{
+    int Throwable;
+    int object;
+    try
+    {
+    }
+    catch
+    {
+    }
+}
+
 /**************************************************
     5796
 **************************************************/