diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index e2d5c75..6b88246 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -2832,6 +2832,8 @@
 }
 
 bool LValueExprEvaluator::VisitVarDecl(const Expr *E, const VarDecl *VD) {
+  if (VD->isThreadSpecified())
+    return false;
   if (!VD->getType()->isReferenceType()) {
     if (isa<ParmVarDecl>(VD)) {
       Result.set(VD, Info.CurrentCall->Index);
diff --git a/test/Sema/init.c b/test/Sema/init.c
index 81a665d..ee3e256 100644
--- a/test/Sema/init.c
+++ b/test/Sema/init.c
@@ -157,3 +157,10 @@
 typedef char strty[10];
 struct vortexstruct { strty s; };
 struct vortexstruct vortexvar = { "asdf" };
+
+// PR13720
+__thread int thread_int;
+int *thread_int_ptr = &thread_int; // expected-error{{initializer element is not a compile-time constant}}
+void f() {
+  int *p = &thread_int; // This is perfectly fine, though.
+}