diff --git a/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx b/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
new file mode 100644
index 00000000000..f4ee707f9ec
--- /dev/null
+++ b/test/Transforms/IndVarsSimplify/2004-04-07-ScalarEvolutionCrash.llx
@@ -0,0 +1,26 @@
+; RUN: llvm-as < %s | opt -indvars -disable-output
+
+void %.outPlank_21() {
+entry:
+	br bool false, label %loopexit.0, label %no_exit.0
+
+no_exit.0:		; preds = %entry
+	ret void
+
+loopexit.0:		; preds = %entry
+	br bool false, label %no_exit.1, label %loopexit.1
+
+no_exit.1:		; preds = %loopexit.0, %loopexit.2
+	%i.0.0 = phi int [ %inc, %loopexit.2 ], [ 0, %loopexit.0 ]		; <int> [#uses=1]
+	br bool false, label %loopexit.2, label %no_exit.2
+
+no_exit.2:		; preds = %no_exit.1
+	ret void
+
+loopexit.2:		; preds = %no_exit.1
+	%inc = add int %i.0.0, 1		; <int> [#uses=1]
+	br bool false, label %no_exit.1, label %loopexit.1
+
+loopexit.1:		; preds = %loopexit.0, %loopexit.2
+	ret void
+}