diff options
| author | 2017-04-27 10:53:09 +0000 | |
|---|---|---|
| committer | 2017-04-27 10:53:11 +0000 | |
| commit | dc8d7b63a8de1749b8832257549d0b60c9cf4c50 (patch) | |
| tree | 12670940247a2ca216adae64d40a0b30179f537e /compiler | |
| parent | 204db008e0d6d21463038acb9b9aeff407a285a9 (diff) | |
| parent | 72155d2f05e38b265cb79a31abdbe65cd29d3a5b (diff) | |
Merge "fix a null pointer dereference"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/graph_checker.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc index 34b52a87b5..12340b416d 100644 --- a/compiler/optimizing/graph_checker.cc +++ b/compiler/optimizing/graph_checker.cc @@ -497,8 +497,7 @@ void GraphChecker::VisitInvokeStaticOrDirect(HInvokeStaticOrDirect* invoke) { "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.", |