JSR 292: rename the mb field in InvDynMethodBlock

Robert Lougher · Robert Lougher · commit 6c350119896f · 2014-06-05T01:17:26.000+01:00
As for the mb field in PolyMethodBlock, the mb in InvDynMethodBlock
is the callsite invoker.

Signed-off-by: Robert Lougher &lt;rob@jamvm.org.uk&gt;
diff --git a/src/classlib/openjdk/mh.c b/src/classlib/openjdk/mh.c
@@ -1115,7 +1115,7 @@ InvDynMethodBlock *resolveCallSite(ResolvedInvDynCPEntry *entry,
 
     InvDynMethodBlock *idmb = sysMalloc(sizeof(InvDynMethodBlock));
 
-    idmb->mb = invoker;
+    idmb->invoker = invoker;
     idmb->appendix = ARRAY_DATA(appendix_box, Object*)[0];
 
 #ifndef DIRECT
diff --git a/src/interp/engine/interp.c b/src/interp/engine/interp.c
@@ -2232,7 +2232,7 @@ uintptr_t *executeJava() {
         if(idmb->appendix)
             *ostack++ = (uintptr_t)idmb->appendix;
 
-        new_mb = idmb->mb;
+        new_mb = idmb->invoker;
         arg1 = ostack - new_mb->args_count;
 
         goto invokeMethod;
diff --git a/src/jam.h b/src/jam.h
@@ -608,8 +608,8 @@ typedef struct invdyn_methodblock  {
 #ifndef DIRECT
     int id;
 #endif
-    MethodBlock *mb;
     Object *appendix;
+    MethodBlock *invoker;
     struct invdyn_methodblock *next;
 } InvDynMethodBlock;
 
