commit 8e2252df6fbd1313ca17724be36199d32e8e44cc
author Treehugger Robot <treehugger-gerrit@google.com> Thu Apr 27 11:04:40 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Apr 27 11:04:41 2017 +0000
tree 6f966c60da5beb6943094ef6e18bcf3b6c0f537b
parent dc8d7b63a8de1749b8832257549d0b60c9cf4c50
parent eed8ca45960379e55956cb60e32fcbf5be999e54

Merge "Remove ART run-test 648-many-direct-methods."

compiler/optimizing/graph_checker.cc

diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index 34b52a8..12340b4 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -497,8 +497,7 @@
                             "has a null pointer as last input.",
                             invoke->DebugName(),
                             invoke->GetId()));
-    }
-    if (!last_input->IsClinitCheck() && !last_input->IsLoadClass()) {
+    } else if (!last_input->IsClinitCheck() && !last_input->IsLoadClass()) {
       AddError(StringPrintf("Static invoke %s:%d marked as having an explicit clinit check "
                             "has a last instruction (%s:%d) which is neither a clinit check "
                             "nor a load class instruction.",