commit 68ffda887e35f35e978f2f607b7a91e44a5e1969
author Mathieu Chartier <mathieuc@google.com> Fri Sep 04 02:06:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Sep 04 02:06:49 2015 +0000
tree 7a07331657f142455732d0161518a02e48d87326
parent 8c679146d7a5c0c193ffab65d786fd5d84b3f4fd
parent de286fdcb4d203438b4b49c22c8a4a24d08ad14d

Merge "Address some leftover comments"

runtime/java_vm_ext.cc

diff --git a/runtime/java_vm_ext.cc b/runtime/java_vm_ext.cc
index 1e8326b..d6c798a 100644
--- a/runtime/java_vm_ext.cc
+++ b/runtime/java_vm_ext.cc
@@ -580,8 +580,9 @@
 }
 
 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) {

runtime/verifier/method_verifier.cc

diff --git a/runtime/verifier/method_verifier.cc b/runtime/verifier/method_verifier.cc
index 4f921bd..bba9c5e 100644
--- a/runtime/verifier/method_verifier.cc
+++ b/runtime/verifier/method_verifier.cc
@@ -3407,7 +3407,6 @@
 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 ");

test/Android.libarttest.mk

diff --git a/test/Android.libarttest.mk b/test/Android.libarttest.mk
index 90bf5b5..c3d1576 100644
--- a/test/Android.libarttest.mk
+++ b/test/Android.libarttest.mk
@@ -54,14 +54,16 @@
       $$(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 @@
 
 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.

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 6b57f2b..ad3fb41 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -67,7 +67,7 @@
             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