diff --git a/lib/VMCore/Constants.cpp b/lib/VMCore/Constants.cpp
index 041fe2eb4fb..edd6a73b086 100644
--- a/lib/VMCore/Constants.cpp
+++ b/lib/VMCore/Constants.cpp
@@ -261,7 +261,9 @@ bool Constant::isThreadDependent() const {
     }
 
     for (unsigned I = 0, E = C->getNumOperands(); I != E; ++I) {
-      const Constant *D = cast<Constant>(C->getOperand(I));
+      const Constant *D = dyn_cast<Constant>(C->getOperand(I));
+      if (!D)
+        continue;
       if (Visited.insert(D))
         WorkList.push_back(D);
     }
diff --git a/test/Transforms/GlobalOpt/blockaddress.ll b/test/Transforms/GlobalOpt/blockaddress.ll
new file mode 100644
index 00000000000..13da76299d5
--- /dev/null
+++ b/test/Transforms/GlobalOpt/blockaddress.ll
@@ -0,0 +1,20 @@
+; RUN: opt < %s -globalopt -S | FileCheck %s
+
+@x = internal global i8* zeroinitializer
+
+define void @f() {
+; CHECK: @f
+
+; Check that we don't hit an assert in Constant::IsThreadDependent()
+; when storing this blockaddress into a global.
+
+  store i8* blockaddress(@g, %here), i8** @x, align 8
+  ret void
+}
+
+define void @g() {
+; CHECK: @g
+
+here:
+  ret void
+}