diff options
| author | 2017-06-30 12:28:37 +0000 | |
|---|---|---|
| committer | 2017-06-30 12:28:37 +0000 | |
| commit | 89ae0f42e38a2f985ac404830f2a05fecf9547e2 (patch) | |
| tree | 94f9768d4639fcda93a46c27637154259c810ea0 /compiler/jit/jit_compiler.cc | |
| parent | aed3dbf9601bc1bb91142dce10a89cf5ea6a93d3 (diff) | |
| parent | cf96bedc850e99f7dfeb4fc134603701c146f738 (diff) | |
Merge "Fix unintended change in JIT inlining heuristics."
Diffstat (limited to 'compiler/jit/jit_compiler.cc')
| -rw-r--r-- | compiler/jit/jit_compiler.cc | 4 |
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; |