Don't mark include guard macros as implicitly private. This isn't

actually a terribly good heuristic, and the world is too horrible for
it to work.

llvm-svn: 146393

2 files changed, 2 insertions, 21 deletions

diff --git a/clang/lib/Lex/PPLexerChange.cpp b/clang/lib/Lex/PPLexerChange.cpp
index 37b62a6d025..24dda4f84c8 100644
--- a/clang/lib/Lex/PPLexerChange.cpp
+++ b/clang/lib/Lex/PPLexerChange.cpp
@@ -212,28 +212,8 @@ bool Preprocessor::HandleEndOfFile(Token &Result, bool isEndOfMacro) {
           CurPPLexer->MIOpt.GetControllingMacroAtEndOfFile()) {
       // Okay, this has a controlling macro, remember in HeaderFileInfo.
       if (const FileEntry *FE =
-            SourceMgr.getFileEntryForID(CurPPLexer->getFileID())) {
+            SourceMgr.getFileEntryForID(CurPPLexer->getFileID()))
         HeaderInfo.SetFileControllingMacro(FE, ControllingMacro);
-        
-        // Controlling macros are implicitly private.
-        if (MacroInfo *MI = getMacroInfo(
-                             const_cast<IdentifierInfo *>(ControllingMacro))) {
-          if (MI->getVisibilityLocation().isInvalid()) {
-            // FIXME: HACK! Mark controlling macros from system headers as
-            // exported, along with our own Clang headers. This is a gross
-            // hack to deal with the fact that system headers are included in
-            // many places within module headers, but are not themselves
-            // modularized.
-            if ((StringRef(FE->getName()).find("lib/clang") 
-                   == StringRef::npos) &&
-                (StringRef(FE->getName()).find("usr/include") 
-                   == StringRef::npos) &&
-                (StringRef(FE->getName()).find("usr/local/include") 
-                   == StringRef::npos))            
-              MI->setVisibility(false, SourceLocation());
-          }
-        }
-      }
     }
   }
 
diff --git a/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
index 438fc9c516e..a7b33f346e1 100644
--- a/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
+++ b/clang/test/Modules/Inputs/Module.framework/Frameworks/SubFramework.framework/Headers/SubFramework.h
@@ -1,4 +1,5 @@
 #ifndef MODULE_SUBFRAMEWORK_H
 #define MODULE_SUBFRAMEWORK_H
+#__private_macro__ MODULE_SUBFRAMEWORK_H
 char *module_subframework;
 #endif