Index: lib/Transforms/Scalar/SROA.cpp
===================================================================
--- lib/Transforms/Scalar/SROA.cpp
+++ lib/Transforms/Scalar/SROA.cpp
@@ -3141,9 +3141,11 @@
     void emitFunc(Type *Ty, Value *&Agg, const Twine &Name) {
       assert(Ty->isSingleValueType());
       // Extract the single value and store it using the indices.
-      Value *Store = IRB.CreateStore(
-          IRB.CreateExtractValue(Agg, Indices, Name + ".extract"),
-          IRB.CreateInBoundsGEP(nullptr, Ptr, GEPIndices, Name + ".gep"));
+      Value *ExtractValue = IRB.CreateExtractValue(Agg, Indices,
+        Name + ".extract");
+      Value *InBoundsGEP = IRB.CreateInBoundsGEP(nullptr, Ptr, GEPIndices,
+        Name + ".gep");
+      Value *Store = IRB.CreateStore(ExtractValue, InBoundsGEP);
       (void)Store;
       DEBUG(dbgs() << "          to: " << *Store << "\n");
     }
Index: test/Transforms/SROA/store-non-determinism-bug.ll
===================================================================
--- /dev/null
+++ test/Transforms/SROA/store-non-determinism-bug.ll
@@ -0,0 +1,27 @@
+; RUN: opt -sroa -S < %s | FileCheck %s
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+%A = type {i16}
+
+@a = global %A* null
+@b = global i16 0
+
+; CHECK-LABEL: @f1(
+; CHECK: alloca %A
+; CHECK-NEXT: extractvalue %A
+; CHECK-NEXT: getelementptr inbounds %A
+
+define void @f1 (%A %a) {
+  %1 = alloca %A
+  store %A %a, %A* %1
+  %2 = load i16, i16* @b
+  %3 = icmp ne i16 %2, 0
+  br i1 %3, label %bb1, label %bb2
+bb1:
+  store %A* %1, %A** @a
+  br label %bb2
+bb2:
+  ret void
+}