summaryrefslogtreecommitdiff
path: root/compiler/jit/jit_compiler.cc
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2017-06-30 10:26:24 +0100
committer Nicolas Geoffray <ngeoffray@google.com> 2017-06-30 10:26:24 +0100
commitcf96bedc850e99f7dfeb4fc134603701c146f738 (patch)
tree9cb3decf0dca2a07e49ad9bb270a3c0f30030706 /compiler/jit/jit_compiler.cc
parent740c3008171fe69432db8bfe4b9c837ac24b85c0 (diff)
Fix unintended change in JIT inlining heuristics.
Happened after: https://android-review.googlesource.com/#/c/426519/ Seen on go/lem Test: test.py Change-Id: I6907e4259b98e0b9db0c624fd0bee6adc00fc7ee
Diffstat (limited to 'compiler/jit/jit_compiler.cc')
-rw-r--r--compiler/jit/jit_compiler.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc
index 715d97379e..28a3f1edae 100644
--- a/compiler/jit/jit_compiler.cc
+++ b/compiler/jit/jit_compiler.cc
@@ -100,6 +100,10 @@ JitCompiler::JitCompiler() {
// Set debuggability based on the runtime value.
compiler_options_->SetDebuggable(Runtime::Current()->IsJavaDebuggable());
+ // Special case max code units for inlining, whose default is "unset" (implictly
+ // meaning no limit).
+ compiler_options_->SetInlineMaxCodeUnits(CompilerOptions::kDefaultInlineMaxCodeUnits);
+
const InstructionSet instruction_set = kRuntimeISA;
for (const StringPiece option : Runtime::Current()->GetCompilerOptions()) {
VLOG(compiler) << "JIT compiler option " << option;