commit 54e45c59de68fabbc06ffda38fcb1ed57e1b913a
author Aart Bik <ajcbik@google.com> Fri Apr 27 13:57:21 2018 -0700
committer Aart Bik <ajcbik@google.com> Fri Apr 27 13:57:21 2018 -0700
tree f3669f1af3131c9543024e34f463ca5572c66414
parent c84335957653c3bbbe3cb9a4049c6d614b5abadb

Bug fix: add condition back

Rationale:
CL https://android-review.googlesource.com/c/platform/art/+/673413
left out this important condition

Test: test-art-host
Change-Id: Id233f07f2089e5269e7982146ff45864dc3e6acf

compiler/optimizing/inliner.cc

diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc
index 3800c96..ffa000e 100644
--- a/compiler/optimizing/inliner.cc
+++ b/compiler/optimizing/inliner.cc
@@ -178,7 +178,7 @@
           if (callee_name.find("$noinline$") == std::string::npos) {
             if (TryInline(call)) {
               didInline = true;
-            } else {
+            } else if (honor_inline_directives) {
               bool should_have_inlined = (callee_name.find("$inline$") != std::string::npos);
               CHECK(!should_have_inlined) << "Could not inline " << callee_name;
             }