Author: lattner
Date: Thu Jun 16 17:58:10 2011
New Revision: 133212
URL: http://llvm.org/viewvc/llvm-project?rev=133212&view=rev
Log:
Fix a regression introduced by r131955 which broke #include_next in subtle
situations
because the Angled directories and the System directories were not being
uniqued
together, breaking #include_next. I'll see about a testcase, but it will be
insane.
Modified:
cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
Modified: cfe/trunk/lib/Frontend/InitHeaderSearch.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitHeaderSearch.cpp?rev=133212&r1=133211&r2=133212&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/InitHeaderSearch.cpp (original)
+++ cfe/trunk/lib/Frontend/InitHeaderSearch.cpp Thu Jun 16 17:58:10 2011
@@ -1050,7 +1050,10 @@
SearchList.push_back(it->second);
}
- RemoveDuplicates(SearchList, NumAngled, Verbose);
+ // Remove duplicates across both the Angled and System directories. GCC does
+ // this and failing to remove duplicates across these two groups breaks
+ // #include_next.
+ RemoveDuplicates(SearchList, NumQuoted, Verbose);
bool DontSearchCurDir = false; // TODO: set to true if -I- is set?
Headers.SetSearchPaths(SearchList, NumQuoted, NumAngled, DontSearchCurDir);
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
