diff options
| author | David Srbecky <dsrbecky@google.com> | 2015-04-07 19:46:22 +0100 |
|---|---|---|
| committer | David Srbecky <dsrbecky@google.com> | 2015-04-07 20:07:58 +0100 |
| commit | 8c57831b2b07185ee1986b9af68a351e1ca584c3 (patch) | |
| tree | 862c57e602dff367ca141d3a86235b48bf47bf17 /compiler/jni | |
| parent | caff30245889729f102af87e79705893401251ef (diff) | |
| download | android_art-8c57831b2b07185ee1986b9af68a351e1ca584c3.tar.gz android_art-8c57831b2b07185ee1986b9af68a351e1ca584c3.tar.bz2 android_art-8c57831b2b07185ee1986b9af68a351e1ca584c3.zip | |
Remove the old CFI infrastructure.
Change-Id: I12a17a8a1c39ffccaa499c328ebac36e4d74dc4e
Diffstat (limited to 'compiler/jni')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 2d9e03a718..45e2fd0ffe 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -93,7 +93,6 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, // Assembler that holds generated instructions std::unique_ptr<Assembler> jni_asm(Assembler::Create(instruction_set)); - jni_asm->InitializeFrameDescriptionEntry(); // Offsets into data structures // TODO: if cross compiling these offsets are for the host not the target @@ -432,19 +431,14 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver* driver, std::vector<uint8_t> managed_code(cs); MemoryRegion code(&managed_code[0], managed_code.size()); __ FinalizeInstructions(code); - jni_asm->FinalizeFrameDescriptionEntry(); - std::vector<uint8_t>* fde(jni_asm->GetFrameDescriptionEntry()); - ArrayRef<const uint8_t> cfi_ref; - if (fde != nullptr) { - cfi_ref = ArrayRef<const uint8_t>(*fde); - } + return CompiledMethod::SwapAllocCompiledMethodCFI(driver, instruction_set, ArrayRef<const uint8_t>(managed_code), frame_size, main_jni_conv->CoreSpillMask(), main_jni_conv->FpSpillMask(), - cfi_ref); + ArrayRef<const uint8_t>()); } // Copy a single parameter from the managed to the JNI calling convention |