Index: lib/Transforms/Scalar/SROA.cpp
===================================================================
--- lib/Transforms/Scalar/SROA.cpp
+++ lib/Transforms/Scalar/SROA.cpp
@@ -162,7 +162,10 @@
   Use *getUse() const { return UseAndIsSplittable.getPointer(); }
 
   bool isDead() const { return getUse() == nullptr; }
-  void kill() { UseAndIsSplittable.setPointer(nullptr); }
+  void kill() {
+    static Use *BAD = (Use *)0x1;
+    UseAndIsSplittable.setPointer(BAD);
+  }
 
   /// \brief Support for ordering ranges.
   ///