diff options
| author | 2012-06-22 06:25:03 -0700 | |
|---|---|---|
| committer | 2012-06-22 09:45:27 -0700 | |
| commit | 4f2935ef077529cc41aa0b590262fa91acbf6558 (patch) | |
| tree | 55e846dfa27b5eb92e68ae0b10f6819fb11e1900 /src/compiler | |
| parent | 008fa5114f356861f74f086f0b0c50fe42ef2891 (diff) | |
Fix missed suspend check.
Change-Id: Id926b6290f2ace12a1e2d36f59303591a896763b
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/codegen/MethodBitcode.cc | 4 | ||||
| -rw-r--r-- | src/compiler/codegen/MethodCodegenDriver.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index ad9b020e9e..f162576ac4 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -551,7 +551,7 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, 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 @@ bool convertMIRNode(CompilationUnit* cUnit, MIR* mir, BasicBlock* bb, break; case Instruction::RETURN_VOID: { - if (!cUnit->attrs & METHOD_IS_LEAF) { + if (!(cUnit->attrs & METHOD_IS_LEAF)) { emitSuspendCheck(cUnit); } emitPopShadowFrame(cUnit); diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc index a07e569394..62939bac92 100644 --- a/src/compiler/codegen/MethodCodegenDriver.cc +++ b/src/compiler/codegen/MethodCodegenDriver.cc @@ -281,21 +281,21 @@ bool compileDalvikInstruction(CompilationUnit* cUnit, MIR* mir, 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, |