commit 349eded3bc542c9e6ffb10b6222c6ce372bda9b7
author David Brazdil <dbrazdil@google.com> Mon Apr 20 17:12:53 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Apr 20 17:12:53 2015 +0000
tree c1aa758e8975b80b305a860364e9557efb2ccfe5
parent 6149f962cd0815c61c134a7554036ca88d0abef1
parent 0d13fee6f4330cc9cb100c43135490a34c11d7a5

Merge "ART: Simplify more bool operations"

compiler/optimizing/code_generator_x86.cc

diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc
index 96a77bd..87c74fb 100644
--- a/compiler/optimizing/code_generator_x86.cc
+++ b/compiler/optimizing/code_generator_x86.cc
@@ -1220,6 +1220,7 @@
 
   codegen_->GenerateStaticOrDirectCall(
       invoke, invoke->GetLocations()->GetTemp(0).AsRegister<Register>());
+  codegen_->RecordPcInfo(invoke, invoke->GetDexPc());
 }
 
 void LocationsBuilderX86::VisitInvokeVirtual(HInvokeVirtual* invoke) {
@@ -3106,7 +3107,6 @@
   }
 
   DCHECK(!IsLeafMethod());
-  RecordPcInfo(invoke, invoke->GetDexPc());
 }
 
 void CodeGeneratorX86::MarkGCCard(Register temp, Register card, Register object, Register value) {

tools/run-jdwp-tests.sh

diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index e87ae08..301708b 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -19,6 +19,11 @@
   exit 1
 fi
 
+if [[ $ANDROID_SERIAL == HT4CTJT03670 ]] || [[ $ANDROID_SERIAL == HT49CJT00070 ]]; then
+  echo "Not running on buildbot because of failures on volantis. Investigating."
+  exit 0
+fi
+
 # Jar containing all the tests.
 test_jar=out/host/linux-x86/framework/apache-harmony-jdwp-tests-hostdex.jar
 junit_jar=out/host/linux-x86/framework/junit.jar