diff options
| author | 2013-01-04 15:32:48 -0800 | |
|---|---|---|
| committer | 2013-01-04 15:32:48 -0800 | |
| commit | 05bcbc1a0394d5aa8f247e2ec175ff8f97926c78 (patch) | |
| tree | b64c8e8099d49b340e550687c0fab3e7618968b1 /src/compiler/frontend.cc | |
| parent | 6641ea12b98dda9ec45d29f20e43f85698b88a02 (diff) | |
| parent | fffdb023275613612a22ec62b3421ffe4d2b73fe (diff) | |
Merge "Add memory barrier for final instance fields." into dalvik-dev
Diffstat (limited to 'src/compiler/frontend.cc')
| -rw-r--r-- | src/compiler/frontend.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/compiler/frontend.cc b/src/compiler/frontend.cc index e00fb68621..31423ef095 100644 --- a/src/compiler/frontend.cc +++ b/src/compiler/frontend.cc @@ -773,8 +773,8 @@ static CompiledMethod* CompileMethod(Compiler& compiler, const CompilerBackend compiler_backend, const DexFile::CodeItem* code_item, uint32_t access_flags, InvokeType invoke_type, - uint32_t method_idx, jobject class_loader, - const DexFile& dex_file, + uint32_t class_def_idx, uint32_t method_idx, + jobject class_loader, const DexFile& dex_file, LLVMInfo* llvm_info) { VLOG(compiler) << "Compiling " << PrettyMethod(method_idx, dex_file) << "..."; @@ -792,6 +792,7 @@ static CompiledMethod* CompileMethod(Compiler& compiler, cu->compiler = &compiler; cu->class_linker = class_linker; cu->dex_file = &dex_file; + cu->class_def_idx = class_def_idx; cu->method_idx = method_idx; cu->code_item = code_item; cu->access_flags = access_flags; @@ -1224,12 +1225,12 @@ CompiledMethod* CompileOneMethod(Compiler& compiler, const CompilerBackend backend, const DexFile::CodeItem* code_item, uint32_t access_flags, InvokeType invoke_type, - uint32_t method_idx, jobject class_loader, + uint32_t class_def_idx, uint32_t method_idx, jobject class_loader, const DexFile& dex_file, LLVMInfo* llvm_info) { - return CompileMethod(compiler, backend, code_item, access_flags, invoke_type, method_idx, class_loader, - dex_file, llvm_info); + return CompileMethod(compiler, backend, code_item, access_flags, invoke_type, class_def_idx, + method_idx, class_loader, dex_file, llvm_info); } } // namespace art @@ -1238,11 +1239,12 @@ extern "C" art::CompiledMethod* ArtQuickCompileMethod(art::Compiler& compiler, const art::DexFile::CodeItem* code_item, uint32_t access_flags, art::InvokeType invoke_type, - uint32_t method_idx, jobject class_loader, + uint32_t class_def_idx, uint32_t method_idx, jobject class_loader, const art::DexFile& dex_file) { // TODO: check method fingerprint here to determine appropriate backend type. Until then, use build default art::CompilerBackend backend = compiler.GetCompilerBackend(); return art::CompileOneMethod(compiler, backend, code_item, access_flags, invoke_type, - method_idx, class_loader, dex_file, NULL /* use thread llvm_info */); + class_def_idx, method_idx, class_loader, dex_file, + NULL /* use thread llvm_info */); } |