diff options
Diffstat (limited to 'compiler/optimizing/inliner.cc')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 298ae5c847..66948ebf8c 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -1565,25 +1565,6 @@ bool HInliner::TryBuildAndInlineHelper(HInvoke* invoke_instruction, /* verified_method */ nullptr, dex_cache); - bool requires_ctor_barrier = false; - - if (dex_compilation_unit.IsConstructor()) { - // If it's a super invocation and we already generate a barrier there's no need - // to generate another one. - // We identify super calls by looking at the "this" pointer. If its value is the - // same as the local "this" pointer then we must have a super invocation. - bool is_super_invocation = invoke_instruction->InputAt(0)->IsParameterValue() - && invoke_instruction->InputAt(0)->AsParameterValue()->IsThis(); - if (is_super_invocation && graph_->ShouldGenerateConstructorBarrier()) { - requires_ctor_barrier = false; - } else { - Thread* self = Thread::Current(); - requires_ctor_barrier = compiler_driver_->RequiresConstructorBarrier(self, - dex_compilation_unit.GetDexFile(), - dex_compilation_unit.GetClassDefIndex()); - } - } - InvokeType invoke_type = invoke_instruction->GetInvokeType(); if (invoke_type == kInterface) { // We have statically resolved the dispatch. To please the class linker @@ -1596,7 +1577,6 @@ bool HInliner::TryBuildAndInlineHelper(HInvoke* invoke_instruction, graph_->GetArena(), callee_dex_file, method_index, - requires_ctor_barrier, compiler_driver_->GetInstructionSet(), invoke_type, graph_->IsDebuggable(), |