Skip to content

Commit

Permalink
Fixed merge from master.
Browse files Browse the repository at this point in the history
  • Loading branch information
brixen committed Apr 30, 2016
1 parent 6dc84fb commit 4d20704
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion machine/jit/llvm/util.cpp
Expand Up @@ -92,7 +92,7 @@ extern "C" {
return obj->tainted_p(state);
}

void rbx_method_frame_initialize(STATE, CallFrame* call_frame,
bool rbx_method_frame_initialize(STATE, CallFrame* call_frame,
StackVariables* scope, Executable* exec, Module* mod, Arguments* args)
{
CompiledCode* code = as<CompiledCode>(exec);
Expand Down

0 comments on commit 4d20704

Please sign in to comment.