diff options
| author | Duncan Sands <baldrick@free.fr> | 2011-01-06 23:45:22 +0000 |
|---|---|---|
| committer | Duncan Sands <baldrick@free.fr> | 2011-01-06 23:45:22 +0000 |
| commit | 61c5708b512aa4958b3325c2497f544612b43f58 (patch) | |
| tree | a82da7b48964ff4461ff402e4469bfd212d0f226 | |
| parent | 64b75da0888c0812a03ffcf16fd3b4c535b51b65 (diff) | |
| download | bcm5719-llvm-61c5708b512aa4958b3325c2497f544612b43f58.tar.gz bcm5719-llvm-61c5708b512aa4958b3325c2497f544612b43f58.zip | |
Fix the other problem reported in PR8582. Testcase and patch by
Nadav Rotem.
llvm-svn: 122983
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp | 5 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/2011-01-07-LegalizeTypesCrash.ll | 19 |
2 files changed, 24 insertions, 0 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp index 8849ced684f..0320e819776 100644 --- a/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp @@ -714,6 +714,11 @@ void DAGTypeLegalizer::ReplaceValueWith(SDValue From, SDValue To) { if (M->getNodeId() == Processed) RemapValue(NewVal); DAG.ReplaceAllUsesOfValueWith(OldVal, NewVal, &NUL); + // OldVal may be a target of the ReplacedValues map which was marked + // NewNode to force reanalysis because it was updated. Ensure that + // anything that ReplacedValues mapped to OldVal will now be mapped + // all the way to NewVal. + ReplacedValues[OldVal] = NewVal; } // The original node continues to exist in the DAG, marked NewNode. } diff --git a/llvm/test/CodeGen/X86/2011-01-07-LegalizeTypesCrash.ll b/llvm/test/CodeGen/X86/2011-01-07-LegalizeTypesCrash.ll new file mode 100644 index 00000000000..b9cf65b1e73 --- /dev/null +++ b/llvm/test/CodeGen/X86/2011-01-07-LegalizeTypesCrash.ll @@ -0,0 +1,19 @@ +; RUN: llc < %s -enable-legalize-types-checking +; PR8582 +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-f80:128:128-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32" +target triple = "i686-pc-win32" + +define void @test() nounwind { + %i17 = icmp eq <4 x i8> undef, zeroinitializer + %cond = extractelement <4 x i1> %i17, i32 0 + %_comp = select i1 %cond, i8 0, i8 undef + %merge = insertelement <4 x i8> undef, i8 %_comp, i32 0 + %cond3 = extractelement <4 x i1> %i17, i32 1 + %_comp4 = select i1 %cond3, i8 0, i8 undef + %merge5 = insertelement <4 x i8> %merge, i8 %_comp4, i32 1 + %cond8 = extractelement <4 x i1> %i17, i32 2 + %_comp9 = select i1 %cond8, i8 0, i8 undef + %m387 = insertelement <4 x i8> %merge5, i8 %_comp9, i32 2 + store <4 x i8> %m387, <4 x i8>* undef + ret void +} |
