6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-08-13 23:26:25 +00:00
Code Issues Projects Releases Wiki Activity

Fix ScheduleDAGRRList::CopyAndMoveSuccessors' handling of nodes

Browse Source 
with multiple chain operands. This can occur when the scheduler
has added chain operands to a node that already has a chain
operand, in order to handle physical register dependencies.

This fixes an llvm-gcc bootstrap failure on x86-64 introduced
in r66058.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66240 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Dan Gohman
2009-03-06 02:23:01 +00:00
parent f6dd0eb5c4
commit 16e8eda4b8
2 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
View File

@@ -410,7 +410,7 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {
NewSU->isCommutable = true; NewSU->isCommutable = true;
ComputeLatency(NewSU); ComputeLatency(NewSU);
SDep ChainPred; SmallVector<SDep, 4> ChainPreds;
SmallVector<SDep, 4> ChainSuccs; SmallVector<SDep, 4> ChainSuccs;
SmallVector<SDep, 4> LoadPreds; SmallVector<SDep, 4> LoadPreds;
SmallVector<SDep, 4> NodePreds; SmallVector<SDep, 4> NodePreds;
@@ -418,7 +418,7 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {
for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end(); for (SUnit::pred_iterator I = SU->Preds.begin(), E = SU->Preds.end();
I != E; ++I) { I != E; ++I) {
if (I->isCtrl()) if (I->isCtrl())
ChainPred = *I; ChainPreds.push_back(*I);
else if (I->getSUnit()->getNode() && else if (I->getSUnit()->getNode() &&
I->getSUnit()->getNode()->isOperandOf(LoadNode)) I->getSUnit()->getNode()->isOperandOf(LoadNode))
LoadPreds.push_back(*I); LoadPreds.push_back(*I);
@@ -433,17 +433,17 @@ SUnit *ScheduleDAGRRList::CopyAndMoveSuccessors(SUnit *SU) {
NodeSuccs.push_back(*I); NodeSuccs.push_back(*I);
} }
if (ChainPred.getSUnit()) { for (unsigned i = 0, e = ChainPreds.size(); i != e; ++i) {
RemovePred(SU, ChainPred); const SDep &Pred = ChainPreds[i];
RemovePred(SU, Pred);
if (isNewLoad) if (isNewLoad)
AddPred(LoadSU, ChainPred); AddPred(LoadSU, Pred);
} }
for (unsigned i = 0, e = LoadPreds.size(); i != e; ++i) { for (unsigned i = 0, e = LoadPreds.size(); i != e; ++i) {
const SDep &Pred = LoadPreds[i]; const SDep &Pred = LoadPreds[i];
RemovePred(SU, Pred); RemovePred(SU, Pred);
if (isNewLoad) { if (isNewLoad)
AddPred(LoadSU, Pred); AddPred(LoadSU, Pred);
}
} }
for (unsigned i = 0, e = NodePreds.size(); i != e; ++i) { for (unsigned i = 0, e = NodePreds.size(); i != e; ++i) {
const SDep &Pred = NodePreds[i]; const SDep &Pred = NodePreds[i];

35
test/CodeGen/X86/2009-03-05-burr-list-crash.ll Normal file
View File

@@ -0,0 +1,35 @@
; RUN: llvm-as < %s | llc
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"
target triple = "x86_64-unknown-linux-gnu"
external global i32 ; <i32*>:0 [#uses=1]
declare i64 @strlen(i8* nocapture) nounwind readonly
define fastcc i8* @1(i8*) nounwind {
br i1 false, label %3, label %2
; <label>:2 ; preds = %1
ret i8* %0
; <label>:3 ; preds = %1
%4 = call i64 @strlen(i8* %0) nounwind readonly ; <i64> [#uses=1]
%5 = trunc i64 %4 to i32 ; <i32> [#uses=2]
%6 = load i32* @0, align 4 ; <i32> [#uses=1]
%7 = sub i32 %5, %6 ; <i32> [#uses=2]
%8 = sext i32 %5 to i64 ; <i64> [#uses=1]
%9 = sext i32 %7 to i64 ; <i64> [#uses=1]
%10 = sub i64 %8, %9 ; <i64> [#uses=1]
%11 = getelementptr i8* %0, i64 %10 ; <i8*> [#uses=1]
%12 = icmp sgt i32 %7, 0 ; <i1> [#uses=1]
br i1 %12, label %13, label %14
; <label>:13 ; preds = %13, %3
br label %13
; <label>:14 ; preds = %3
%15 = call noalias i8* @make_temp_file(i8* %11) nounwind ; <i8*> [#uses=0]
unreachable
}
declare noalias i8* @make_temp_file(i8*)