diff options
| author | 2016-10-03 18:01:28 -0700 | |
|---|---|---|
| committer | 2016-10-04 10:46:16 -0700 | |
| commit | 1cc62e4ea24828fdb3f3da0b8603f0b107d09a04 (patch) | |
| tree | 718e322f3d05ac095770d4dc2a68b824bf3974a7 /runtime/openjdkjvm/OpenjdkJvm.cc | |
| parent | 82d4838d6bb3480cd25327cedc5179fb2d86881c (diff) | |
Rename ObjPtr::Decode to ObjPtr::Ptr
Done to prevent ambiguity with ScopedObjectAccess::Decode.
Bug: 31113334
Test: test-art-host
Change-Id: I07a2497cc9cf66386311798933547471987fc316
Diffstat (limited to 'runtime/openjdkjvm/OpenjdkJvm.cc')
| -rw-r--r-- | runtime/openjdkjvm/OpenjdkJvm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/openjdkjvm/OpenjdkJvm.cc b/runtime/openjdkjvm/OpenjdkJvm.cc index d46d78c2f4..2f51e27b2d 100644 --- a/runtime/openjdkjvm/OpenjdkJvm.cc +++ b/runtime/openjdkjvm/OpenjdkJvm.cc @@ -364,7 +364,7 @@ JNIEXPORT void JVM_Sleep(JNIEnv* env, jclass threadClass ATTRIBUTE_UNUSED, jobject java_lock, jlong millis) { art::ScopedFastNativeObjectAccess soa(env); art::ObjPtr<art::mirror::Object> lock = soa.Decode<art::mirror::Object>(java_lock); - art::Monitor::Wait(art::Thread::Current(), lock.Decode(), millis, 0, true, art::kSleeping); + art::Monitor::Wait(art::Thread::Current(), lock.Ptr(), millis, 0, true, art::kSleeping); } JNIEXPORT jobject JVM_CurrentThread(JNIEnv* env, jclass unused ATTRIBUTE_UNUSED) { @@ -399,7 +399,7 @@ JNIEXPORT jboolean JVM_HoldsLock(JNIEnv* env, jclass unused ATTRIBUTE_UNUSED, jo art::ThrowNullPointerException("object == null"); return JNI_FALSE; } - return soa.Self()->HoldsLock(object.Decode()); + return soa.Self()->HoldsLock(object.Ptr()); } JNIEXPORT void JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring java_name) { |