diff options
| author | Vladimir Marko <vmarko@google.com> | 2016-03-24 13:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-24 13:35:08 +0000 |
| commit | 2e384346d93a747e19fb74f32eba2d1e9403721f (patch) | |
| tree | 1aa4a05a06298a5c3c741414e859b0d37143c84e /compiler/optimizing/optimizing_compiler.cc | |
| parent | a872368b065af7cd42a1be02742a60877e096bae (diff) | |
| parent | df739841b781dbd49c247e3795696389c4799020 (diff) | |
Merge "Post-Quick cleanup: Remove CompilationUnit."
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 125c00d275..886c9e2ad4 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -259,8 +259,7 @@ class OptimizingCompiler FINAL : public Compiler { explicit OptimizingCompiler(CompilerDriver* driver); ~OptimizingCompiler(); - bool CanCompileMethod(uint32_t method_idx, const DexFile& dex_file, CompilationUnit* cu) const - OVERRIDE; + bool CanCompileMethod(uint32_t method_idx, const DexFile& dex_file) const OVERRIDE; CompiledMethod* Compile(const DexFile::CodeItem* code_item, uint32_t access_flags, @@ -283,8 +282,6 @@ class OptimizingCompiler FINAL : public Compiler { InstructionSetPointerSize(GetCompilerDriver()->GetInstructionSet()))); } - void InitCompilationUnit(CompilationUnit& cu) const OVERRIDE; - void Init() OVERRIDE; void UnInit() const OVERRIDE; @@ -365,12 +362,8 @@ OptimizingCompiler::~OptimizingCompiler() { } } -void OptimizingCompiler::InitCompilationUnit(CompilationUnit& cu ATTRIBUTE_UNUSED) const { -} - bool OptimizingCompiler::CanCompileMethod(uint32_t method_idx ATTRIBUTE_UNUSED, - const DexFile& dex_file ATTRIBUTE_UNUSED, - CompilationUnit* cu ATTRIBUTE_UNUSED) const { + const DexFile& dex_file ATTRIBUTE_UNUSED) const { return true; } @@ -662,9 +655,15 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena, } DexCompilationUnit dex_compilation_unit( - nullptr, class_loader, Runtime::Current()->GetClassLinker(), dex_file, code_item, - class_def_idx, method_idx, access_flags, - nullptr, dex_cache); + class_loader, + Runtime::Current()->GetClassLinker(), + dex_file, + code_item, + class_def_idx, + method_idx, + access_flags, + /* verified_method */ nullptr, + dex_cache); bool requires_barrier = dex_compilation_unit.IsConstructor() && compiler_driver->RequiresConstructorBarrier(Thread::Current(), |