diff options
| author | Ian Rogers <irogers@google.com> | 2013-07-31 14:49:16 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2013-07-31 14:52:50 -0700 |
| commit | 9fc16eb43fe938f0cddb13638bd7cbc2ea9534a2 (patch) | |
| tree | 42be6682a5c6540c944a37c62f82c5635ab9e81e /compiler/dex/dex_to_dex_compiler.cc | |
| parent | 0418ae2bdd996b64f733b1290080e3f98a05609f (diff) | |
| download | android_art-9fc16eb43fe938f0cddb13638bd7cbc2ea9534a2.tar.gz android_art-9fc16eb43fe938f0cddb13638bd7cbc2ea9534a2.tar.bz2 android_art-9fc16eb43fe938f0cddb13638bd7cbc2ea9534a2.zip | |
Don't add barriers to clinit methods.
Change-Id: I13e6c008feb8c19e452d6e2f88b2bbbcac997de5
Diffstat (limited to 'compiler/dex/dex_to_dex_compiler.cc')
| -rw-r--r-- | compiler/dex/dex_to_dex_compiler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/dex_to_dex_compiler.cc b/compiler/dex/dex_to_dex_compiler.cc index 1ee29cbae1..60e638c584 100644 --- a/compiler/dex/dex_to_dex_compiler.cc +++ b/compiler/dex/dex_to_dex_compiler.cc @@ -209,8 +209,8 @@ void DexCompiler::Compile() { void DexCompiler::CompileReturnVoid(Instruction* inst, uint32_t dex_pc) { DCHECK(inst->Opcode() == Instruction::RETURN_VOID); - // Are we compiling a constructor ? - if ((unit_.GetAccessFlags() & kAccConstructor) == 0) { + // Are we compiling a non-clinit constructor? + if (!unit_.IsConstructor() || unit_.IsStatic()) { return; } // Do we need a constructor barrier ? |