diff options
| -rw-r--r-- | runtime/java_vm_ext.cc | 5 | ||||
| -rw-r--r-- | runtime/verifier/method_verifier.cc | 1 | ||||
| -rw-r--r-- | test/Android.libarttest.mk | 10 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc index 1e8326b751..d6c798a863 100644 --- a/runtime/java_vm_ext.cc +++ b/runtime/java_vm_ext.cc @@ -580,8 +580,9 @@ inline bool JavaVMExt::MayAccessWeakGlobals(Thread* self) const { } inline bool JavaVMExt::MayAccessWeakGlobalsUnlocked(Thread* self) const { - return kUseReadBarrier ? self->GetWeakRefAccessEnabled() : - allow_accessing_weak_globals_.LoadSequentiallyConsistent(); + return kUseReadBarrier + ? self->GetWeakRefAccessEnabled() + : allow_accessing_weak_globals_.LoadSequentiallyConsistent(); } mirror::Object* JavaVMExt::DecodeWeakGlobal(Thread* self, IndirectRef ref) { diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc index 4f921bdbc8..bba9c5e3c5 100644 --- a/runtime/verifier/method_verifier.cc +++ b/runtime/verifier/method_verifier.cc @@ -3407,7 +3407,6 @@ const RegType& MethodVerifier::GetCaughtExceptionType() { ArtMethod* MethodVerifier::ResolveMethodAndCheckAccess( uint32_t dex_method_idx, MethodType method_type) { const DexFile::MethodId& method_id = dex_file_->GetMethodId(dex_method_idx); - // LOG(INFO) << dex_file_->NumTypeIds() << " " << dex_file_->NumClassDefs(); const RegType& klass_type = ResolveClassAndCheckAccess(method_id.class_idx_); if (klass_type.IsConflict()) { std::string append(" in attempt to access method "); diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk index 90bf5b5a40..c3d157655c 100644 --- a/test/Android.libarttest.mk +++ b/test/Android.libarttest.mk @@ -54,14 +54,16 @@ define build-libarttest $$(error expected target or host for argument 1, received $(1)) endif endif - ifneq ($(2),d) + ifneq ($(2),debug) ifneq ($(2),) $$(error d or empty for argument 2, received $(2)) endif + suffix := d + else + suffix := endif art_target_or_host := $(1) - suffix := $(2) include $(CLEAR_VARS) LOCAL_CPP_EXTENSION := $(ART_CPP_EXTENSION) @@ -100,11 +102,11 @@ endef ifeq ($(ART_BUILD_TARGET),true) $(eval $(call build-libarttest,target,)) - $(eval $(call build-libarttest,target,d)) + $(eval $(call build-libarttest,target,debug)) endif ifeq ($(ART_BUILD_HOST),true) $(eval $(call build-libarttest,host,)) - $(eval $(call build-libarttest,host,d)) + $(eval $(call build-libarttest,host,debug)) endif # Clear locally used variables. diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 6b57f2b957..ad3fb41586 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -67,7 +67,7 @@ while true; do echo "$0 missing argument to --testlib" 1>&2 exit 1 fi - ARGS="${ARGS} $1" + ARGS="${ARGS} $1" shift elif [ "x$1" = "x-Xcompiler-option" ]; then shift |