diff options
| author | 2021-11-17 13:47:07 +0000 | |
|---|---|---|
| committer | 2021-11-17 16:01:34 +0000 | |
| commit | 519ff8beed1845648cd7f5001e25faa4daf102d0 (patch) | |
| tree | 762f6502b796ef2ba0a9bb704916fc1519180f22 /compiler/optimizing/optimizing_compiler.cc | |
| parent | 23cf32f278374b89d0acbec74a510b77d543bed8 (diff) | |
Revert "Support calling entry / exit hooks from JIT code for non-debuggable"
This reverts commit bd95682d8a3ddb6f5e2ce1563d25e52ba2d823d7.
Reason for revert: Breaks git_master-art-host/art-forcecopy: https://android-build.googleplex.com/builds/submitted/7923798/art-forcecopy/latest/view/logs/build_error.log
Change-Id: I8d9b9bef6a9e4116b076c73dc5df3e6d19bcc79b
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index c3ccf954d0..16abf9d37d 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -800,8 +800,6 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* allocator, dead_reference_safe = false; } - bool is_instrumentation_enabled = - Runtime::Current()->GetInstrumentation()->NeedInstrumentationSupportForJIT(); HGraph* graph = new (allocator) HGraph( allocator, arena_stack, @@ -811,7 +809,7 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* allocator, compiler_options.GetInstructionSet(), kInvalidInvokeType, dead_reference_safe, - compiler_options.GetDebuggable() || is_instrumentation_enabled, + compiler_options.GetDebuggable(), compilation_kind); if (method != nullptr) { @@ -1298,8 +1296,7 @@ bool OptimizingCompiler::JitCompile(Thread* self, /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(), compilation_kind, /* has_should_deoptimize_flag= */ false, - cha_single_implementation_list, - /* has_instrumentation_support= */ false)) { + cha_single_implementation_list)) { code_cache->Free(self, region, reserved_code.data(), reserved_data.data()); return false; } @@ -1407,8 +1404,7 @@ bool OptimizingCompiler::JitCompile(Thread* self, /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(), compilation_kind, codegen->GetGraph()->HasShouldDeoptimizeFlag(), - codegen->GetGraph()->GetCHASingleImplementationList(), - codegen->GetGraph()->IsDebuggable())) { + codegen->GetGraph()->GetCHASingleImplementationList())) { code_cache->Free(self, region, reserved_code.data(), reserved_data.data()); return false; } |