diff options
| author | 2012-09-21 15:15:42 -0700 | |
|---|---|---|
| committer | 2012-09-21 15:15:43 -0700 | |
| commit | a5e1e3d153990845d80cb8d013157210f11a473c (patch) | |
| tree | 53b8d40d25326a0da2baa341df530f4667da0af1 /src/compiler/codegen/MethodBitcode.cc | |
| parent | 01c9e55f7bceace180c8eb62488c986f6119e6e2 (diff) | |
| parent | f5f5a12a74c6cc465d2757b4d77843fb1cbdac8f (diff) | |
Merge "Quick compiler: bug fix & cleanup" into dalvik-dev
Diffstat (limited to 'src/compiler/codegen/MethodBitcode.cc')
| -rw-r--r-- | src/compiler/codegen/MethodBitcode.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/compiler/codegen/MethodBitcode.cc b/src/compiler/codegen/MethodBitcode.cc index f4b8461654..c50d74da59 100644 --- a/src/compiler/codegen/MethodBitcode.cc +++ b/src/compiler/codegen/MethodBitcode.cc @@ -15,7 +15,6 @@ */ #if defined(ART_USE_QUICK_COMPILER) - #include "object_utils.h" #include <llvm/Support/ToolOutputFile.h> @@ -1777,8 +1776,12 @@ bool methodBlockBitcodeConversion(CompilationUnit* cUnit, BasicBlock* bb) { if (bb->blockType == kDead) return false; llvm::BasicBlock* llvmBB = getLLVMBlock(cUnit, bb->id); - cUnit->irb->SetInsertPoint(llvmBB); - setDexOffset(cUnit, bb->startOffset); + if (llvmBB == NULL) { + CHECK(bb->blockType == kExitBlock); + } else { + cUnit->irb->SetInsertPoint(llvmBB); + setDexOffset(cUnit, bb->startOffset); + } if (cUnit->printMe) { LOG(INFO) << "................................"; |