summaryrefslogtreecommitdiff
path: root/compiler/optimizing/optimizing_compiler.cc
diff options
context:
space:
mode:
author Igor Murashkin <iam@google.com> 2017-04-11 18:39:59 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2017-04-11 18:40:01 +0000
commite2dfd30e752ed94944cb6f614f1a4cf18d038677 (patch)
tree259f65bf636e726fda89d9933886f6d11be9aee7 /compiler/optimizing/optimizing_compiler.cc
parent07f8d8619f9a90fad17c261c3025a6eb6c0c94c1 (diff)
parent032cacdbf32c50d3c43590600ed1e171a35fa93c (diff)
Merge "optimizing: do not illegally remove constructor barriers after inlining"
Diffstat (limited to 'compiler/optimizing/optimizing_compiler.cc')
-rw-r--r--compiler/optimizing/optimizing_compiler.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc
index e542cbbe37..8aad539851 100644
--- a/compiler/optimizing/optimizing_compiler.cc
+++ b/compiler/optimizing/optimizing_compiler.cc
@@ -930,16 +930,10 @@ CodeGenerator* OptimizingCompiler::TryCompile(ArenaAllocator* arena,
/* verified_method */ nullptr,
dex_cache);
- bool requires_barrier = dex_compilation_unit.IsConstructor()
- && compiler_driver->RequiresConstructorBarrier(Thread::Current(),
- dex_compilation_unit.GetDexFile(),
- dex_compilation_unit.GetClassDefIndex());
-
HGraph* graph = new (arena) HGraph(
arena,
dex_file,
method_idx,
- requires_barrier,
compiler_driver->GetInstructionSet(),
kInvalidInvokeType,
compiler_driver->GetCompilerOptions().GetDebuggable(),