commit ddab84b89cc1bd0c002488d0587c3cf6c78bac6d
author Andy McFadden <fadden@android.com> Mon Mar 28 15:23:23 2011 -0700
committer Andy McFadden <fadden@android.com> Mon Mar 28 15:23:23 2011 -0700
tree 435aa31fd7d184eb1036db2021917887094395be
parent 44cec053863fd66cf51048dc43d415ce6af5fd24

Fix a couple of asserts

Polarity was reversed.

Change-Id: I15af89267a703210ae5d08a9cca529b2f0cd48c6

vm/interp/Interp.c

diff --git a/vm/interp/Interp.c b/vm/interp/Interp.c
index 7ad3096..9df0d23 100644
--- a/vm/interp/Interp.c
+++ b/vm/interp/Interp.c
@@ -649,7 +649,7 @@
     if (self->interpBreak.ctl.subMode & kSubModeDebuggerActive) {
         Object* thisPtr = dvmGetThisPtr(self->interpSave.method,
                                         self->interpSave.fp);
-        assert(thisPtr != NULL && !dvmIsValidObject(thisPtr));
+        assert(thisPtr == NULL || dvmIsValidObject(thisPtr));
         dvmDbgPostLocationEvent(methodToCall, -1, thisPtr, DBG_METHOD_ENTRY);
     }
 }
@@ -664,7 +664,7 @@
     if (self->interpBreak.ctl.subMode & kSubModeDebuggerActive) {
         Object* thisPtr = dvmGetThisPtr(self->interpSave.method,
                                         self->interpSave.fp);
-        assert(thisPtr != NULL && !dvmIsValidObject(thisPtr));
+        assert(thisPtr == NULL || dvmIsValidObject(thisPtr));
         dvmDbgPostLocationEvent(methodToCall, -1, thisPtr, DBG_METHOD_EXIT);
     }
     if (self->interpBreak.ctl.subMode & kSubModeMethodTrace) {