3 files changed, 1 insertions, 22 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 7927279ddd..0294b9fde8 100644
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -219,10 +219,6 @@ public:
     return getLinkage() == ExternalLinkage;
   }
 
-  /// \brief True if this decl has external linkage. Don't cache the linkage,
-  /// because we are not finished setting up the redecl chain for the decl.
-  bool hasExternalLinkageUncached() const;
-
   /// \brief Determines the visibility of this entity.
   Visibility getVisibility() const {
     return getLinkageAndVisibility().getVisibility();
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index bf807aeb1d..9505d299ab 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -866,10 +866,6 @@ bool NamedDecl::isLinkageValid() const {
     Linkage(CachedLinkage);
 }
 
-bool NamedDecl::hasExternalLinkageUncached() const {
-  return getLVForDecl(this, LVForExplicitValue).getLinkage() == ExternalLinkage;
-}
-
 Linkage NamedDecl::getLinkage() const {
   if (HasCachedLinkage)
     return Linkage(CachedLinkage);
diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index a25204d808..0ad539ef17 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1605,19 +1605,6 @@ static void filterNonConflictingPreviousDecls(ASTContext &context,
   if (previous.empty())
     return;
 
-  // If this declaration would have external linkage if it were the first
-  // declaration of this name, then it may in fact be a redeclaration of
-  // some hidden declaration, so include those too. We don't need to worry
-  // about some previous visible declaration giving this declaration external
-  // linkage, because in that case, we'll mark this declaration as a redecl
-  // of the visible decl, and that decl will already be a redecl of the
-  // hidden declaration if that's appropriate.
-  //
-  // Don't cache this linkage computation, because it's not yet correct: we
-  // may later give this declaration a previous declaration which changes
-  // its linkage.
-  bool hasExternalLinkage = decl->hasExternalLinkageUncached();
-
   LookupResult::Filter filter = previous.makeFilter();
   while (filter.hasNext()) {
     NamedDecl *old = filter.next();
@@ -1627,7 +1614,7 @@ static void filterNonConflictingPreviousDecls(ASTContext &context,
       continue;
 
     // If either has no-external linkage, ignore the old declaration.
-    if (!hasExternalLinkage || old->getLinkage() != ExternalLinkage)
+    if (old->getLinkage() != ExternalLinkage || !decl->hasExternalLinkage())
       filter.erase();
   }