[X86] Fix Stale SDNode use in X86ISelDAGtoDAG

Summary: Fixes pr32329. Reviewers: spatel, craig.topper Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D31286 llvm-svn: 298633
llvm · Mar 23, 2017 · 9ebefeb · 9ebefeb
1 parent 0cbf1fd
commit 9ebefeb
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 2 deletions.
diff --git a/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp b/llvm/lib/Target/X86/X86ISelDAGToDAG.cpp
@@ -1335,8 +1335,8 @@ bool X86DAGToDAGISel::matchAddressRecursively(SDValue N, X86ISelAddressMode &AM,
     AM.Scale = 1;
 
     // Insert the new nodes into the topological ordering.
-    insertDAGNode(*CurDAG, N, Zero);
-    insertDAGNode(*CurDAG, N, Neg);
+    insertDAGNode(*CurDAG, Handle.getValue(), Zero);
+    insertDAGNode(*CurDAG, Handle.getValue(), Neg);
     return false;
   }
 

diff --git a/llvm/test/CodeGen/X86/pr32329.ll b/llvm/test/CodeGen/X86/pr32329.ll
@@ -0,0 +1,126 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=i686-unknown -mcpu=skx %s -o - | FileCheck %s -check-prefix=686
+; RUN: llc -mtriple=x86_64-unknown -mcpu=skx %s -o - | FileCheck %s -check-prefix=X64
+
+%struct.AA = type { i24, [4 x i8] }
+
+@obj = external local_unnamed_addr global %struct.AA, align 8
+@var_27 = external local_unnamed_addr constant i8, align 1
+@var_2 = external local_unnamed_addr constant i16, align 2
+@var_24 = external local_unnamed_addr constant i64, align 8
+@var_310 = external local_unnamed_addr global i64, align 8
+@var_50 = external local_unnamed_addr global i64, align 8
+@var_205 = external local_unnamed_addr global i8, align 1
+@var_218 = external local_unnamed_addr global i8, align 1
+
+define void @foo() local_unnamed_addr {
+; 686-LABEL: foo:
+; 686:       # BB#0: # %entry
+; 686-NEXT:    pushl %ebp
+; 686-NEXT:  .Lcfi0:
+; 686-NEXT:    .cfi_def_cfa_offset 8
+; 686-NEXT:    pushl %ebx
+; 686-NEXT:  .Lcfi1:
+; 686-NEXT:    .cfi_def_cfa_offset 12
+; 686-NEXT:    pushl %edi
+; 686-NEXT:  .Lcfi2:
+; 686-NEXT:    .cfi_def_cfa_offset 16
+; 686-NEXT:    pushl %esi
+; 686-NEXT:  .Lcfi3:
+; 686-NEXT:    .cfi_def_cfa_offset 20
+; 686-NEXT:  .Lcfi4:
+; 686-NEXT:    .cfi_offset %esi, -20
+; 686-NEXT:  .Lcfi5:
+; 686-NEXT:    .cfi_offset %edi, -16
+; 686-NEXT:  .Lcfi6:
+; 686-NEXT:    .cfi_offset %ebx, -12
+; 686-NEXT:  .Lcfi7:
+; 686-NEXT:    .cfi_offset %ebp, -8
+; 686-NEXT:    movl obj, %edx
+; 686-NEXT:    movsbl var_27, %eax
+; 686-NEXT:    movzwl var_2, %esi
+; 686-NEXT:    movl var_310, %ecx
+; 686-NEXT:    imull %eax, %ecx
+; 686-NEXT:    addl var_24, %ecx
+; 686-NEXT:    andl $4194303, %edx # imm = 0x3FFFFF
+; 686-NEXT:    leal (%edx,%edx), %ebx
+; 686-NEXT:    subl %eax, %ebx
+; 686-NEXT:    movl %ebx, %edi
+; 686-NEXT:    subl %esi, %edi
+; 686-NEXT:    imull %edi, %ecx
+; 686-NEXT:    addl $-1437483407, %ecx # imm = 0xAA51BE71
+; 686-NEXT:    movl $9, %esi
+; 686-NEXT:    xorl %ebp, %ebp
+; 686-NEXT:    shldl %cl, %esi, %ebp
+; 686-NEXT:    shll %cl, %esi
+; 686-NEXT:    testb $32, %cl
+; 686-NEXT:    cmovnel %esi, %ebp
+; 686-NEXT:    movl $0, %ecx
+; 686-NEXT:    cmovnel %ecx, %esi
+; 686-NEXT:    cmpl %edx, %edi
+; 686-NEXT:    movl %ebp, var_50+4
+; 686-NEXT:    movl %esi, var_50
+; 686-NEXT:    setge var_205
+; 686-NEXT:    imull %eax, %ebx
+; 686-NEXT:    movb %bl, var_218
+; 686-NEXT:    popl %esi
+; 686-NEXT:    popl %edi
+; 686-NEXT:    popl %ebx
+; 686-NEXT:    popl %ebp
+; 686-NEXT:    retl
+;
+; X64-LABEL: foo:
+; X64:       # BB#0: # %entry
+; X64-NEXT:    movl {{.*}}(%rip), %eax
+; X64-NEXT:    movsbl {{.*}}(%rip), %r9d
+; X64-NEXT:    movzwl {{.*}}(%rip), %r8d
+; X64-NEXT:    movl {{.*}}(%rip), %esi
+; X64-NEXT:    imull %r9d, %esi
+; X64-NEXT:    addl {{.*}}(%rip), %esi
+; X64-NEXT:    andl $4194303, %eax # imm = 0x3FFFFF
+; X64-NEXT:    leal (%rax,%rax), %edi
+; X64-NEXT:    subl %r9d, %edi
+; X64-NEXT:    movl %edi, %edx
+; X64-NEXT:    subl %r8d, %edx
+; X64-NEXT:    imull %edx, %esi
+; X64-NEXT:    addl $-1437483407, %esi # imm = 0xAA51BE71
+; X64-NEXT:    movl $9, %ecx
+; X64-NEXT:    shlxq %rsi, %rcx, %rcx
+; X64-NEXT:    movq %rcx, {{.*}}(%rip)
+; X64-NEXT:    cmpl %eax, %edx
+; X64-NEXT:    setge {{.*}}(%rip)
+; X64-NEXT:    imull %r9d, %edi
+; X64-NEXT:    movb %dil, {{.*}}(%rip)
+; X64-NEXT:    retq
+  entry:
+  %bf.load = load i32, i32* bitcast (%struct.AA* @obj to i32*), align 8
+  %bf.clear = shl i32 %bf.load, 1
+  %add = and i32 %bf.clear, 8388606
+  %0 = load i8, i8* @var_27, align 1
+  %conv5 = sext i8 %0 to i32
+  %sub = sub nsw i32 %add, %conv5
+  %1 = load i16, i16* @var_2, align 2
+  %conv6 = zext i16 %1 to i32
+  %sub7 = sub nsw i32 %sub, %conv6
+  %conv8 = sext i32 %sub7 to i64
+  %2 = load i64, i64* @var_24, align 8
+  %3 = load i64, i64* @var_310, align 8
+  %conv9 = sext i8 %0 to i64
+  %mul = mul i64 %3, %conv9
+  %add10 = add i64 %mul, %2
+  %mul11 = mul i64 %add10, %conv8
+  %sub12 = add i64 %mul11, 8662905354777116273
+  %shl = shl i64 9, %sub12
+  store i64 %shl, i64* @var_50, align 8
+  %bf.clear14 = and i32 %bf.load, 4194303
+  %add21 = shl nuw nsw i32 %bf.clear14, 1
+  %sub23 = sub nsw i32 %add21, %conv5
+  %sub25 = sub nsw i32 %sub23, %conv6
+  %cmp = icmp sge i32 %sub25, %bf.clear14
+  %conv30 = zext i1 %cmp to i8
+  store i8 %conv30, i8* @var_205, align 1
+  %mul43 = mul nsw i32 %sub, %conv5
+  %conv44 = trunc i32 %mul43 to i8
+  store i8 %conv44, i8* @var_218, align 1
+  ret void
+}