Index: lib/Sema/SemaDeclCXX.cpp
===================================================================
--- lib/Sema/SemaDeclCXX.cpp
+++ lib/Sema/SemaDeclCXX.cpp
@@ -5480,6 +5480,15 @@
 
   for (Decl *Member : Class->decls()) {
     auto *MD = dyn_cast<CXXMethodDecl>(Member);
+    auto *VD = dyn_cast<VarDecl>(Member);
+    if (VD && Member->getAttr<DLLExportAttr>() &&
+	VD->getStorageClass() == SC_Static &&
+	VD->isDefinedOutsideFunctionOrMethod() &&
+	VD->getType().isLocalConstQualified() &&
+	TSK == TSK_ImplicitInstantiation)
+      S.PendingLocalImplicitInstantiations.push_back(
+	  std::make_pair(VD, VD->getLocation()));
+
     if (!MD)
       continue;
 
Index: test/SemaCXX/export_static_const.cpp
===================================================================
--- /dev/null
+++ test/SemaCXX/export_static_const.cpp
@@ -0,0 +1,18 @@
+template <class T>
+class Base {
+  virtual void foo() {;}
+  static const int smember;
+};
+
+template <class T> const int Base<T>::smember = 77;
+
+template <class T>
+class __declspec(dllexport) Derived2 : Base<T>
+{
+  void foo() {;}
+};
+
+
+class Derived: public Derived2<int> {
+  void foo() {;}
+};