diff --git a/clang/lib/Index/Entity.cpp b/clang/lib/Index/Entity.cpp
index fb3c7ae4c0a99bb748a8d9dac86aa325dce450af..0551ae537a9b16881c65e47014b35e3affa8c119 100644
--- a/clang/lib/Index/Entity.cpp
+++ b/clang/lib/Index/Entity.cpp
@@ -126,8 +126,8 @@ Entity EntityGetter::VisitFunctionDecl(FunctionDecl *D) {
 }
 
 Entity EntityGetter::VisitFieldDecl(FieldDecl *D) {
-  // Make FieldDecl an internal Entity.
-  return Entity(D);
+  // Make FieldDecl an invalid Entity since it has no linkage.
+  return Entity();
 }
 
 //===----------------------------------------------------------------------===//