6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-06 06:33:24 +00:00
Code Issues Projects Releases Wiki Activity

When legalising shifts, do not pre-build a list of operands which

Browse Source 
may be RAUW'd by the recursive call to LegalizeOps; instead, retrieve
the other operands when calling UpdateNodeOperands.  Fixes PR12889.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@157162 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Peter Collingbourne 2012-05-20 18:36:15 +00:00
parent 5875c33746
commit 92d63ccfc7
2 changed files with 32 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CodeGen/SelectionDAG/LegalizeDAG.cpp
View File

@ -817,9 +817,7 @@ void SelectionDAGLegalize::LegalizeOp(SDNode *Node) {
} }
if (SimpleFinishLegalizing) { if (SimpleFinishLegalizing) {
SmallVector<SDValue, 8> Ops; SDNode *NewNode = Node;
for (unsigned i = 0, e = Node->getNumOperands(); i != e; ++i)
Ops.push_back(Node->getOperand(i));
switch (Node->getOpcode()) { switch (Node->getOpcode()) {
default: break; default: break;
case ISD::SHL: case ISD::SHL:
@ -829,11 +827,14 @@ void SelectionDAGLegalize::LegalizeOp(SDNode *Node) {
case ISD::ROTR: case ISD::ROTR:
// Legalizing shifts/rotates requires adjusting the shift amount // Legalizing shifts/rotates requires adjusting the shift amount
// to the appropriate width. // to the appropriate width.
if (!Ops[1].getValueType().isVector()) { if (!Node->getOperand(1).getValueType().isVector()) {
SDValue SAO = DAG.getShiftAmountOperand(Ops[0].getValueType(), Ops[1]); SDValue SAO =
DAG.getShiftAmountOperand(Node->getOperand(0).getValueType(),
Node->getOperand(1));
HandleSDNode Handle(SAO); HandleSDNode Handle(SAO);
LegalizeOp(SAO.getNode()); LegalizeOp(SAO.getNode());
Ops[1] = Handle.getValue(); NewNode = DAG.UpdateNodeOperands(Node, Node->getOperand(0),
Handle.getValue());
} }
break; break;
case ISD::SRL_PARTS: case ISD::SRL_PARTS:
@ -841,16 +842,19 @@ void SelectionDAGLegalize::LegalizeOp(SDNode *Node) {
case ISD::SHL_PARTS: case ISD::SHL_PARTS:
// Legalizing shifts/rotates requires adjusting the shift amount // Legalizing shifts/rotates requires adjusting the shift amount
// to the appropriate width. // to the appropriate width.
if (!Ops[2].getValueType().isVector()) { if (!Node->getOperand(2).getValueType().isVector()) {
SDValue SAO = DAG.getShiftAmountOperand(Ops[0].getValueType(), Ops[2]); SDValue SAO =
DAG.getShiftAmountOperand(Node->getOperand(0).getValueType(),
Node->getOperand(2));
HandleSDNode Handle(SAO); HandleSDNode Handle(SAO);
LegalizeOp(SAO.getNode()); LegalizeOp(SAO.getNode());
Ops[2] = Handle.getValue(); NewNode = DAG.UpdateNodeOperands(Node, Node->getOperand(0),
Node->getOperand(1),
Handle.getValue());
} }
break; break;
} }
SDNode *NewNode = DAG.UpdateNodeOperands(Node, Ops.data(), Ops.size());
if (NewNode != Node) { if (NewNode != Node) {
DAG.ReplaceAllUsesWith(Node, NewNode); DAG.ReplaceAllUsesWith(Node, NewNode);
for (unsigned i = 0, e = Node->getNumValues(); i != e; ++i) for (unsigned i = 0, e = Node->getNumValues(); i != e; ++i)

18
test/CodeGen/X86/pr12889.ll Normal file
View File

@ -0,0 +1,18 @@
; RUN: llc < %s -march=x86
target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
@c0 = common global i8 0, align 1
define void @func() nounwind uwtable {
entry:
%0 = load i8* @c0, align 1, !tbaa !0
%tobool = icmp ne i8 %0, 0
%conv = zext i1 %tobool to i8
%storemerge = shl nuw nsw i8 %conv, %conv
store i8 %storemerge, i8* @c0, align 1
ret void
}
!0 = metadata !{metadata !"omnipotent char", metadata !1}
!1 = metadata !{metadata !"Simple C/C++ TBAA"}