Don't combine stores to a swifterror pointer operand to a different type

llvm-svn: 293658
This commit is contained in:
Arnold Schwaighofer 2017-01-31 17:53:49 +00:00
parent 274df5ea41
commit c368563bd6
2 changed files with 21 additions and 1 deletions

View File

@ -502,7 +502,8 @@ static Instruction *combineLoadToOperationType(InstCombiner &IC, LoadInst &LI) {
!DL.isNonIntegralPointerType(Ty)) {
if (all_of(LI.users(), [&LI](User *U) {
auto *SI = dyn_cast<StoreInst>(U);
return SI && SI->getPointerOperand() != &LI;
return SI && SI->getPointerOperand() != &LI &&
!SI->getPointerOperand()->isSwiftError();
})) {
LoadInst *NewLoad = combineLoadToNewType(
IC, LI,

View File

@ -219,3 +219,22 @@ entry:
store %swift.error* %err.res, %swift.error** %err, align 8
ret void
}
; Make sure we preseve the type of the store to a swifterror pointer.
; CHECK-LABEL: @test19(
; CHECK: [[A:%.*]] = alloca
; CHECK: call
; CHECK: [[BC:%.*]] = bitcast i8** [[A]] to
; CHECK: [[ERRVAL:%.*]] = load {{.*}}[[BC]]
; CHECK: store {{.*}}[[ERRVAL]]
; CHECK: ret
declare void @initi8(i8**)
define void @test19(%swift.error** swifterror %err) {
entry:
%tmp = alloca i8*, align 8
call void @initi8(i8** %tmp)
%swifterror = bitcast i8** %tmp to %swift.error**
%err.res = load %swift.error*, %swift.error** %swifterror, align 8
store %swift.error* %err.res, %swift.error** %err, align 8
ret void
}