From c39eaa50411d1e90065564a912cc420c2733bf6a Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 1 Jan 2015 23:26:16 +0000 Subject: [PATCH] [SROA] Fix two total think-os in r225061 that should have been caught on a +asserts bootstrap, but my bootstrap had asserts off. Oops. Anyways, in some places it is reasonable to cast (as a sanity check) the pointer operand to a load or store to an instruction within SROA -- namely when the pointer operand is expected to be derived from an alloca, and thus always an instruction. However, the pre-splitting code also deals with loads and stores to non-alloca pointers and there we need to just use the Value*. Nothing about the code relied on the instruction cast, it was only there essentially as an invariant assertion. Remove the two that don't actually hold. This should fix the proximate issue in PR22080, but I'm also doing an asserts bootstrap myself to see if there are other issues lurking. I'll craft a reduced test case in a moment, but I wanted to get the tree healthy as quickly as possible. llvm-svn: 225068 --- llvm/lib/Transforms/Scalar/SROA.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/llvm/lib/Transforms/Scalar/SROA.cpp b/llvm/lib/Transforms/Scalar/SROA.cpp index 0869114..683fab5 100644 --- a/llvm/lib/Transforms/Scalar/SROA.cpp +++ b/llvm/lib/Transforms/Scalar/SROA.cpp @@ -3726,7 +3726,7 @@ bool SROA::presplitLoadsAndStores(AllocaInst &AI, AllocaSlices &AS) { continue; } - Instruction *StoreBasePtr = cast(SI->getPointerOperand()); + Value *StoreBasePtr = SI->getPointerOperand(); IRB.SetInsertPoint(BasicBlock::iterator(SI)); DEBUG(dbgs() << " Splitting store of load: " << *SI << "\n"); @@ -3789,7 +3789,7 @@ bool SROA::presplitLoadsAndStores(AllocaInst &AI, AllocaSlices &AS) { assert(BaseOffset + StoreSize > BaseOffset && "Cannot represent alloca access size using 64-bit integers!"); - Instruction *LoadBasePtr = cast(LI->getPointerOperand()); + Value *LoadBasePtr = LI->getPointerOperand(); Instruction *StoreBasePtr = cast(SI->getPointerOperand()); DEBUG(dbgs() << " Splitting store: " << *SI << "\n"); -- 2.7.4