Move getMethodInfo calls to a more suited place

scripting/abc_opcodes.cpp

@@ -325,12 +325,13 @@ void ABCVm::callProperty(call_context* th, int n, int m, method_info*& called_mi
 		if(o->getObjectType()==T_FUNCTION)
 		{
 			IFunction* f=static_cast<IFunction*>(o);
-			called_mi=f->getMethodInfo();
 			//Methods has to be runned with their own class this
 			//The owner has to be increffed
 			obj->incRef();
 			f->incRef();
 			ASObject* ret=f->call(obj,args,m);
+			//call getMethodInfo only after the call, so it's updated
+			called_mi=f->getMethodInfo();
 			f->decRef();
 			if(ret==NULL)
 				ret=new Undefined;
@@ -367,8 +368,6 @@ void ABCVm::callProperty(call_context* th, int n, int m, method_info*& called_mi
 				assert_and_throw(o->getObjectType()==T_FUNCTION);
 
 				IFunction* f=static_cast<IFunction*>(o);
-				called_mi=f->getMethodInfo();
-
 				//Create a new array
 				ASObject** proxyArgs=new ASObject*[m+1];
 				//Well, I don't how to pass multiname to an as function. I'll just pass the name as a string
@@ -381,6 +380,8 @@ void ABCVm::callProperty(call_context* th, int n, int m, method_info*& called_mi
 				LOG(LOG_CALLS,_("Proxy::callProperty"));
 				f->incRef();
 				ASObject* ret=f->call(obj,proxyArgs,m+1);
+				//call getMethodInfo only after the call, so it's updated
+				called_mi=f->getMethodInfo();
 				f->decRef();
 				if(ret==NULL)
 					ret=new Undefined;
@@ -893,11 +894,12 @@ void ABCVm::callPropVoid(call_context* th, int n, int m, method_info*& called_mi
 		if(o->getObjectType()==T_FUNCTION)
 		{
 			IFunction* f=static_cast<IFunction*>(o);
-			called_mi=f->getMethodInfo();
 			obj->incRef();
 
 			f->incRef();
 			ASObject* ret=f->call(obj,args,m);
+			//call getMethodInfo only after the call, so it's updated
+			called_mi=f->getMethodInfo();
 			f->decRef();
 			if(ret)
 				ret->decRef();
@@ -926,7 +928,6 @@ void ABCVm::callPropVoid(call_context* th, int n, int m, method_info*& called_mi
 				assert_and_throw(o->getObjectType()==T_FUNCTION);
 
 				IFunction* f=static_cast<IFunction*>(o);
-				called_mi=f->getMethodInfo();
 
 				//Create a new array
 				ASObject** proxyArgs=new ASObject*[m+1];
@@ -940,6 +941,8 @@ void ABCVm::callPropVoid(call_context* th, int n, int m, method_info*& called_mi
 				LOG(LOG_CALLS,_("Proxy::callProperty"));
 				f->incRef();
 				ASObject* ret=f->call(obj,proxyArgs,m+1);
+				//call getMethodInfo only after the call, so it's updated
+				called_mi=f->getMethodInfo();
 				f->decRef();
 				if(ret)
 					ret->decRef();
@@ -1760,10 +1763,11 @@ void ABCVm::callSuper(call_context* th, int n, int m, method_info*& called_mi)
 		if(o->getObjectType()==T_FUNCTION)
 		{
 			IFunction* f=static_cast<IFunction*>(o);
-			called_mi=f->getMethodInfo();
 			obj->incRef();
 			f->incRef();
 			ASObject* ret=f->call(obj,args,m);
+			//call getMethodInfo only after the call, so it's updated
+			called_mi=f->getMethodInfo();
 			f->decRef();
 			th->runtime_stack_push(ret);
 		}
@@ -1846,10 +1850,11 @@ void ABCVm::callSuperVoid(call_context* th, int n, int m, method_info*& called_m
 		if(o->getObjectType()==T_FUNCTION)
 		{
 			IFunction* f=static_cast<IFunction*>(o);
-			called_mi=f->getMethodInfo();
 			obj->incRef();
 			f->incRef();
 			ASObject* ret=f->call(obj,args,m);
+			//call getMethodInfo only after the call, so it's updated
+			called_mi=f->getMethodInfo();
 			f->decRef();
 			if(ret)
 				ret->decRef();
@@ -2516,10 +2521,11 @@ void ABCVm::call(call_context* th, int m, method_info*& called_mi)
 	if(f->getObjectType()==T_FUNCTION)
 	{
 		IFunction* func=static_cast<IFunction*>(f);
-		called_mi=func->getMethodInfo();
 		//TODO: check for correct level, member function are already binded
 		func->incRef();
 		ASObject* ret=func->call(obj,args,m);
+		//call getMethodInfo only after the call, so it's updated
+		called_mi=func->getMethodInfo();
 		func->decRef();
 		//Push the value only if not null
 		if(ret)