From: Eric Christopher Date: Wed, 25 Aug 2010 08:43:57 +0000 (+0000) Subject: Do type checks before we bother to do everything else. X-Git-Tag: android-x86-6.0-r1~1003^2~3209 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=61c3f9ae0624281a7feb0027b8bb87874fadbcd4;p=android-x86%2Fexternal-llvm.git Do type checks before we bother to do everything else. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@112039 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Target/ARM/ARMFastISel.cpp b/lib/Target/ARM/ARMFastISel.cpp index 5e2bf68d774..10c7e5d6d27 100644 --- a/lib/Target/ARM/ARMFastISel.cpp +++ b/lib/Target/ARM/ARMFastISel.cpp @@ -415,14 +415,19 @@ bool ARMFastISel::ARMEmitLoad(EVT VT, unsigned &ResultReg, } bool ARMFastISel::ARMSelectLoad(const Instruction *I) { - // Our register and offset with innocuous defaults. - unsigned Reg = 0; - int Offset = 0; - // If we're an alloca we know we have a frame index and can emit the load // directly in short order. if (ARMLoadAlloca(I)) return true; + + // Verify we have a legal type before going any further. + EVT VT; + if (!isTypeLegal(I->getType(), VT)) + return false; + + // Our register and offset with innocuous defaults. + unsigned Reg = 0; + int Offset = 0; // See if we can handle this as Reg + Offset if (!ARMComputeRegOffset(I->getOperand(0), Reg, Offset)) @@ -445,10 +450,6 @@ bool ARMFastISel::ARMSelectLoad(const Instruction *I) { static_cast(TII)); } - EVT VT; - if (!isTypeLegal(I->getType(), VT)) - return false; - unsigned ResultReg; // TODO: Verify the additions above work, otherwise we'll need to add the // offset instead of 0 and do all sorts of operand munging.