diff options
| author | 2012-10-12 07:35:41 -0700 | |
|---|---|---|
| committer | 2012-10-12 07:35:42 -0700 | |
| commit | 4fe0ef28ed58502a3652e827f5931df0b45cf39c (patch) | |
| tree | 5fa390e59abda86faac886284611d3f94ca614b5 /src/compiler_llvm/compilation_unit.h | |
| parent | 9958daab2a4b0c26482698ac74d3035600115faf (diff) | |
| parent | 4df2bbdfe6602ce5f141b7b44028b95faa0bd8ef (diff) | |
Merge "Enable multi-threaded Quick compilation" into dalvik-dev
Diffstat (limited to 'src/compiler_llvm/compilation_unit.h')
| -rw-r--r-- | src/compiler_llvm/compilation_unit.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compiler_llvm/compilation_unit.h b/src/compiler_llvm/compilation_unit.h index c4fbae411b..6ad7ee1ad0 100644 --- a/src/compiler_llvm/compilation_unit.h +++ b/src/compiler_llvm/compilation_unit.h @@ -91,8 +91,8 @@ class CompilationUnit { } #if defined(ART_USE_QUICK_COMPILER) - QuickCompiler* GetQuickContext() const { - return quick_ctx_.get(); + LLVMInfo* GetQuickContext() const { + return llvm_info_.get(); } void SetCompiler(Compiler* compiler) { compiler_ = compiler; @@ -125,7 +125,7 @@ class CompilationUnit { greenland::DexLang::Context* dex_lang_ctx_; #endif #if defined(ART_USE_QUICK_COMPILER) - UniquePtr<QuickCompiler> quick_ctx_; + UniquePtr<LLVMInfo> llvm_info_; Compiler* compiler_; OatCompilationUnit* oat_compilation_unit_; #endif |