Merge pull request #1506 from 9rnsr/fix9338

Issue 9338 - Compiler segfaults if try to CTFE member function without valid 'this'
dlang · Jan 18, 2013 · f7e5659 · f7e5659
2 parents 685d943 + 7982d16
commit f7e5659
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -3983,25 +3983,16 @@ Expression *CallExp::interpret(InterState *istate, CtfeGoal goal)
     }
     if (pthis)
     {   // Member function call
-        Expression *oldpthis;
-        if (pthis->op == TOKthis)
-        {
-            pthis = istate ? istate->localThis : NULL;
-            oldpthis = pthis;
-        }
-        else
-        {
-            if (pthis->op == TOKcomma)
-                pthis = pthis->interpret(istate);
-            if (exceptionOrCantInterpret(pthis))
-                return pthis;
-                // Evaluate 'this'
-            oldpthis = pthis;
-            if (pthis->op != TOKvar)
-                pthis = pthis->interpret(istate, ctfeNeedLvalue);
-            if (exceptionOrCantInterpret(pthis))
-                return pthis;
-        }
+        if (pthis->op == TOKcomma)
+            pthis = pthis->interpret(istate);
+        if (exceptionOrCantInterpret(pthis))
+            return pthis;
+        // Evaluate 'this'
+        Expression *oldpthis = pthis;
+        if (pthis->op != TOKvar)
+            pthis = pthis->interpret(istate, ctfeNeedLvalue);
+        if (exceptionOrCantInterpret(pthis))
+            return pthis;
         if (fd->isVirtual())
         {   // Make a virtual function call.
             Expression *thisval = pthis;

diff --git a/test/fail_compilation/ice9338.d b/test/fail_compilation/ice9338.d
@@ -0,0 +1,21 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice9338.d(13): Error: value of 'this' is not known at compile time
+fail_compilation/ice9338.d(14): Error: value of 'this' is not known at compile time
+---
+*/
+
+class Foo
+{
+    void test()
+    {
+        enum members1 = makeArray();
+        enum members2 = this.makeArray();
+    }
+
+    string[] makeArray()
+    {
+        return ["a"];
+    }
+}