commit 72155d2f05e38b265cb79a31abdbe65cd29d3a5b
author George Burgess IV <gbiv@google.com> Tue Apr 25 15:17:16 2017 -0700
committer George Burgess IV <gbiv@google.com> Wed Apr 26 10:40:05 2017 -0700
tree b699f16d33985384efa8494ba93866298c59c46b
parent 0d2ea2f09937e55600f8a1eda6b102fef1ab9c0b

fix a null pointer dereference

Caught by the static analyzer:
art/compiler/optimizing/graph_checker.cc:501:10: warning: Called C++
object pointer is null [clang-analyzer-core.CallAndMessage]

Bug: None
Test: Still builds; static analyzer no longer complains.
Change-Id: Iba20a0cd859cca0cf38f6e10c3685cc986b5baa5

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.",