commit 397c04884138953090d6d54a683eb7a4df3b8460
author Ian Rogers <irogers@google.com> Fri May 31 16:46:31 2013 -0700
committer Ian Rogers <irogers@google.com> Fri May 31 16:46:31 2013 -0700
tree 0b411537f63dff2c4747efe2636aa7a60d575dcd
parent 207bb6548f96636b40ee62124b37d2d82c3ddc6b

Don't mark instanceof as a safepoint.

Instanceof can't throw an exception and so needn't be marked as a safepoint.

Change-Id: I3970197db7c58a79baa58f5f675d59e9157060da

src/compiler/dex/quick/gen_common.cc

diff --git a/src/compiler/dex/quick/gen_common.cc b/src/compiler/dex/quick/gen_common.cc
index 15aa904..7275449 100644
--- a/src/compiler/dex/quick/gen_common.cc
+++ b/src/compiler/dex/quick/gen_common.cc
@@ -931,7 +931,6 @@
   DCHECK_EQ(mirror::Object::ClassOffset().Int32Value(), 0);
   LoadWordDisp(TargetReg(kArg0),  mirror::Object::ClassOffset().Int32Value(), TargetReg(kArg1));
   /* kArg0 is ref, kArg1 is ref->klass_, kArg2 is class */
-  LIR* call_inst;
   LIR* branchover = NULL;
   if (cu_->instruction_set == kThumb2) {
     /* Uses conditional nullification */
@@ -940,7 +939,7 @@
     OpIT(kCondEq, "EE");   // if-convert the test
     LoadConstant(TargetReg(kArg0), 1);     // .eq case - load true
     OpRegCopy(TargetReg(kArg0), TargetReg(kArg2));    // .ne case - arg0 <= class
-    call_inst = OpReg(kOpBlx, r_tgt);    // .ne case: helper(class, ref->class)
+    OpReg(kOpBlx, r_tgt);    // .ne case: helper(class, ref->class)
     FreeTemp(r_tgt);
   } else {
     /* Uses branchovers */
@@ -949,14 +948,13 @@
     if (cu_->instruction_set != kX86) {
       int r_tgt = LoadHelper(ENTRYPOINT_OFFSET(pInstanceofNonTrivialFromCode));
       OpRegCopy(TargetReg(kArg0), TargetReg(kArg2));    // .ne case - arg0 <= class
-      call_inst = OpReg(kOpBlx, r_tgt);    // .ne case: helper(class, ref->class)
+      OpReg(kOpBlx, r_tgt);    // .ne case: helper(class, ref->class)
       FreeTemp(r_tgt);
     } else {
       OpRegCopy(TargetReg(kArg0), TargetReg(kArg2));
-      call_inst = OpThreadMem(kOpBlx, ENTRYPOINT_OFFSET(pInstanceofNonTrivialFromCode));
+      OpThreadMem(kOpBlx, ENTRYPOINT_OFFSET(pInstanceofNonTrivialFromCode));
     }
   }
-  MarkSafepointPC(call_inst);
   ClobberCalleeSave();
   /* branch targets here */
   LIR* target = NewLIR0(kPseudoTargetLabel);