Compiler crashes on recursive alias functions

[stepancheg]

Compiler crashes on recursive alias functions

[stepancheg]

I'll fix it.

[stepancheg]

It is harder than I though. There are too much compiler internals that I don't understand. I give up.

[galchinsky]

Isn't this enough?

diff --git a/compiler/codegen.cpp b/compiler/codegen.cpp
index 783e967..baccdf0 100644
--- a/compiler/codegen.cpp
+++ b/compiler/codegen.cpp
@@ -3547,6 +3547,11 @@ void codegenCallByName(InvokeEntry* entry,

     ++ctx->inlineDepth;

+    ++ctx->callByNameDepth;
+    if (ctx->callByNameDepth > 100) {
+        error("Alias stack overflow");
+    }
+
     EnvPtr bodyEnv = new Env(entry->env);
     bodyEnv->callByNameExprHead = callable;

@@ -3631,6 +3636,8 @@ void codegenCallByName(InvokeEntry* entry,

     --ctx->inlineDepth;
     assert(ctx->inlineDepth >= 0);
+    --ctx->callByNameDepth;
+    assert(ctx->callByNameDepth >= 0);
 }


diff --git a/compiler/codegen.hpp b/compiler/codegen.hpp
index 7fe6bd5..467a9c6 100644
--- a/compiler/codegen.hpp
+++ b/compiler/codegen.hpp
@@ -140,6 +140,8 @@ struct CodegenContext {
     int inlineDepth:31;
     bool checkExceptions:1;

+    int callByNameDepth;
+
     CodegenContext()
         : llvmFunc(NULL),
           initBuilder(NULL),
@@ -147,7 +149,8 @@ struct CodegenContext {
           valueForStatics(NULL),
           exceptionValue(NULL),
           inlineDepth(0),
-          checkExceptions(true)
+          checkExceptions(true),
+          callByNameDepth(0)
     {
     }

@@ -158,7 +161,8 @@ struct CodegenContext {
           valueForStatics(NULL),
           exceptionValue(NULL),
           inlineDepth(0),
-          checkExceptions(true)
+          checkExceptions(true),
+          callByNameDepth(0)
     {
     }

[stepancheg]

@galchinsky Well, it is definitely better than current stack overlfow in the compiler. I'd commit your solution.

[stepancheg]

@galchinsky OK, I'll commit your version with several tests I've written earlier. And everyone is welcome to write proper solution, that explicitly detects recursion.