diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | compiler/dex/quick/x86/int_x86.cc | 2 | ||||
| -rw-r--r-- | runtime/jni_internal.cc | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 62d40bbeec..6ad5606bde 100644 --- a/Android.mk +++ b/Android.mk @@ -143,7 +143,7 @@ test-art-host-interpreter: test-art-host-oat-interpreter test-art-host-run-test- @echo test-art-host-interpreter PASSED .PHONY: test-art-host-dependencies -test-art-host-dependencies: $(ART_HOST_TEST_DEPENDENCIES) $(HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) $(HOST_CORE_DEX_LOCATIONS) +test-art-host-dependencies: $(ART_HOST_TEST_DEPENDENCIES) $(HOST_OUT_SHARED_LIBRARIES)/libarttest$(ART_HOST_SHLIB_EXTENSION) $(HOST_CORE_DEX_LOCATIONS) $(HOST_OUT_EXECUTABLES)/jasmin .PHONY: test-art-host-gtest test-art-host-gtest: $(ART_HOST_TEST_TARGETS) @@ -209,7 +209,7 @@ test-art-target: test-art-target-gtest test-art-target-oat test-art-target-run-t @echo test-art-target PASSED .PHONY: test-art-target-dependencies -test-art-target-dependencies: $(ART_TARGET_TEST_DEPENDENCIES) $(ART_TEST_OUT)/libarttest.so +test-art-target-dependencies: $(ART_TARGET_TEST_DEPENDENCIES) $(ART_TEST_OUT)/libarttest.so $(HOST_OUT_EXECUTABLES)/jasmin .PHONY: test-art-target-sync test-art-target-sync: test-art-target-dependencies diff --git a/compiler/dex/quick/x86/int_x86.cc b/compiler/dex/quick/x86/int_x86.cc index 1df9254019..f4ae18fe47 100644 --- a/compiler/dex/quick/x86/int_x86.cc +++ b/compiler/dex/quick/x86/int_x86.cc @@ -1654,6 +1654,8 @@ void X86Mir2Lir::GenLongLongImm(RegLocation rl_dest, RegLocation rl_src1, X86OpCode x86op = GetOpcode(op, rl_dest, true, val_hi); NewLIR2(x86op, rl_dest.high_reg, val_hi); } + + StoreFinalValueWide(rl_dest, rl_dest); return; } diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 2cb2beba98..f9bcc71f05 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -2004,7 +2004,7 @@ class JNI { } static const jchar* GetStringChars(JNIEnv* env, jstring java_string, jboolean* is_copy) { - CHECK_NON_NULL_ARGUMENT(GetStringUTFRegion, java_string); + CHECK_NON_NULL_ARGUMENT(GetStringChars, java_string); ScopedObjectAccess soa(env); mirror::String* s = soa.Decode<mirror::String*>(java_string); mirror::CharArray* chars = s->GetCharArray(); @@ -2023,7 +2023,7 @@ class JNI { } static void ReleaseStringChars(JNIEnv* env, jstring java_string, const jchar* chars) { - CHECK_NON_NULL_ARGUMENT(GetStringUTFRegion, java_string); + CHECK_NON_NULL_ARGUMENT(ReleaseStringChars, java_string); delete[] chars; ScopedObjectAccess soa(env); UnpinPrimitiveArray(soa, soa.Decode<mirror::String*>(java_string)->GetCharArray()); |