diff options
| author | 2012-07-11 15:08:10 -0700 | |
|---|---|---|
| committer | 2012-07-11 15:08:10 -0700 | |
| commit | ca314c6a1be1b4cc11f4d284da90af7dc8a4ce25 (patch) | |
| tree | 7731937b2084ea210c5f6f7175298327911c4469 /src/compiler/codegen/MethodBitcode.cc | |
| parent | 26c5e1503425cae17f5b16fdf06a2d62ec03a59b (diff) | |
| parent | d5018897273f3b889f025a79ef28199ad2a640bf (diff) | |
Merge "Quick compiler - run-test bug fixes" into ics-mr1-plus-art
Diffstat (limited to 'src/compiler/codegen/MethodBitcode.cc')
| -rw-r--r-- | src/compiler/codegen/MethodBitcode.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index 89c11c6fa2..3eb6a89c49 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -2344,6 +2344,8 @@ void cvtICmpBr(CompilationUnit* cUnit, llvm::Instruction* inst, // TODO: handle fused CMP_LONG/IF_xxZ case if (llvm::ConstantInt* src2 = llvm::dyn_cast<llvm::ConstantInt>(rhs)) { opRegImm(cUnit, kOpCmp, rlSrc1.lowReg, src2->getSExtValue()); + } else if (llvm::dyn_cast<llvm::ConstantPointerNull>(rhs) != NULL) { + opRegImm(cUnit, kOpCmp, rlSrc1.lowReg, 0); } else { RegLocation rlSrc2 = getLoc(cUnit, rhs); rlSrc2 = loadValue(cUnit, rlSrc2, kCoreReg); |