RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-24 03:33:20 +01:00
Code Issues Projects Releases Wiki Activity

[SDAG] Fix Stale SDNode usage in visitAND

Browse Source 
Reorder CombineTo Calls to prevent potential use of deleted node.
Fixes PR32372.

Reviewers: jnspaulsson, RKSimon, uweigand, jonpa

Reviewed By: jonpa

Subscribers: jonpa, llvm-commits

Differential Revision: https://reviews.llvm.org/D31346

llvm-svn: 298920
This commit is contained in:
Nirav Dave 2017-03-28 14:11:20 +00:00
parent 59178f7ba7
commit ab62d18fbb
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/CodeGen/SelectionDAG/DAGCombiner.cpp
View File

@ -3536,6 +3536,10 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
// If the load type was an EXTLOAD, convert to ZEXTLOAD in order to // If the load type was an EXTLOAD, convert to ZEXTLOAD in order to
// preserve semantics once we get rid of the AND. // preserve semantics once we get rid of the AND.
SDValue NewLoad(Load, 0); SDValue NewLoad(Load, 0);
// Fold the AND away. NewLoad may get replaced immediately.
CombineTo(N, NewLoad);
if (Load->getExtensionType() == ISD::EXTLOAD) { if (Load->getExtensionType() == ISD::EXTLOAD) {
NewLoad = DAG.getLoad(Load->getAddressingMode(), ISD::ZEXTLOAD, NewLoad = DAG.getLoad(Load->getAddressingMode(), ISD::ZEXTLOAD,
Load->getValueType(0), SDLoc(Load), Load->getValueType(0), SDLoc(Load),
@ -3553,10 +3557,6 @@ SDValue DAGCombiner::visitAND(SDNode *N) {
} }
} }
// Fold the AND away, taking care not to fold to the old load node if we
// replaced it.
CombineTo(N, (N0.getNode() == Load) ? NewLoad : N0);
return SDValue(N, 0); // Return N so it doesn't get rechecked! return SDValue(N, 0); // Return N so it doesn't get rechecked!
} }
} }

31
test/CodeGen/SystemZ/pr32372.ll Normal file
View File

@ -0,0 +1,31 @@
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
; RUN: llc %s -o - -mtriple=s390x-linux-gnu | FileCheck %s
define void @pr32372(i8*) {
; CHECK-LABEL: pr32372:
; CHECK: # BB#0: # %BB
; CHECK-NEXT: llc %r1, 0(%r2)
; CHECK-NEXT: mvhhi 0(%r1), -3825
; CHECK-NEXT: llill %r0, 0
; CHECK-NEXT: dlr %r0, %r1
; CHECK-NEXT: .LBB0_1: # %CF251
; CHECK-NEXT: # =>This Inner Loop Header: Depth=1
; CHECK-NEXT: j .LBB0_1
BB:
%L = load i8, i8* %0
store i16 -3825, i16* undef
%L5 = load i8, i8* %0
%B9 = urem i8 %L5, %L
%I107 = insertelement <8 x i8> zeroinitializer, i8 %B9, i32 7
%ZE141 = zext i8 %L5 to i16
br label %CF251
CF251: ; preds = %CF258, %CF251, %BB
%Shuff217 = shufflevector <8 x i8> zeroinitializer, <8 x i8> %I107, <8 x i32> <i32 0, i32 2, i32 undef, i32 6, i32 8, i32 undef, i32 12, i32 14>
%Cmp227 = icmp sge i16 %ZE141, 0
br i1 %Cmp227, label %CF251, label %CF258
CF258: ; preds = %CF251
%Shuff230 = shufflevector <2 x i16> undef, <2 x i16> undef, <2 x i32> <i32 3, i32 1>
br label %CF251
}