From 295f940ca6efe6bbc92a665fe343737373482e21 Mon Sep 17 00:00:00 2001 From: Bruno Cardoso Lopes Date: Mon, 12 Dec 2016 23:22:30 +0000 Subject: [PATCH] Revert "[Modules] Make header inclusion order from umbrella dirs deterministic" Reverts commit r289478. This broke http://lab.llvm.org:8011/builders/clang-ppc64be-linux/builds/2070 (and maybe http://lab.llvm.org:8011/builders/clang-x86_64-linux-selfhost-modules-2/builds/2246) llvm-svn: 289494 --- clang/lib/Frontend/FrontendActions.cpp | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/clang/lib/Frontend/FrontendActions.cpp b/clang/lib/Frontend/FrontendActions.cpp index ef008d1428f9..eb91940cbbfc 100644 --- a/clang/lib/Frontend/FrontendActions.cpp +++ b/clang/lib/Frontend/FrontendActions.cpp @@ -233,7 +233,6 @@ collectModuleHeaderIncludes(const LangOptions &LangOpts, FileManager &FileMgr, llvm::sys::path::native(UmbrellaDir.Entry->getName(), DirNative); vfs::FileSystem &FS = *FileMgr.getVirtualFileSystem(); - SmallVector, 8> Headers; for (vfs::recursive_directory_iterator Dir(FS, DirNative, EC), End; Dir != End && !EC; Dir.increment(EC)) { // Check whether this entry has an extension typically associated with @@ -264,20 +263,13 @@ collectModuleHeaderIncludes(const LangOptions &LangOpts, FileManager &FileMgr, ++It) llvm::sys::path::append(RelativeHeader, *It); - Headers.push_back(std::make_pair(RelativeHeader.str(), Header)); + // Include this header as part of the umbrella directory. + Module->addTopHeader(Header); + addHeaderInclude(RelativeHeader, Includes, LangOpts, Module->IsExternC); } if (EC) return EC; - - // Sort header paths and make the header inclusion order deterministic - // across different OSs and filesystems. - llvm::array_pod_sort(Headers.begin(), Headers.end()); - for (auto &H : Headers) { - // Include this header as part of the umbrella directory. - Module->addTopHeader(H.second); - addHeaderInclude(H.first, Includes, LangOpts, Module->IsExternC); - } } // Recurse into submodules.