Revert r284008. This is us to fail to instantiate static data members in some

cases. I'm working on reducing a testcase.

llvm-svn: 284081

1 files changed, 0 insertions, 16 deletions

diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp
index fa15b530add..7baa85a6464 100644
--- a/clang/lib/Sema/SemaDecl.cpp
+++ b/clang/lib/Sema/SemaDecl.cpp
@@ -9708,22 +9708,6 @@ void Sema::AddInitializerToDecl(Decl *RealDecl, Expr *Init,
          VDecl->getDeclContext()->isDependentContext())) {
       // The previous definition is hidden, and multiple definitions are
       // permitted (in separate TUs). Form another definition of it.
-      if (!isa<ParmVarDecl>(VDecl)) {
-        // Demote the newly parsed definition to a fake declaration.
-        if (!VDecl->isThisDeclarationADemotedDefinition())
-          VDecl->demoteThisDefinitionToDeclaration();
-
-        // Make the definition visible from the point of the demotion on.
-        assert (!Hidden || Def == Hidden &&
-                "We were suggested another hidden definition!");
-        makeMergedDefinitionVisible(Def, VDecl->getLocation());
-
-        // If this is a variable template definition, make its enclosing template
-        // visible.
-        if (VarDecl *VarPattern = Def->getTemplateInstantiationPattern())
-          if (VarPattern->isThisDeclarationADefinition())
-            makeMergedDefinitionVisible(VarPattern, VDecl->getLocation());
-      }
     } else {
       Diag(VDecl->getLocation(), diag::err_redefinition)
         << VDecl->getDeclName();