diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 5 | 
1 files changed, 3 insertions, 2 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 92ebf060eb..3efe7c77fa 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -27,6 +27,7 @@  #include "mirror/class_loader.h"  #include "mirror/dex_cache.h"  #include "nodes.h" +#include "optimizing_compiler.h"  #include "reference_type_propagation.h"  #include "register_allocator.h"  #include "ssa_phi_elimination.h" @@ -64,14 +65,14 @@ void HInliner::Run() {          // We use the original invoke type to ensure the resolution of the called method          // works properly.          if (!TryInline(call, call->GetDexMethodIndex())) { -          if (kIsDebugBuild) { +          if (kIsDebugBuild && IsCompilingWithCoreImage()) {              std::string callee_name =                  PrettyMethod(call->GetDexMethodIndex(), *outer_compilation_unit_.GetDexFile());              bool should_inline = callee_name.find("$inline$") != std::string::npos;              CHECK(!should_inline) << "Could not inline " << callee_name;            }          } else { -          if (kIsDebugBuild) { +          if (kIsDebugBuild && IsCompilingWithCoreImage()) {              std::string callee_name =                  PrettyMethod(call->GetDexMethodIndex(), *outer_compilation_unit_.GetDexFile());              bool must_not_inline = callee_name.find("$noinline$") != std::string::npos;  |