diff options
| author | 2023-08-24 14:08:33 +0100 | |
|---|---|---|
| committer | 2023-08-30 13:05:29 +0000 | |
| commit | 33d57ac6d1be2127bc31fb55a5054ac84bb7d78d (patch) | |
| tree | 453ab97ca94cd0838ca7ee065a24d27ce3e725bd /compiler/optimizing/optimizing_compiler.cc | |
| parent | 834fb38bc0fb16d7d79bc877fced920065bbff82 (diff) | |
Move HasShouldDeoptimizeFlag from method header to CodeInfo.
We don't have room for the extra bit if the code size is greater than 1GB.
Bug: 288215378
Bug: 288833213
Bug: 297093110
Test: ./art/test.py -b --host --64
Change-Id: I0070b270c7fe03f2f6fbb26223e78de41305c547
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index f86ee4f70e..211c6417c2 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -1400,7 +1400,6 @@ bool OptimizingCompiler::JitCompile(Thread* self, debug_info, /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(), compilation_kind, - /* has_should_deoptimize_flag= */ false, cha_single_implementation_list)) { code_cache->Free(self, region, reserved_code.data(), reserved_data.data()); return false; @@ -1508,8 +1507,9 @@ bool OptimizingCompiler::JitCompile(Thread* self, debug_info, /* is_full_debug_info= */ compiler_options.GetGenerateDebugInfo(), compilation_kind, - codegen->GetGraph()->HasShouldDeoptimizeFlag(), codegen->GetGraph()->GetCHASingleImplementationList())) { + CHECK_EQ(CodeInfo::HasShouldDeoptimizeFlag(stack_map.data()), + codegen->GetGraph()->HasShouldDeoptimizeFlag()); code_cache->Free(self, region, reserved_code.data(), reserved_data.data()); return false; } |