From f5f5a12a74c6cc465d2757b4d77843fb1cbdac8f Mon Sep 17 00:00:00 2001 From: buzbee Date: Fri, 21 Sep 2012 13:57:36 -0700 Subject: Quick compiler: bug fix & cleanup Fixed a bug in bitcode generation that was helpfully masked by gcc's -O2 optmization (code motion). Also removed quite a few fields and identifiers left over from the JIT, along with a couple of files that were meaningful for the JIT, but are no longer used. Change-Id: I7702b66d646c68aafb9669368c97e128ad045dc9 --- src/compiler/codegen/MethodBitcode.cc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/compiler/codegen/MethodBitcode.cc') 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 @@ -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) << "................................"; -- cgit v1.2.3-59-g8ed1b