[PATCH] D21518: [Scalarizer] PR28108: Skip over nullptr rather than crashing on it.

[Mehdi AMINI via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL275359: [Scalarizer] PR28108: Skip over nullptr rather than crashing on it. (authored by mehdi_amini).

Changed prior to commit:
  http://reviews.llvm.org/D21518?vs=61244&id=63898#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D21518

Files:
  llvm/trunk/lib/Transforms/Scalar/Scalarizer.cpp
  llvm/trunk/test/Transforms/Scalarizer/crash-bug.ll

Index: llvm/trunk/test/Transforms/Scalarizer/crash-bug.ll
===================================================================
--- llvm/trunk/test/Transforms/Scalarizer/crash-bug.ll
+++ llvm/trunk/test/Transforms/Scalarizer/crash-bug.ll
@@ -0,0 +1,24 @@
+; RUN: opt %s -scalarizer -S -o - | FileCheck %s
+
+; Don't crash
+
+define void @foo() {
+  br label %bb1
+
+bb2:                                        ; preds = %bb1
+  %bb2_vec = shufflevector <2 x i16> <i16 0, i16 10000>,
+                           <2 x i16> %bb1_vec,
+                           <2 x i32> <i32 0, i32 3>
+  br label %bb1
+
+bb1:                                        ; preds = %bb2, %0
+  %bb1_vec = phi <2 x i16> [ <i16 100, i16 200>, %0 ], [ %bb2_vec, %bb2 ]
+;CHECK: bb1:
+;CHECK: %bb1_vec.i0 = phi i16 [ 100, %0 ], [ 0, %bb2 ]
+;CHECK: %bb1_vec.i1 = phi i16 [ 200, %0 ], [ %bb1_vec.i1, %bb2 ]
+  br i1 undef, label %bb3, label %bb2
+
+bb3:
+  ret void
+}
+
Index: llvm/trunk/lib/Transforms/Scalar/Scalarizer.cpp
===================================================================
--- llvm/trunk/lib/Transforms/Scalar/Scalarizer.cpp
+++ llvm/trunk/lib/Transforms/Scalar/Scalarizer.cpp
@@ -306,7 +306,11 @@
   ValueVector &SV = Scattered[Op];
   if (!SV.empty()) {
     for (unsigned I = 0, E = SV.size(); I != E; ++I) {
-      Instruction *Old = cast<Instruction>(SV[I]);
+      Value *V = SV[I];
+      if (V == nullptr)
+        continue;
+
+      Instruction *Old = cast<Instruction>(V);
       CV[I]->takeName(Old);
       Old->replaceAllUsesWith(CV[I]);
       Old->eraseFromParent();


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21518.63898.patch
Type: text/x-patch
Size: 1572 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160714/48f3e82e/attachment.bin>