Fixed merge from master.

brixen · brixen · commit 4d207047d7d6 · 2016-04-30T12:46:30.000-07:00
diff --git a/machine/jit/llvm/util.cpp b/machine/jit/llvm/util.cpp
@@ -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);

Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ extern "C" {`
`92`	`92`	`return obj->tainted_p(state);`
`93`	`93`	`}`
`94`	`94`
`95`		`- void rbx_method_frame_initialize(STATE, CallFrame* call_frame,`
	`95`	`+ bool rbx_method_frame_initialize(STATE, CallFrame* call_frame,`
`96`	`96`	`StackVariables* scope, Executable* exec, Module* mod, Arguments* args)`
`97`	`97`	`{`
`98`	`98`	`CompiledCode* code = as<CompiledCode>(exec);`