summaryrefslogtreecommitdiff
path: root/compiler/dex/quick/gen_common.cc
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-10-29 04:02:22 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-10-29 04:02:22 +0000
commitdeb2a896cad5bcd22bbe21c3b09fd8efa6ad1d13 (patch)
treed2c5cefb419cd0f9bdad2bba939235fbe2c5fbfd /compiler/dex/quick/gen_common.cc
parent59a984e8e2dc3a4d5c220518f762ba9b1c0de44c (diff)
parent594c0612519e96bcc1bd42ff4dcbfa2c53b09c5a (diff)
Merge "Revert "Enable store elimination for singleton objects.""
am: 594c061251 * commit '594c0612519e96bcc1bd42ff4dcbfa2c53b09c5a': Revert "Enable store elimination for singleton objects."
Diffstat (limited to 'compiler/dex/quick/gen_common.cc')
-rw-r--r--compiler/dex/quick/gen_common.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/compiler/dex/quick/gen_common.cc b/compiler/dex/quick/gen_common.cc
index 5da72147b0f..2b60a51e22b 100644
--- a/compiler/dex/quick/gen_common.cc
+++ b/compiler/dex/quick/gen_common.cc
@@ -1104,11 +1104,7 @@ void Mir2Lir::GenNewInstance(uint32_t type_idx, RegLocation rl_dest) {
// access because the verifier was unable to?
const DexFile* dex_file = cu_->dex_file;
CompilerDriver* driver = cu_->compiler_driver;
- bool finalizable;
- if (driver->CanAccessInstantiableTypeWithoutChecks(cu_->method_idx,
- *dex_file,
- type_idx,
- &finalizable)) {
+ if (driver->CanAccessInstantiableTypeWithoutChecks(cu_->method_idx, *dex_file, type_idx)) {
bool is_type_initialized;
bool use_direct_type_ptr;
uintptr_t direct_type_ptr;