commit 4f2935ef077529cc41aa0b590262fa91acbf6558
author TDYa127 <tdy@google.com> Fri Jun 22 06:25:03 2012 -0700
committer Shih-wei Liao <sliao@google.com> Fri Jun 22 09:45:27 2012 -0700
tree 55e846dfa27b5eb92e68ae0b10f6819fb11e1900
parent 008fa5114f356861f74f086f0b0c50fe42ef2891

Fix missed suspend check.

Change-Id: Id926b6290f2ace12a1e2d36f59303591a896763b

src/compiler/codegen/MethodBitcode.cc

diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc
index ad9b020..f162576 100644
--- a/src/compiler/codegen/MethodBitcode.cc
+++ b/src/compiler/codegen/MethodBitcode.cc
@@ -551,7 +551,7 @@
     case Instruction::RETURN_WIDE:
     case Instruction::RETURN:
     case Instruction::RETURN_OBJECT: {
-        if (!cUnit->attrs & METHOD_IS_LEAF) {
+        if (!(cUnit->attrs & METHOD_IS_LEAF)) {
           emitSuspendCheck(cUnit);
         }
         emitPopShadowFrame(cUnit);
@@ -561,7 +561,7 @@
       break;
 
     case Instruction::RETURN_VOID: {
-        if (!cUnit->attrs & METHOD_IS_LEAF) {
+        if (!(cUnit->attrs & METHOD_IS_LEAF)) {
           emitSuspendCheck(cUnit);
         }
         emitPopShadowFrame(cUnit);

src/compiler/codegen/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc
index a07e569..62939ba 100644
--- a/src/compiler/codegen/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/MethodCodegenDriver.cc
@@ -281,21 +281,21 @@
       break;
     }
     case Instruction::RETURN_VOID:
-      if (!cUnit->attrs & METHOD_IS_LEAF) {
+      if (!(cUnit->attrs & METHOD_IS_LEAF)) {
         genSuspendTest(cUnit, optFlags);
       }
       break;
 
     case Instruction::RETURN:
     case Instruction::RETURN_OBJECT:
-      if (!cUnit->attrs & METHOD_IS_LEAF) {
+      if (!(cUnit->attrs & METHOD_IS_LEAF)) {
         genSuspendTest(cUnit, optFlags);
       }
       storeValue(cUnit, oatGetReturn(cUnit, cUnit->shorty[0] == 'F'), rlSrc[0]);
       break;
 
     case Instruction::RETURN_WIDE:
-      if (!cUnit->attrs & METHOD_IS_LEAF) {
+      if (!(cUnit->attrs & METHOD_IS_LEAF)) {
         genSuspendTest(cUnit, optFlags);
       }
       storeValueWide(cUnit, oatGetReturnWide(cUnit,