commit 44dfff681fdca5325bc684c46971efad1f3fedfd
author Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Dec 10 20:08:37 2012 +0000
committer Argyrios Kyrtzidis <akyrtzi@gmail.com> Mon Dec 10 20:08:37 2012 +0000
tree 7a6794d04c42239992fc3c62328e9d6142ffdcc7
parent 44f4a2d8a95e7f12c61530a9b57854be009aef38

Return true from HeaderSearch::isFileMultipleIncludeGuarded if the file
was #import'ed.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169761 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Lex/HeaderSearch.cpp

diff --git a/lib/Lex/HeaderSearch.cpp b/lib/Lex/HeaderSearch.cpp
index 50199e0..cb68eb0 100644
--- a/lib/Lex/HeaderSearch.cpp
+++ b/lib/Lex/HeaderSearch.cpp
@@ -749,7 +749,8 @@
   if (ExternalSource && !HFI.Resolved)
     mergeHeaderFileInfo(HFI, ExternalSource->GetHeaderFileInfo(File));
 
-  return HFI.isPragmaOnce || HFI.ControllingMacro || HFI.ControllingMacroID;
+  return HFI.isPragmaOnce || HFI.isImport ||
+      HFI.ControllingMacro || HFI.ControllingMacroID;
 }
 
 void HeaderSearch::setHeaderFileInfoForUID(HeaderFileInfo HFI, unsigned UID) {