[[ Bug 18899 ]] Make sure current module is updated

runrevmark · livecodeali · commit 6e2269cb8aca · 2017-07-12T09:36:08.000+01:00
This patch ensures that the current module global is updated
whenever a new frame is created on the LCB stack.

This fixes an issue with 'image from resource file' not working.
diff --git a/libscript/src/script-bytecode.hpp b/libscript/src/script-bytecode.hpp
@@ -315,10 +315,12 @@ struct MCScriptBytecodeOp_Invoke
 		{
 			case kMCScriptDefinitionKindHandler:
 			{
+                MCScriptModuleRef t_previous = MCScriptSetCurrentModule(t_resolved_instance->module);
 				ctxt.PushFrame(t_resolved_instance,
 							   static_cast<MCScriptHandlerDefinition *>(t_resolved_definition),
 							   t_result_reg,
 				               t_arguments);
+                MCScriptSetCurrentModule(t_previous);
 			}
 			break;
 				
@@ -526,10 +528,12 @@ struct MCScriptBytecodeOp_InvokeIndirect
 		{
 			case kMCScriptDefinitionKindHandler:
 			{
+                MCScriptModuleRef t_previous = MCScriptSetCurrentModule(t_handler_instance->module);
 				ctxt.PushFrame(t_handler_instance,
 							   static_cast<MCScriptHandlerDefinition *>(t_handler_def),
 							   p_result_reg,
 				               p_argument_regs);
+                MCScriptSetCurrentModule(t_previous);
 			}
 			break;
 				
diff --git a/libscript/src/script-instance.cpp b/libscript/src/script-instance.cpp
@@ -26,7 +26,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////
 
-// This is the module of the most recent LCB stack frame on the current thread's
+// This is the module of themost recent LCB stack frame on the current thread's
 // stack. It is set before and after a foreign handler call so that the native
 // code can get some element of context.
 static MCScriptModuleRef s_current_module = nil;
@@ -232,7 +232,9 @@ __MCScriptCallHandlerDefinitionInInstance(MCScriptInstanceRef self,
         }
     }
 
-	MCScriptExecuteContext t_execute_ctxt;
+    MCScriptModuleRef t_previous = MCScriptSetCurrentModule(self->module);
+	
+    MCScriptExecuteContext t_execute_ctxt;
 	t_execute_ctxt.Enter(self,
 						 p_handler_def,
 	                     MCMakeSpan(p_arguments, p_argument_count),
@@ -252,6 +254,8 @@ __MCScriptCallHandlerDefinitionInInstance(MCScriptInstanceRef self,
                                     t_cookie);
         }
     }
+    
+    MCScriptSetCurrentModule(t_previous);
 
 	if (!t_execute_ctxt.Leave())
 	{
@@ -1277,6 +1281,13 @@ MCScriptModuleRef MCScriptGetCurrentModule(void)
 	return s_current_module;
 }
 
+MCScriptModuleRef MCScriptSetCurrentModule(MCScriptModuleRef p_module)
+{
+    MCScriptModuleRef t_previous = s_current_module;
+    s_current_module = p_module;
+    return t_previous;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 
 extern "C" bool MC_DLLEXPORT_DEF MCScriptBuiltinRepeatCounted(uinteger_t *x_count)
diff --git a/libscript/src/script-private.h b/libscript/src/script-private.h
@@ -538,6 +538,8 @@ struct MCScriptInstance: public MCScriptObject
     void *host_ptr;
 };
 
+MCScriptModuleRef MCScriptSetCurrentModule(MCScriptModuleRef module);
+
 void
 MCScriptDestroyInstance(MCScriptInstanceRef instance);
 

Original file line number	Diff line number	Diff line change
`@@ -315,10 +315,12 @@ struct MCScriptBytecodeOp_Invoke`
`315`	`315`	`{`
`316`	`316`	`case kMCScriptDefinitionKindHandler:`
`317`	`317`	`{`
	`318`	`+ MCScriptModuleRef t_previous = MCScriptSetCurrentModule(t_resolved_instance->module);`
`318`	`319`	`ctxt.PushFrame(t_resolved_instance,`
`319`	`320`	`static_cast<MCScriptHandlerDefinition *>(t_resolved_definition),`
`320`	`321`	`t_result_reg,`
`321`	`322`	`t_arguments);`
	`323`	`+ MCScriptSetCurrentModule(t_previous);`
`322`	`324`	`}`
`323`	`325`	`break;`
`324`	`326`
`@@ -526,10 +528,12 @@ struct MCScriptBytecodeOp_InvokeIndirect`
`526`	`528`	`{`
`527`	`529`	`case kMCScriptDefinitionKindHandler:`
`528`	`530`	`{`
	`531`	`+ MCScriptModuleRef t_previous = MCScriptSetCurrentModule(t_handler_instance->module);`
`529`	`532`	`ctxt.PushFrame(t_handler_instance,`
`530`	`533`	`static_cast<MCScriptHandlerDefinition *>(t_handler_def),`
`531`	`534`	`p_result_reg,`
`532`	`535`	`p_argument_regs);`
	`536`	`+ MCScriptSetCurrentModule(t_previous);`
`533`	`537`	`}`
`534`	`538`	`break;`
`535`	`539`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`
`27`	`27`	`////////////////////////////////////////////////////////////////////////////////`
`28`	`28`
`29`		`-// This is the module of the most recent LCB stack frame on the current thread's`
	`29`	`+// This is the module of themost recent LCB stack frame on the current thread's`
`30`	`30`	`// stack. It is set before and after a foreign handler call so that the native`
`31`	`31`	`// code can get some element of context.`
`32`	`32`	`static MCScriptModuleRef s_current_module = nil;`
`@@ -232,7 +232,9 @@ __MCScriptCallHandlerDefinitionInInstance(MCScriptInstanceRef self,`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`
`235`		`- MCScriptExecuteContext t_execute_ctxt;`
	`235`	`+ MCScriptModuleRef t_previous = MCScriptSetCurrentModule(self->module);`
	`236`	`+`
	`237`	`+ MCScriptExecuteContext t_execute_ctxt;`
`236`	`238`	`t_execute_ctxt.Enter(self,`
`237`	`239`	`p_handler_def,`
`238`	`240`	`MCMakeSpan(p_arguments, p_argument_count),`
`@@ -252,6 +254,8 @@ __MCScriptCallHandlerDefinitionInInstance(MCScriptInstanceRef self,`
`252`	`254`	`t_cookie);`
`253`	`255`	`}`
`254`	`256`	`}`
	`257`	`+`
	`258`	`+ MCScriptSetCurrentModule(t_previous);`
`255`	`259`
`256`	`260`	`if (!t_execute_ctxt.Leave())`
`257`	`261`	`{`
`@@ -1277,6 +1281,13 @@ MCScriptModuleRef MCScriptGetCurrentModule(void)`
`1277`	`1281`	`return s_current_module;`
`1278`	`1282`	`}`
`1279`	`1283`
	`1284`	`+MCScriptModuleRef MCScriptSetCurrentModule(MCScriptModuleRef p_module)`
	`1285`	`+{`
	`1286`	`+ MCScriptModuleRef t_previous = s_current_module;`
	`1287`	`+ s_current_module = p_module;`
	`1288`	`+ return t_previous;`
	`1289`	`+}`
	`1290`	`+`
`1280`	`1291`	`////////////////////////////////////////////////////////////////////////////////`
`1281`	`1292`
`1282`	`1293`	`extern "C" bool MC_DLLEXPORT_DEF MCScriptBuiltinRepeatCounted(uinteger_t *x_count)`