Merge pull request #10738 from JuliaLang/ob/missingroot

Missing GC root
JuliaLang · Apr 23, 2015 · 7e63e6a · 7e63e6a
2 parents 5e99f74 + 944fdd4
commit 7e63e6a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -2424,6 +2424,7 @@ static Value *emit_call(jl_value_t **args, size_t arglen, jl_codectx_t *ctx, jl_
  bool definitely_not_function = false;
 
  jl_function_t *f = (jl_function_t*)static_eval(a0, ctx, true);
+ JL_GC_PUSH1(&f);
  if (f != NULL) {
  // function is a compile-time constant
  Value *result;
@@ -2438,7 +2439,10 @@ static Value *emit_call(jl_value_t **args, size_t arglen, jl_codectx_t *ctx, jl_
  result = emit_known_call((jl_value_t*)jl_module_call_func(ctx->module),
  args-1, nargs+1, ctx, &theFptr, &f, expr);
  }
- if (result != NULL) return result;
+ if (result != NULL) {
+ JL_GC_POP();
+ return result;
+ }
  }
 
  hdtype = expr_type(a0, ctx);
@@ -2541,6 +2545,7 @@ static Value *emit_call(jl_value_t **args, size_t arglen, jl_codectx_t *ctx, jl_
  }
 
  ctx->argDepth = last_depth;
+ JL_GC_POP();
  return result;
 }