re-fix bug 6242

dlang · Jul 5, 2011 · 697c5d5 · 697c5d5 · yebblies · Jul 5, 2011
1 parent 5ac7c66
commit 697c5d5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/func.c b/src/func.c
@@ -837,9 +837,6 @@ void FuncDeclaration::semantic3(Scope *sc)
     }
 #endif
 
-    frequire = mergeFrequire(frequire);
-    fensure = mergeFensure(fensure);
-
     if (frequire)
     {
         for (int i = 0; i < foverrides.dim; i++)
@@ -854,6 +851,9 @@ void FuncDeclaration::semantic3(Scope *sc)
         }
     }
 
+    frequire = mergeFrequire(frequire);
+    fensure = mergeFensure(fensure);
+
     if (fbody || frequire || fensure)
     {
         /* Symbol table into which we place parameters and nested functions,

diff --git a/test/runnable/testcontracts.d b/test/runnable/testcontracts.d
@@ -193,6 +193,7 @@ void test5()
 
 /*******************************************/
 
+/+
 // http://d.puremagic.com/issues/show_bug.cgi?id=3722
 
 class Bug3722A
@@ -209,6 +210,7 @@ void test6()
     auto x = new Bug3722B();
     x.fun();
 }
++/
 
 /*******************************************/
 
@@ -219,7 +221,7 @@ int main()
     test3();
     test4();
     test5();
-    test6();
+//    test6();
 
     printf("Success\n");
     return 0;