Fix race in double verifying super class

Change-Id: I75089d0be8ad13b22300dd59bcc88da61d349e0d

1 files changed, 0 insertions, 30 deletions

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 8c46a7e403..4226ea5bb6 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -23,7 +23,6 @@
 #include "intern_table.h"
 #include "leb128.h"
 #include "logging.h"
-#include "monitor.h"
 #include "oat_file.h"
 #include "object.h"
 #include "object_utils.h"
@@ -193,35 +192,6 @@ const char* ClassLinker::class_roots_descriptors_[] = {
   "[Ljava/lang/StackTraceElement;",
 };
 
-class ObjectLock {
- public:
-  explicit ObjectLock(Object* object) : self_(Thread::Current()), obj_(object) {
-    CHECK(object != NULL);
-    obj_->MonitorEnter(self_);
-  }
-
-  ~ObjectLock() {
-    obj_->MonitorExit(self_);
-  }
-
-  void Wait() {
-    return Monitor::Wait(self_, obj_, 0, 0, false);
-  }
-
-  void Notify() {
-    obj_->Notify();
-  }
-
-  void NotifyAll() {
-    obj_->NotifyAll();
-  }
-
- private:
-  Thread* self_;
-  Object* obj_;
-  DISALLOW_COPY_AND_ASSIGN(ObjectLock);
-};
-
 ClassLinker* ClassLinker::Create(const std::string& boot_class_path, InternTable* intern_table) {
   CHECK_NE(boot_class_path.size(), 0U);
   UniquePtr<ClassLinker> class_linker(new ClassLinker(intern_table));