fix Issue 7369 - Inout constructor causes compiler to reject invariant

dlang · Jan 29, 2012 · 3c13871 · 3c13871
1 parent 3c99519
commit 3c13871
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/src/doc.c b/src/doc.c
@@ -1,6 +1,6 @@
 
 // Compiler implementation of the D programming language
-// Copyright (c) 1999-2011 by Digital Mars
+// Copyright (c) 1999-2012 by Digital Mars
 // All Rights Reserved
 // written by Walter Bright
 // http://www.digitalmars.com

diff --git a/src/func.c b/src/func.c
@@ -3753,6 +3753,7 @@ void InvariantDeclaration::semantic(Scope *sc)
 
     sc = sc->push();
     sc->stc &= ~STCstatic;              // not a static invariant
+    sc->stc |= STCconst;                // invariant() is always const
     sc->incontract++;
     sc->linkage = LINKd;
 

diff --git a/test/fail_compilation/fail7369.d b/test/fail_compilation/fail7369.d
@@ -0,0 +1,5 @@
+struct S7369 {
+    int a;
+    invariant() { a += 5; }
+}
+
diff --git a/test/runnable/testdstress.d b/test/runnable/testdstress.d
@@ -54,7 +54,7 @@ void test2()
 class MyClass3
 {
 
-	private int g() { 
+	private int g() const { 
 		return 1;
 	}