commit ef5db621255680dbbe46cfcce572989deea64387
author buzbee <buzbee@google.com> Tue Feb 22 14:01:46 2011 -0800
committer buzbee <buzbee@google.com> Tue Feb 22 14:03:24 2011 -0800
tree d2a948e0e32b7a7314258733d3fb42f1c354efe0
parent b47ea10a90d7746dcd413f86a35a26b882f1263c

Fix for 3477749 WITH_TRACKREF_CHECKS

Failed to specify grouping struct on access to debugTrackedRefStart
in recent InterpState/Thread consolidation.  Fixed.

Change-Id: Ib996b96fa1f322e3c433377bea79293eb984fca9

vm/interp/Interp.c

diff --git a/vm/interp/Interp.c b/vm/interp/Interp.c
index 82f1372..4ecb053 100644
--- a/vm/interp/Interp.c
+++ b/vm/interp/Interp.c
@@ -1321,7 +1321,7 @@
 
 
 #if defined(WITH_TRACKREF_CHECKS)
-    self->debugTrackedRefStart =
+    self->interpSave.debugTrackedRefStart =
         dvmReferenceTableEntries(&self->internalLocalRefTable);
 #endif
     self->debugIsMethodEntry = true;

vm/mterp/out/InterpC-portdbg.c

diff --git a/vm/mterp/out/InterpC-portdbg.c b/vm/mterp/out/InterpC-portdbg.c
index b7bb528..ea284cf 100644
--- a/vm/mterp/out/InterpC-portdbg.c
+++ b/vm/mterp/out/InterpC-portdbg.c
@@ -1547,7 +1547,7 @@
     debugIsMethodEntry = self->debugIsMethodEntry;
 #endif
 #if defined(WITH_TRACKREF_CHECKS)
-    int debugTrackedRefStart = self->debugTrackedRefStart;
+    int debugTrackedRefStart = self->interpSave.debugTrackedRefStart;
 #endif
     DvmDex* methodClassDex;     // curMethod->clazz->pDvmDex
     JValue retval;

vm/mterp/out/InterpC-portstd.c

diff --git a/vm/mterp/out/InterpC-portstd.c b/vm/mterp/out/InterpC-portstd.c
index 1501ae6..2bc475f 100644
--- a/vm/mterp/out/InterpC-portstd.c
+++ b/vm/mterp/out/InterpC-portstd.c
@@ -1297,7 +1297,7 @@
     debugIsMethodEntry = self->debugIsMethodEntry;
 #endif
 #if defined(WITH_TRACKREF_CHECKS)
-    int debugTrackedRefStart = self->debugTrackedRefStart;
+    int debugTrackedRefStart = self->interpSave.debugTrackedRefStart;
 #endif
     DvmDex* methodClassDex;     // curMethod->clazz->pDvmDex
     JValue retval;

vm/mterp/portable/entry.c

diff --git a/vm/mterp/portable/entry.c b/vm/mterp/portable/entry.c
index c80a25e..c3139ee 100644
--- a/vm/mterp/portable/entry.c
+++ b/vm/mterp/portable/entry.c
@@ -13,7 +13,7 @@
     debugIsMethodEntry = self->debugIsMethodEntry;
 #endif
 #if defined(WITH_TRACKREF_CHECKS)
-    int debugTrackedRefStart = self->debugTrackedRefStart;
+    int debugTrackedRefStart = self->interpSave.debugTrackedRefStart;
 #endif
     DvmDex* methodClassDex;     // curMethod->clazz->pDvmDex
     JValue retval;