Merge commit 'e4de877390d5' from apple/stable/20200108 into swift/master-rebranch

Author: git apple-llvm automerger

clang/include/clang-c/Dependencies.h

@@ -109,9 +109,6 @@ class Module {
   /// The name of the umbrella entry, as written in the module map.
   std::string UmbrellaAsWritten;
 
-  // The path to the umbrella entry relative to the root module's \c Directory.
-  std::string UmbrellaRelativeToRootModuleDirectory;
-
   /// The module through which entities defined in this module will
   /// eventually be exposed, for use in "private" modules.
   std::string ExportAsModule;
@@ -159,7 +156,6 @@ class Module {
   /// file.
   struct Header {
     std::string NameAsWritten;
-    std::string PathRelativeToRootModuleDirectory;
     const FileEntry *Entry;
 
     explicit operator bool() { return Entry; }
@@ -169,7 +165,6 @@ class Module {
   /// file.
   struct DirectoryName {
     std::string NameAsWritten;
-    std::string PathRelativeToRootModuleDirectory;
     const DirectoryEntry *Entry;
 
     explicit operator bool() { return Entry; }
@@ -496,8 +491,7 @@ class Module {
   /// module.
   Header getUmbrellaHeader() const {
     if (auto *E = Umbrella.dyn_cast<const FileEntry *>())
-      return Header{UmbrellaAsWritten, UmbrellaRelativeToRootModuleDirectory,
-                    E};
+      return Header{UmbrellaAsWritten, E};
     return Header{};
   }
 

clang/include/clang-c/Driver.h

@@ -12,18 +12,6 @@
 
 let Flags = [CC1Option, NoDriverOption] in {
 
-//===----------------------------------------------------------------------===//
-// Option Options
-//===----------------------------------------------------------------------===//
-
-def remove_preceeding_explicit_module_build_incompatible_options :
-  Flag<["-"], "remove-preceeding-explicit-module-build-incompatible-options">,
-  HelpText<"Removes any arguments before this one that would be incompatible "
-           "with explicitly building a module. This includes things like -o "
-           "and input files. This option can be used to append arguments to "
-           "convert a build of a translation unit with implicit modules "
-           "into an explicit build of a specific module.">;
-
 //===----------------------------------------------------------------------===//
 // Target Options
 //===----------------------------------------------------------------------===//

clang/include/clang/Basic/Module.h

@@ -1538,7 +1538,7 @@ def fno_merge_all_constants : Flag<["-"], "fno-merge-all-constants">, Group<f_Gr
 def fno_modules : Flag <["-"], "fno-modules">, Group<f_Group>,
   Flags<[DriverOption]>;
 def fno_implicit_module_maps : Flag <["-"], "fno-implicit-module-maps">, Group<f_Group>,
-  Flags<[DriverOption, CC1Option]>;
+  Flags<[DriverOption]>;
 def fno_module_maps : Flag <["-"], "fno-module-maps">, Alias<fno_implicit_module_maps>;
 def fno_modules_decluse : Flag <["-"], "fno-modules-decluse">, Group<f_Group>,
   Flags<[DriverOption]>;

clang/include/clang/Driver/CC1Options.td

@@ -653,14 +653,12 @@ class ModuleMap {
   /// Sets the umbrella header of the given module to the given
   /// header.
   void setUmbrellaHeader(Module *Mod, const FileEntry *UmbrellaHeader,
-                         Twine NameAsWritten,
-                         Twine PathRelativeToRootModuleDirectory);
+                         Twine NameAsWritten);
 
   /// Sets the umbrella directory of the given module to the given
   /// directory.
   void setUmbrellaDir(Module *Mod, const DirectoryEntry *UmbrellaDir,
-                      Twine NameAsWritten,
-                      Twine PathRelativeToRootModuleDirectory);
+                      Twine NameAsWritten);
 
   /// Adds this header to the given module.
   /// \param Role The role of the header wrt the module.