maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[SimplifyCFG][OpaquePtr] Check store type when merging conditional store

This commit is contained in:
Arthur Eubanks 2022-02-20 11:29:54 -08:00
parent ec910751fe
commit 053c2a0020
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -3732,7 +3732,9 @@ static bool mergeConditionalStoreToAddress(
return false;
// Now check the stores are compatible.
if (!QStore->isUnordered() || !PStore->isUnordered())
if (!QStore->isUnordered() || !PStore->isUnordered() ||
PStore->getValueOperand()->getType() !=
QStore->getValueOperand()->getType())
return false;
// Check that sinking the store won't cause program behavior changes. Sinking

33
llvm/test/Transforms/SimplifyCFG/opaque-ptr.ll
View File

@ -44,3 +44,36 @@ join:
%phi = phi ptr [ %gep1, %if ], [ %gep2, %else]
ret ptr %phi
}
define void @test_cond_store_merge(i1 %arg, i1 %arg2, ptr %p) {
; CHECK-LABEL: @test_cond_store_merge(
; CHECK-NEXT: bb:
; CHECK-NEXT: br i1 [[ARG:%.*]], label [[BB2:%.*]], label [[BB3:%.*]]
; CHECK: bb2:
; CHECK-NEXT: store i64 0, ptr [[P:%.*]], align 32
; CHECK-NEXT: br label [[BB3]]
; CHECK: bb3:
; CHECK-NEXT: br i1 [[ARG2:%.*]], label [[BB4:%.*]], label [[BB5:%.*]]
; CHECK: bb4:
; CHECK-NEXT: store double 0.000000e+00, ptr [[P]], align 32
; CHECK-NEXT: br label [[BB5]]
; CHECK: bb5:
; CHECK-NEXT: ret void
;
bb:
br i1 %arg, label %bb2, label %bb3
bb2: ; preds = %bb
store i64 0, ptr %p, align 32
br label %bb3
bb3: ; preds = %bb2, %bb
br i1 %arg2, label %bb4, label %bb5
bb4: ; preds = %bb3
store double 0.000000e+00, ptr %p, align 32
br label %bb5
bb5: ; preds = %bb4, %bb3
ret void
}