am 813a3a2d: Merge "If dalvik wants ASCII casing, it needs to ask for it."

[android-x86/dalvik.git] / vm / Sync.cpp

diff --git a/vm/Sync.cpp b/vm/Sync.cpp
index 8a3803e..f42004c 100644 (file)
--- a/vm/Sync.cpp
+++ b/vm/Sync.cpp
@@ -101,10 +101,6 @@ Monitor* dvmCreateMonitor(Object* obj)
         ALOGE("Unable to allocate monitor");
         dvmAbort();
     }
-    if (((u4)mon & 7) != 0) {
-        ALOGE("Misaligned monitor: %p", mon);
-        dvmAbort();
-    }
     mon->obj = obj;
     dvmInitMutex(&mon->lock);
 
@@ -276,6 +272,11 @@ static void logContentionEvent(Thread *self, u4 waitMs, u4 samplePercent,
     size_t len;
     int fd;
 
+    /* When a thread is being destroyed it is normal that the frame depth is zero */
+    if (self->interpSave.curFrame == NULL) {
+        return;
+    }
+
     saveArea = SAVEAREA_FROM_FP(self->interpSave.curFrame);
     meth = saveArea->method;
     cp = eventBuffer;