commit 1b1cc276f059da24fdd06256f077f6cc9de8b9da
author Vladimir Marko <vmarko@google.com> Mon Feb 10 16:02:29 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 10 16:02:29 2014 +0000
tree 9cb651b182f86d2efa8fc815e693146684e631ae
parent 14fb1314cc8ef4c8342e5e6f3f830e4a64521623
parent 8017ef8760555c7d0ae65d5f2ec6a8f093e7dbb0

Merge "Add wide setter test with preceding parameters as int."

compiler/dex/quick/arm/call_arm.cc

diff --git a/compiler/dex/quick/arm/call_arm.cc b/compiler/dex/quick/arm/call_arm.cc
index 22466f0..fdc609a 100644
--- a/compiler/dex/quick/arm/call_arm.cc
+++ b/compiler/dex/quick/arm/call_arm.cc
@@ -130,7 +130,7 @@
 MIR* ArmMir2Lir::SpecialIGet(BasicBlock** bb, MIR* mir, const InlineMethod& special) {
   // FastInstance() already checked by DexFileMethodInliner.
   const InlineIGetIPutData& data = special.d.ifield_data;
-  if (!data.method_is_static || data.object_arg != 0) {
+  if (data.method_is_static || data.object_arg != 0) {
     return NULL;  // The object is not "this" and has to be null-checked.
   }
 
@@ -160,7 +160,7 @@
 MIR* ArmMir2Lir::SpecialIPut(BasicBlock** bb, MIR* mir, const InlineMethod& special) {
   // FastInstance() already checked by DexFileMethodInliner.
   const InlineIGetIPutData& data = special.d.ifield_data;
-  if (!data.method_is_static || data.object_arg != 0) {
+  if (data.method_is_static || data.object_arg != 0) {
     return NULL;  // The object is not "this" and has to be null-checked.
   }