Revert "Use try lock to fix class resolution race"

[android-x86/art.git] / runtime / object_lock.cc

diff --git a/runtime/object_lock.cc b/runtime/object_lock.cc
index b8754a4..f7accc0 100644 (file)
--- a/runtime/object_lock.cc
+++ b/runtime/object_lock.cc
@@ -47,22 +47,7 @@ void ObjectLock<T>::NotifyAll() {
   obj_->NotifyAll(self_);
 }
 
-template <typename T>
-ObjectTryLock<T>::ObjectTryLock(Thread* self, Handle<T> object) : self_(self), obj_(object) {
-  CHECK(object.Get() != nullptr);
-  acquired_ = obj_->MonitorTryEnter(self_) != nullptr;
-}
-
-template <typename T>
-ObjectTryLock<T>::~ObjectTryLock() {
-  if (acquired_) {
-    obj_->MonitorExit(self_);
-  }
-}
-
 template class ObjectLock<mirror::Class>;
 template class ObjectLock<mirror::Object>;
-template class ObjectTryLock<mirror::Class>;
-template class ObjectTryLock<mirror::Object>;
 
 }  // namespace art