From 344b0d18eb9f9f2f2ef704acadc510a6dd56a282 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Thu, 13 Dec 2018 23:30:14 +0000 Subject: Revert "Add a baseline flag to JIT compile." This reverts commit e734fe8d4aa5f70a5798363774a4ed63357ebe20. Reason for revert: May be breaking tests. Change-Id: I6c0c04a60c1b4f329c472d28a3c2666526bd6383 --- compiler/jit/jit_compiler.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'compiler/jit/jit_compiler.cc') diff --git a/compiler/jit/jit_compiler.cc b/compiler/jit/jit_compiler.cc index e57bbfa1e1..9b8bb3e90e 100644 --- a/compiler/jit/jit_compiler.cc +++ b/compiler/jit/jit_compiler.cc @@ -126,11 +126,11 @@ extern "C" void jit_unload(void* handle) { } extern "C" bool jit_compile_method( - void* handle, ArtMethod* method, Thread* self, bool baseline, bool osr) + void* handle, ArtMethod* method, Thread* self, bool osr) REQUIRES_SHARED(Locks::mutator_lock_) { auto* jit_compiler = reinterpret_cast(handle); DCHECK(jit_compiler != nullptr); - return jit_compiler->CompileMethod(self, method, baseline, osr); + return jit_compiler->CompileMethod(self, method, osr); } extern "C" void jit_types_loaded(void* handle, mirror::Class** types, size_t count) @@ -181,7 +181,7 @@ JitCompiler::~JitCompiler() { } } -bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool baseline, bool osr) { +bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool osr) { SCOPED_TRACE << "JIT compiling " << method->PrettyMethod(); DCHECK(!method->IsProxyMethod()); @@ -198,7 +198,7 @@ bool JitCompiler::CompileMethod(Thread* self, ArtMethod* method, bool baseline, TimingLogger::ScopedTiming t2("Compiling", &logger); JitCodeCache* const code_cache = runtime->GetJit()->GetCodeCache(); success = compiler_driver_->GetCompiler()->JitCompile( - self, code_cache, method, baseline, osr, jit_logger_.get()); + self, code_cache, method, /* baseline= */ false, osr, jit_logger_.get()); } // Trim maps to reduce memory usage. -- cgit v1.2.3-59-g8ed1b