<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Mon, Dec 8, 2014 at 10:35 PM, Duncan P. N. Exon Smith <span dir="ltr"><<a href="mailto:dexonsmith@apple.com" target="_blank">dexonsmith@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">Author: dexonsmith<br>
Date: Tue Dec 9 00:35:37 2014<br>
New Revision: 223759<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=223759&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=223759&view=rev</a><br>
Log:<br>
Revert "[modules] Add experimental -fmodule-map-file-home-is-cwd flag to -cc1."<br>
<br>
This reverts commit r223753. It broke the Green Dragon build for a few<br>
hours:<br>
<br>
<a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/2259/" target="_blank">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/2259/</a><br>
<a href="http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/2259/consoleFull#43901905849ba4694-19c4-4d7e-bec5-911270d8a58c" target="_blank">http://lab.llvm.org:8080/green/job/clang-stage1-cmake-RA-incremental_build/2259/consoleFull#43901905849ba4694-19c4-4d7e-bec5-911270d8a58c</a><br>
<br>
I suspect `clang-tools-extra` just needs a follow-up for an API change,<br>
but I'm not the right one to look into it.<br></blockquote><div><br></div><div>Sorry for the breakage; thanks for reverting. This is re-committed in r223913 with a corresponding clang-tools-extra commit in r223914.</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Removed:<br>
cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map<br>
cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map<br>
cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map<br>
cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap<br>
Modified:<br>
cfe/trunk/include/clang/Driver/CC1Options.td<br>
cfe/trunk/include/clang/Lex/HeaderSearch.h<br>
cfe/trunk/include/clang/Lex/HeaderSearchOptions.h<br>
cfe/trunk/include/clang/Lex/ModuleMap.h<br>
cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
cfe/trunk/lib/Lex/HeaderSearch.cpp<br>
cfe/trunk/lib/Lex/ModuleMap.cpp<br>
cfe/trunk/test/Modules/modular_maps.cpp<br>
cfe/trunk/test/Modules/relative-dep-gen.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Driver/CC1Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Driver/CC1Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver/CC1Options.td Tue Dec 9 00:35:37 2014<br>
@@ -337,9 +337,6 @@ def fno_modules_error_recovery : Flag<["<br>
def fmodule_implementation_of : Separate<["-"], "fmodule-implementation-of">,<br>
MetaVarName<"<name>">,<br>
HelpText<"Specify the name of the module whose implementation file this is">;<br>
-def fmodule_map_file_home_is_cwd : Flag<["-"], "fmodule-map-file-home-is-cwd">,<br>
- HelpText<"Use the current working directory as the home directory of "<br>
- "module maps specified by -fmodule-map-file=<FILE>">;<br>
<br>
let Group = Action_Group in {<br>
<br>
<br>
Modified: cfe/trunk/include/clang/Lex/HeaderSearch.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/HeaderSearch.h?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/HeaderSearch.h?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Lex/HeaderSearch.h (original)<br>
+++ cfe/trunk/include/clang/Lex/HeaderSearch.h Tue Dec 9 00:35:37 2014<br>
@@ -640,8 +640,7 @@ private:<br>
};<br>
<br>
LoadModuleMapResult loadModuleMapFileImpl(const FileEntry *File,<br>
- bool IsSystem,<br>
- const DirectoryEntry *Dir);<br>
+ bool IsSystem);<br>
<br>
/// \brief Try to load the module map file in the given directory.<br>
///<br>
<br>
Modified: cfe/trunk/include/clang/Lex/HeaderSearchOptions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/HeaderSearchOptions.h?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/HeaderSearchOptions.h?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Lex/HeaderSearchOptions.h (original)<br>
+++ cfe/trunk/include/clang/Lex/HeaderSearchOptions.h Tue Dec 9 00:35:37 2014<br>
@@ -101,15 +101,6 @@ public:<br>
/// \brief Interpret module maps. This option is implied by full modules.<br>
unsigned ModuleMaps : 1;<br>
<br>
- /// \brief Set the 'home directory' of a module map file to the current<br>
- /// working directory (or the home directory of the module map file that<br>
- /// contained the 'extern module' directive importing this module map file<br>
- /// if any) rather than the directory containing the module map file.<br>
- //<br>
- /// The home directory is where we look for files named in the module map<br>
- /// file.<br>
- unsigned ModuleMapFileHomeIsCwd : 1;<br>
-<br>
/// \brief The interval (in seconds) between pruning operations.<br>
///<br>
/// This operation is expensive, because it requires Clang to walk through<br>
@@ -167,7 +158,6 @@ public:<br>
public:<br>
HeaderSearchOptions(StringRef _Sysroot = "/")<br>
: Sysroot(_Sysroot), DisableModuleHash(0), ModuleMaps(0),<br>
- ModuleMapFileHomeIsCwd(0),<br>
ModuleCachePruneInterval(7*24*60*60),<br>
ModuleCachePruneAfter(31*24*60*60),<br>
BuildSessionTimestamp(0),<br>
<br>
Modified: cfe/trunk/include/clang/Lex/ModuleMap.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/ModuleMap.h?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Lex/ModuleMap.h?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Lex/ModuleMap.h (original)<br>
+++ cfe/trunk/include/clang/Lex/ModuleMap.h Tue Dec 9 00:35:37 2014<br>
@@ -454,12 +454,8 @@ public:<br>
/// \param IsSystem Whether this module map file is in a system header<br>
/// directory, and therefore should be considered a system module.<br>
///<br>
- /// \param HomeDir The directory in which relative paths within this module<br>
- /// map file will be resolved.<br>
- ///<br>
/// \returns true if an error occurred, false otherwise.<br>
- bool parseModuleMapFile(const FileEntry *File, bool IsSystem,<br>
- const DirectoryEntry *HomeDir);<br>
+ bool parseModuleMapFile(const FileEntry *File, bool IsSystem);<br>
<br>
/// \brief Dump the contents of the module map, for debugging purposes.<br>
void dump();<br>
<br>
Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Tue Dec 9 00:35:37 2014<br>
@@ -1003,7 +1003,6 @@ static void ParseHeaderSearchArgs(Header<br>
Opts.DisableModuleHash = Args.hasArg(OPT_fdisable_module_hash);<br>
// -fmodules implies -fmodule-maps<br>
Opts.ModuleMaps = Args.hasArg(OPT_fmodule_maps) || Args.hasArg(OPT_fmodules);<br>
- Opts.ModuleMapFileHomeIsCwd = Args.hasArg(OPT_fmodule_map_file_home_is_cwd);<br>
Opts.ModuleCachePruneInterval =<br>
getLastArgIntValue(Args, OPT_fmodules_prune_interval, 7 * 24 * 60 * 60);<br>
Opts.ModuleCachePruneAfter =<br>
<br>
Modified: cfe/trunk/lib/Lex/HeaderSearch.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/HeaderSearch.cpp?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/HeaderSearch.cpp?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Lex/HeaderSearch.cpp (original)<br>
+++ cfe/trunk/lib/Lex/HeaderSearch.cpp Tue Dec 9 00:35:37 2014<br>
@@ -1113,10 +1113,11 @@ HeaderSearch::findModuleForHeader(const<br>
return ModMap.findModuleForHeader(File);<br>
}<br>
<br>
-static const FileEntry *getPrivateModuleMap(const FileEntry *File,<br>
+static const FileEntry *getPrivateModuleMap(StringRef ModuleMapPath,<br>
+ const DirectoryEntry *Directory,<br>
FileManager &FileMgr) {<br>
- StringRef Filename = llvm::sys::path::filename(File->getName());<br>
- SmallString<128> PrivateFilename(File->getDir()->getName());<br>
+ StringRef Filename = llvm::sys::path::filename(ModuleMapPath);<br>
+ SmallString<128> PrivateFilename(Directory->getName());<br>
if (Filename == "module.map")<br>
llvm::sys::path::append(PrivateFilename, "module_private.map");<br>
else if (Filename == "module.modulemap")<br>
@@ -1127,25 +1128,7 @@ static const FileEntry *getPrivateModule<br>
}<br>
<br>
bool HeaderSearch::loadModuleMapFile(const FileEntry *File, bool IsSystem) {<br>
- // Find the directory for the module. For frameworks, that may require going<br>
- // up from the 'Modules' directory.<br>
- const DirectoryEntry *Dir = nullptr;<br>
- if (getHeaderSearchOpts().ModuleMapFileHomeIsCwd)<br>
- Dir = FileMgr.getDirectory(".");<br>
- else {<br>
- Dir = File->getDir();<br>
- StringRef DirName(Dir->getName());<br>
- if (llvm::sys::path::filename(DirName) == "Modules") {<br>
- DirName = llvm::sys::path::parent_path(DirName);<br>
- if (DirName.endswith(".framework"))<br>
- Dir = FileMgr.getDirectory(DirName);<br>
- // FIXME: This assert can fail if there's a race between the above check<br>
- // and the removal of the directory.<br>
- assert(Dir && "parent must exist");<br>
- }<br>
- }<br>
-<br>
- switch (loadModuleMapFileImpl(File, IsSystem, Dir)) {<br>
+ switch (loadModuleMapFileImpl(File, IsSystem)) {<br>
case LMM_AlreadyLoaded:<br>
case LMM_NewlyLoaded:<br>
return false;<br>
@@ -1157,8 +1140,7 @@ bool HeaderSearch::loadModuleMapFile(con<br>
}<br>
<br>
HeaderSearch::LoadModuleMapResult<br>
-HeaderSearch::loadModuleMapFileImpl(const FileEntry *File, bool IsSystem,<br>
- const DirectoryEntry *Dir) {<br>
+HeaderSearch::loadModuleMapFileImpl(const FileEntry *File, bool IsSystem) {<br>
assert(File && "expected FileEntry");<br>
<br>
// Check whether we've already loaded this module map, and mark it as being<br>
@@ -1167,14 +1149,15 @@ HeaderSearch::loadModuleMapFileImpl(cons<br>
if (!AddResult.second)<br>
return AddResult.first->second ? LMM_AlreadyLoaded : LMM_InvalidModuleMap;<br>
<br>
- if (ModMap.parseModuleMapFile(File, IsSystem, Dir)) {<br>
+ if (ModMap.parseModuleMapFile(File, IsSystem)) {<br>
LoadedModuleMaps[File] = false;<br>
return LMM_InvalidModuleMap;<br>
}<br>
<br>
// Try to load a corresponding private module map.<br>
- if (const FileEntry *PMMFile = getPrivateModuleMap(File, FileMgr)) {<br>
- if (ModMap.parseModuleMapFile(PMMFile, IsSystem, Dir)) {<br>
+ if (const FileEntry *PMMFile =<br>
+ getPrivateModuleMap(File->getName(), File->getDir(), FileMgr)) {<br>
+ if (ModMap.parseModuleMapFile(PMMFile, IsSystem)) {<br>
LoadedModuleMaps[File] = false;<br>
return LMM_InvalidModuleMap;<br>
}<br>
@@ -1248,8 +1231,7 @@ HeaderSearch::loadModuleMapFile(const Di<br>
return KnownDir->second ? LMM_AlreadyLoaded : LMM_InvalidModuleMap;<br>
<br>
if (const FileEntry *ModuleMapFile = lookupModuleMapFile(Dir, IsFramework)) {<br>
- LoadModuleMapResult Result =<br>
- loadModuleMapFileImpl(ModuleMapFile, IsSystem, Dir);<br>
+ LoadModuleMapResult Result = loadModuleMapFileImpl(ModuleMapFile, IsSystem);<br>
// Add Dir explicitly in case ModuleMapFile is in a subdirectory.<br>
// E.g. Foo.framework/Modules/module.modulemap<br>
// ^Dir ^ModuleMapFile<br>
<br>
Modified: cfe/trunk/lib/Lex/ModuleMap.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ModuleMap.cpp?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Lex/ModuleMap.cpp?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Lex/ModuleMap.cpp (original)<br>
+++ cfe/trunk/lib/Lex/ModuleMap.cpp Tue Dec 9 00:35:37 2014<br>
@@ -19,7 +19,6 @@<br>
#include "clang/Basic/TargetInfo.h"<br>
#include "clang/Basic/TargetOptions.h"<br>
#include "clang/Lex/HeaderSearch.h"<br>
-#include "clang/Lex/HeaderSearchOptions.h"<br>
#include "clang/Lex/LexDiagnostic.h"<br>
#include "clang/Lex/Lexer.h"<br>
#include "clang/Lex/LiteralSupport.h"<br>
@@ -649,7 +648,7 @@ ModuleMap::inferFrameworkModule(StringRe<br>
bool IsFrameworkDir = Parent.endswith(".framework");<br>
if (const FileEntry *ModMapFile =<br>
HeaderInfo.lookupModuleMapFile(ParentDir, IsFrameworkDir)) {<br>
- parseModuleMapFile(ModMapFile, IsSystem, ParentDir);<br>
+ parseModuleMapFile(ModMapFile, IsSystem);<br>
inferred = InferredDirectories.find(ParentDir);<br>
}<br>
<br>
@@ -1025,8 +1024,7 @@ namespace clang {<br>
/// \brief The current module map file.<br>
const FileEntry *ModuleMapFile;<br>
<br>
- /// \brief The directory that file names in this module map file should<br>
- /// be resolved relative to.<br>
+ /// \brief The directory that this module map resides in.<br>
const DirectoryEntry *Directory;<br>
<br>
/// \brief The directory containing Clang-supplied headers.<br>
@@ -1593,11 +1591,7 @@ void ModuleMapParser::parseExternModuleD<br>
FileNameRef = ModuleMapFileName.str();<br>
}<br>
if (const FileEntry *File = SourceMgr.getFileManager().getFile(FileNameRef))<br>
- Map.parseModuleMapFile(<br>
- File, /*IsSystem=*/false,<br>
- Map.HeaderInfo.getHeaderSearchOpts().ModuleMapFileHomeIsCwd<br>
- ? Directory<br>
- : File->getDir());<br>
+ Map.parseModuleMapFile(File, /*IsSystem=*/false);<br>
}<br>
<br>
/// \brief Parse a requires declaration.<br>
@@ -2339,8 +2333,7 @@ bool ModuleMapParser::parseModuleMapFile<br>
} while (true);<br>
}<br>
<br>
-bool ModuleMap::parseModuleMapFile(const FileEntry *File, bool IsSystem,<br>
- const DirectoryEntry *Dir) {<br>
+bool ModuleMap::parseModuleMapFile(const FileEntry *File, bool IsSystem) {<br>
llvm::DenseMap<const FileEntry *, bool>::iterator Known<br>
= ParsedModuleMap.find(File);<br>
if (Known != ParsedModuleMap.end())<br>
@@ -2353,6 +2346,17 @@ bool ModuleMap::parseModuleMapFile(const<br>
if (!Buffer)<br>
return ParsedModuleMap[File] = true;<br>
<br>
+ // Find the directory for the module. For frameworks, that may require going<br>
+ // up from the 'Modules' directory.<br>
+ const DirectoryEntry *Dir = File->getDir();<br>
+ StringRef DirName(Dir->getName());<br>
+ if (llvm::sys::path::filename(DirName) == "Modules") {<br>
+ DirName = llvm::sys::path::parent_path(DirName);<br>
+ if (DirName.endswith(".framework"))<br>
+ Dir = SourceMgr.getFileManager().getDirectory(DirName);<br>
+ assert(Dir && "parent must exist");<br>
+ }<br>
+<br>
// Parse this module map file.<br>
Lexer L(ID, SourceMgr.getBuffer(ID), SourceMgr, MMapLangOpts);<br>
ModuleMapParser Parser(L, SourceMgr, Target, Diags, *this, File, Dir,<br>
<br>
Removed: cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map?rev=223758&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map?rev=223758&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map (original)<br>
+++ cfe/trunk/test/Modules/Inputs/modular_maps-moduleb-cwd.map (removed)<br>
@@ -1,4 +0,0 @@<br>
-module B {<br>
- header "Inputs/modular_maps/common.h"<br>
- private header "Inputs/modular_maps/b.h"<br>
-}<br>
<br>
Removed: cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map?rev=223758&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map?rev=223758&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map (original)<br>
+++ cfe/trunk/test/Modules/Inputs/modular_maps/modulea-cwd.map (removed)<br>
@@ -1,7 +0,0 @@<br>
-module A {<br>
- header "Inputs/modular_maps/common.h"<br>
- header "Inputs/modular_maps/a.h"<br>
-}<br>
-<br>
-extern module B "Inputs/modular_maps-moduleb-cwd.map"<br>
-<br>
<br>
Removed: cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map?rev=223758&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map?rev=223758&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map (original)<br>
+++ cfe/trunk/test/Modules/Inputs/modular_maps/modulec-cwd.map (removed)<br>
@@ -1,3 +0,0 @@<br>
-module C {<br>
- header "Inputs/modular_maps/c.h"<br>
-}<br>
<br>
Removed: cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap?rev=223758&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap?rev=223758&view=auto</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap (original)<br>
+++ cfe/trunk/test/Modules/Inputs/relative-dep-gen-cwd.modulemap (removed)<br>
@@ -1,4 +0,0 @@<br>
-module "relative-dep-gen" {<br>
- header "Inputs/relative-dep-gen-1.h"<br>
- header "Inputs/relative-dep-gen-2.h"<br>
-}<br>
<br>
Modified: cfe/trunk/test/Modules/modular_maps.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/modular_maps.cpp?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/modular_maps.cpp?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/modular_maps.cpp (original)<br>
+++ cfe/trunk/test/Modules/modular_maps.cpp Tue Dec 9 00:35:37 2014<br>
@@ -1,15 +1,6 @@<br>
// RUN: rm -rf %t<br>
-//<br>
// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=%S/Inputs/modular_maps/modulea.map -fmodule-map-file=%S/Inputs/modular_maps/modulec.map -I %S/Inputs/modular_maps %s -verify<br>
// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=%S/Inputs/modular_maps/modulec.map -fmodule-map-file=%S/Inputs/modular_maps/modulea.map -I %S/Inputs/modular_maps %s -verify<br>
-//<br>
-// RUN: cd %S<br>
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulea.map -fmodule-map-file=Inputs/modular_maps/modulec.map -I Inputs/modular_maps %s -verify<br>
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulec.map -fmodule-map-file=Inputs/modular_maps/modulea.map -I Inputs/modular_maps %s -verify<br>
-//<br>
-// RUN: cd %S<br>
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulea-cwd.map -fmodule-map-file=Inputs/modular_maps/modulec-cwd.map -I Inputs/modular_maps %s -verify -fmodule-map-file-home-is-cwd<br>
-// RUN: %clang_cc1 -x objective-c++ -fmodules-cache-path=%t -fmodules -fmodule-map-file=Inputs/modular_maps/modulec-cwd.map -fmodule-map-file=Inputs/modular_maps/modulea-cwd.map -I Inputs/modular_maps %s -verify -fmodule-map-file-home-is-cwd<br>
<br>
#include "common.h"<br>
#include "a.h"<br>
<br>
Modified: cfe/trunk/test/Modules/relative-dep-gen.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/relative-dep-gen.cpp?rev=223759&r1=223758&r2=223759&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/relative-dep-gen.cpp?rev=223759&r1=223758&r2=223759&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Modules/relative-dep-gen.cpp (original)<br>
+++ cfe/trunk/test/Modules/relative-dep-gen.cpp Tue Dec 9 00:35:37 2014<br>
@@ -3,7 +3,6 @@<br>
// RUN: cd %S<br>
// RUN: rm -rf %t<br>
// RUN: mkdir %t<br>
-//<br>
// RUN: %clang_cc1 -cc1 -fmodule-name=relative-dep-gen -emit-module -x c++ Inputs/relative-dep-gen.modulemap -dependency-file %t/build.d -MT mod.pcm -o %t/mod.pcm<br>
// RUN: %clang_cc1 -cc1 -fmodule-map-file=Inputs/relative-dep-gen.modulemap -fmodule-file=%t/mod.pcm -dependency-file %t/use-explicit.d -MT use.o relative-dep-gen.cpp -fsyntax-only<br>
// RUN: %clang_cc1 -cc1 -fmodule-map-file=Inputs/relative-dep-gen.modulemap -dependency-file %t/use-implicit.d relative-dep-gen.cpp -MT use.o -fsyntax-only<br>
@@ -11,14 +10,6 @@<br>
// RUN: FileCheck --check-prefix=CHECK-BUILD %s < %t/build.d<br>
// RUN: FileCheck --check-prefix=CHECK-USE %s < %t/use-explicit.d<br>
// RUN: FileCheck --check-prefix=CHECK-USE %s < %t/use-implicit.d<br>
-//<br>
-// RUN: %clang_cc1 -cc1 -fmodule-name=relative-dep-gen -emit-module -x c++ Inputs/relative-dep-gen-cwd.modulemap -dependency-file %t/build-cwd.d -MT mod.pcm -o %t/mod-cwd.pcm -fmodule-map-file-home-is-cwd<br>
-// RUN: %clang_cc1 -cc1 -fmodule-map-file=Inputs/relative-dep-gen-cwd.modulemap -fmodule-file=%t/mod-cwd.pcm -dependency-file %t/use-explicit-cwd.d -MT use.o relative-dep-gen.cpp -fsyntax-only -fmodule-map-file-home-is-cwd<br>
-// RUN: %clang_cc1 -cc1 -fmodule-map-file=Inputs/relative-dep-gen-cwd.modulemap -dependency-file %t/use-implicit-cwd.d relative-dep-gen.cpp -MT use.o -fsyntax-only -fmodule-map-file-home-is-cwd<br>
-//<br>
-// RUN: FileCheck --check-prefix=CHECK-BUILD %s < %t/build-cwd.d<br>
-// RUN: FileCheck --check-prefix=CHECK-USE %s < %t/use-explicit-cwd.d<br>
-// RUN: FileCheck --check-prefix=CHECK-USE %s < %t/use-implicit-cwd.d<br>
<br>
#include "Inputs/relative-dep-gen-1.h"<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>