diff options
| author | 2018-07-27 15:58:15 +0000 | |
|---|---|---|
| committer | 2018-07-27 15:58:15 +0000 | |
| commit | 9acb522e35e3302786a338c7f50585dd412d68d3 (patch) | |
| tree | f665fa233579d933da378299c20e65ed6e317012 /compiler/optimizing | |
| parent | 921702dfd9d857aef1331f653ec7b656e0b080e8 (diff) | |
| parent | 8808756b8fba036a9c73a45c800a56be09872364 (diff) | |
Merge changes I07fcf6f2,I01074aee
* changes:
Remove frame info from OatQuickMethodHeader.
ARM64: Fix the CallOtherJustTooFarAfter test.
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 2f530a911a..939802626c 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -726,12 +726,6 @@ CompiledMethod* OptimizingCompiler::Emit(ArenaAllocator* allocator, GetCompilerDriver(), codegen->GetInstructionSet(), code_allocator->GetMemory(), - // Follow Quick's behavior and set the frame size to zero if it is - // considered "empty" (see the definition of - // art::CodeGenerator::HasEmptyFrame). - codegen->HasEmptyFrame() ? 0 : codegen->GetFrameSize(), - codegen->GetCoreSpillMask(), - codegen->GetFpuSpillMask(), ArrayRef<const uint8_t>(method_info), ArrayRef<const uint8_t>(stack_map), ArrayRef<const uint8_t>(*codegen->GetAssembler()->cfi().data()), @@ -1181,9 +1175,6 @@ CompiledMethod* OptimizingCompiler::JniCompile(uint32_t access_flags, GetCompilerDriver(), jni_compiled_method.GetInstructionSet(), jni_compiled_method.GetCode(), - jni_compiled_method.GetFrameSize(), - jni_compiled_method.GetCoreSpillMask(), - jni_compiled_method.GetFpSpillMask(), ArrayRef<const uint8_t>(method_info), ArrayRef<const uint8_t>(stack_map), jni_compiled_method.GetCfi(), @@ -1275,9 +1266,6 @@ bool OptimizingCompiler::JitCompile(Thread* self, stack_map_data, method_info_data, roots_data, - jni_compiled_method.GetFrameSize(), - jni_compiled_method.GetCoreSpillMask(), - jni_compiled_method.GetFpSpillMask(), jni_compiled_method.GetCode().data(), jni_compiled_method.GetCode().size(), data_size, @@ -1394,9 +1382,6 @@ bool OptimizingCompiler::JitCompile(Thread* self, stack_map_data, method_info_data, roots_data, - codegen->HasEmptyFrame() ? 0 : codegen->GetFrameSize(), - codegen->GetCoreSpillMask(), - codegen->GetFpuSpillMask(), code_allocator.GetMemory().data(), code_allocator.GetMemory().size(), data_size, |