--===============4948634871667098473==
Content-Type: multipart/alternative; boundary=bcaec5196aab98e5c2051c21676c

--bcaec5196aab98e5c2051c21676c
Content-Type: text/plain; charset=UTF-8

On Thu, Jul 30, 2015 at 5:58 PM, Argyrios Kyrtzidis <akyrtzi@gmail.com>
wrote:

> Author: akirtzidis
> Date: Thu Jul 30 19:58:32 2015
> New Revision: 243718
>
> URL: http://llvm.org/viewvc/llvm-project?rev=243718&view=rev
> Log:
> [modules] Fix issue where building a module from a relative path when
> -working-directory option is set, results in error.
>
> The error was "module '<name>' was built in directory '<path>' but now
> resides in directory '<path>'
> rdar://21330027
>
> Added:
>     cfe/trunk/test/Modules/Inputs/working-dir-test/
>     cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/
>     cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/
>
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
>     cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/
>
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
>     cfe/trunk/test/Modules/working-dir-flag.m
> Modified:
>     cfe/trunk/include/clang/Basic/FileManager.h
>     cfe/trunk/lib/Basic/FileManager.cpp
>     cfe/trunk/lib/Serialization/ASTWriter.cpp
>
> Modified: cfe/trunk/include/clang/Basic/FileManager.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/FileManager.h?rev=243718&r1=243717&r2=243718&view=diff
>
> ==============================================================================
> --- cfe/trunk/include/clang/Basic/FileManager.h (original)
> +++ cfe/trunk/include/clang/Basic/FileManager.h Thu Jul 30 19:58:32 2015
> @@ -254,7 +254,13 @@ public:
>    /// \brief If path is not absolute and FileSystemOptions set the working
>    /// directory, the path is modified to be relative to the given
>    /// working directory.
> -  void FixupRelativePath(SmallVectorImpl<char> &path) const;
> +  /// \returns true if \c path changed.
> +  bool FixupRelativePath(SmallVectorImpl<char> &path) const;
> +
> +  /// Makes \c Path absolute taking into account FileSystemOptions and the
> +  /// working directory option.
> +  /// \returns true if \c Path changed to absolute.
> +  bool makeAbsolutePath(SmallVectorImpl<char> &Path) const;
>
>    /// \brief Produce an array mapping from the unique IDs assigned to each
>    /// file to the corresponding FileEntry pointer.
>
> Modified: cfe/trunk/lib/Basic/FileManager.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=243718&r1=243717&r2=243718&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Basic/FileManager.cpp (original)
> +++ cfe/trunk/lib/Basic/FileManager.cpp Thu Jul 30 19:58:32 2015
> @@ -389,16 +389,28 @@ FileManager::getVirtualFile(StringRef Fi
>    return UFE;
>  }
>
> -void FileManager::FixupRelativePath(SmallVectorImpl<char> &path) const {
> +bool FileManager::FixupRelativePath(SmallVectorImpl<char> &path) const {
>    StringRef pathRef(path.data(), path.size());
>
>    if (FileSystemOpts.WorkingDir.empty()
>        || llvm::sys::path::is_absolute(pathRef))
> -    return;
> +    return false;
>
>    SmallString<128> NewPath(FileSystemOpts.WorkingDir);
>    llvm::sys::path::append(NewPath, pathRef);
>    path = NewPath;
> +  return true;
> +}
> +
> +bool FileManager::makeAbsolutePath(SmallVectorImpl<char> &Path) const {
> +  bool Changed = FixupRelativePath(Path);
> +
> +  if (!llvm::sys::path::is_absolute(StringRef(Path.data(), Path.size())))
> {
> +    llvm::sys::fs::make_absolute(Path);
> +    Changed = true;
> +  }
> +
> +  return Changed;
>  }
>
>  llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>>
>
> Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=243718&r1=243717&r2=243718&view=diff
>
> ==============================================================================
> --- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)
> +++ cfe/trunk/lib/Serialization/ASTWriter.cpp Thu Jul 30 19:58:32 2015
> @@ -1074,14 +1074,7 @@ void ASTWriter::WriteBlockInfoBlock() {
>  /// \return \c true if the path was changed.
>  static bool cleanPathForOutput(FileManager &FileMgr,
>                                 SmallVectorImpl<char> &Path) {
> -  bool Changed = false;
> -
> -  if (!llvm::sys::path::is_absolute(StringRef(Path.data(), Path.size())))
> {
> -    llvm::sys::fs::make_absolute(Path);
> -    Changed = true;
> -  }
> -
> -  return Changed | FileMgr.removeDotPaths(Path);
> +  return FileMgr.makeAbsolutePath(Path) | FileMgr.removeDotPaths(Path);
>

These two operations are unsequenced, and I suspect the order in which
they're performed matters...


>  }
>
>  /// \brief Adjusts the given filename to only write out the portion of the
> @@ -1429,7 +1422,7 @@ void ASTWriter::WriteControlBlock(Prepro
>
>      SmallString<128> OutputPath(OutputFile);
>
> -    llvm::sys::fs::make_absolute(OutputPath);
> +    SM.getFileManager().makeAbsolutePath(OutputPath);
>      StringRef origDir = llvm::sys::path::parent_path(OutputPath);
>
>      RecordData Record;
>
> Added:
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h?rev=243718&view=auto
>
> ==============================================================================
> ---
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
> (added)
> +++
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/Test.h
> Thu Jul 30 19:58:32 2015
> @@ -0,0 +1 @@
> +void test_me_call(void);
>
> Added:
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap?rev=243718&view=auto
>
> ==============================================================================
> ---
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
> (added)
> +++
> cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/module.modulemap
> Thu Jul 30 19:58:32 2015
> @@ -0,0 +1,6 @@
> +framework module Test {
> +  umbrella header "Test.h"
> +
> +  export *
> +  module * { export * }
> +}
>
> Added: cfe/trunk/test/Modules/working-dir-flag.m
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/working-dir-flag.m?rev=243718&view=auto
>
> ==============================================================================
> --- cfe/trunk/test/Modules/working-dir-flag.m (added)
> +++ cfe/trunk/test/Modules/working-dir-flag.m Thu Jul 30 19:58:32 2015
> @@ -0,0 +1,9 @@
> +// RUN: rm -rf %t.mcp
> +// RUN: %clang_cc1 -fmodules-cache-path=%t.mcp -fmodules
> -fimplicit-module-maps -F . -working-directory=%S/Inputs/working-dir-test
> %s -verify
> +// expected-no-diagnostics
> +
> +@import Test;
> +
> +void foo() {
> +  test_me_call();
> +}
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits@cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>

--bcaec5196aab98e5c2051c21676c
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: Quoted-printable

<div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote">On T=
hu, Jul 30, 2015 at 5:58 PM, Argyrios Kyrtzidis <span dir=3D"ltr">&lt;<a hr=
ef=3D"mailto:akyrtzi@gmail.com" target=3D"_blank">akyrtzi@gmail.com</a>&gt;=
</span> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .=
8ex;border-left:1px #ccc solid;padding-left:1ex">Author: akirtzidis<br>
Date: Thu Jul 30 19:58:32 2015<br>
New Revision: 243718<br>
<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject-3Frev-3D243718-26view-3Drev&d=3DAwMFaQ&c=3D8hUWFZ=
cy2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D8prpeY=
8zE-FlbXUPr4nwuIQDcr6evtVSB_NNxVOGQIw&s=3D5iEHQVEszDOP6Xtb_Xc1xUwiODzls8xe4=
3UIAGTZgkE&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewv=
c/llvm-project?rev=3D243718&amp;view=3Drev</a><br>
Log:<br>
[modules] Fix issue where building a module from a relative path when -work=
ing-directory option is set, results in error.<br>
<br>
The error was &quot;module &#39;&lt;name&gt;&#39; was built in directory &#=
39;&lt;path&gt;&#39; but now resides in directory &#39;&lt;path&gt;&#39;<br>
rdar://21330027<br>
<br>
Added:<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework=
/<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework=
/Headers/<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework=
/Headers/Test.h<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework=
/Modules/<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework=
/Modules/module.modulemap<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/working-dir-flag.m<br>
Modified:<br>
=C2=A0 =C2=A0 cfe/trunk/include/clang/Basic/FileManager.h<br>
=C2=A0 =C2=A0 cfe/trunk/lib/Basic/FileManager.cpp<br>
=C2=A0 =C2=A0 cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/FileManager.h<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_include_clang_Basic_FileManager.h-3Frev=
-3D243718-26r1-3D243717-26r2-3D243718-26view-3Ddiff&d=3DAwMFaQ&c=3D8hUWFZcy=
2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D8prpeY8z=
E-FlbXUPr4nwuIQDcr6evtVSB_NNxVOGQIw&s=3DLybD8jX08w9nhrgPl1_StxKF0HlSh6t05RU=
E3OFBvX0&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/=
llvm-project/cfe/trunk/include/clang/Basic/FileManager.h?rev=3D243718&amp;r=
1=3D243717&amp;r2=3D243718&amp;view=3Ddiff</a><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/include/clang/Basic/FileManager.h (original)<br>
+++ cfe/trunk/include/clang/Basic/FileManager.h Thu Jul 30 19:58:32 2015<br>
@@ -254,7 +254,13 @@ public:<br>
=C2=A0 =C2=A0/// \brief If path is not absolute and FileSystemOptions set t=
he working<br>
=C2=A0 =C2=A0/// directory, the path is modified to be relative to the give=
n<br>
=C2=A0 =C2=A0/// working directory.<br>
-=C2=A0 void FixupRelativePath(SmallVectorImpl&lt;char&gt; &amp;path) const=
;<br>
+=C2=A0 /// \returns true if \c path changed.<br>
+=C2=A0 bool FixupRelativePath(SmallVectorImpl&lt;char&gt; &amp;path) const=
;<br>
+<br>
+=C2=A0 /// Makes \c Path absolute taking into account FileSystemOptions an=
d the<br>
+=C2=A0 /// working directory option.<br>
+=C2=A0 /// \returns true if \c Path changed to absolute.<br>
+=C2=A0 bool makeAbsolutePath(SmallVectorImpl&lt;char&gt; &amp;Path) const;=
<br>
<br>
=C2=A0 =C2=A0/// \brief Produce an array mapping from the unique IDs assign=
ed to each<br>
=C2=A0 =C2=A0/// file to the corresponding FileEntry pointer.<br>
<br>
Modified: cfe/trunk/lib/Basic/FileManager.cpp<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_lib_Basic_FileManager.cpp-3Frev-3D24371=
8-26r1-3D243717-26r2-3D243718-26view-3Ddiff&d=3DAwMFaQ&c=3D8hUWFZcy2Z-Za5rB=
PlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D8prpeY8zE-FlbXUP=
r4nwuIQDcr6evtVSB_NNxVOGQIw&s=3DOdbf202qdUcQK3bIIKSAIzZ2-xnlYfDpKUrmoGgp0Js=
&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/llvm-pro=
ject/cfe/trunk/lib/Basic/FileManager.cpp?rev=3D243718&amp;r1=3D243717&amp;r=
2=3D243718&amp;view=3Ddiff</a><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/lib/Basic/FileManager.cpp (original)<br>
+++ cfe/trunk/lib/Basic/FileManager.cpp Thu Jul 30 19:58:32 2015<br>
@@ -389,16 +389,28 @@ FileManager::getVirtualFile(StringRef Fi<br>
=C2=A0 =C2=A0return UFE;<br>
=C2=A0}<br>
<br>
-void FileManager::FixupRelativePath(SmallVectorImpl&lt;char&gt; &amp;path)=
 const {<br>
+bool FileManager::FixupRelativePath(SmallVectorImpl&lt;char&gt; &amp;path)=
 const {<br>
=C2=A0 =C2=A0StringRef pathRef(path.data(), path.size());<br>
<br>
=C2=A0 =C2=A0if (FileSystemOpts.WorkingDir.empty()<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0|| llvm::sys::path::is_absolute(pathRef))<br>
-=C2=A0 =C2=A0 return;<br>
+=C2=A0 =C2=A0 return false;<br>
<br>
=C2=A0 =C2=A0SmallString&lt;128&gt; NewPath(FileSystemOpts.WorkingDir);<br>
=C2=A0 =C2=A0llvm::sys::path::append(NewPath, pathRef);<br>
=C2=A0 =C2=A0path =3D NewPath;<br>
+=C2=A0 return true;<br>
+}<br>
+<br>
+bool FileManager::makeAbsolutePath(SmallVectorImpl&lt;char&gt; &amp;Path) =
const {<br>
+=C2=A0 bool Changed =3D FixupRelativePath(Path);<br>
+<br>
+=C2=A0 if (!llvm::sys::path::is_absolute(StringRef(Path.data(), Path.size(=
)))) {<br>
+=C2=A0 =C2=A0 llvm::sys::fs::make_absolute(Path);<br>
+=C2=A0 =C2=A0 Changed =3D true;<br>
+=C2=A0 }<br>
+<br>
+=C2=A0 return Changed;<br>
=C2=A0}<br>
<br>
=C2=A0llvm::ErrorOr&lt;std::unique_ptr&lt;llvm::MemoryBuffer&gt;&gt;<br>
<br>
Modified: cfe/trunk/lib/Serialization/ASTWriter.cpp<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_lib_Serialization_ASTWriter.cpp-3Frev-3=
D243718-26r1-3D243717-26r2-3D243718-26view-3Ddiff&d=3DAwMFaQ&c=3D8hUWFZcy2Z=
-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D8prpeY8zE-=
FlbXUPr4nwuIQDcr6evtVSB_NNxVOGQIw&s=3DveoePDCGGJLdADwp8OEzG9MSpqmMuoDzqryVT=
2RrlP8&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/ll=
vm-project/cfe/trunk/lib/Serialization/ASTWriter.cpp?rev=3D243718&amp;r1=3D=
243717&amp;r2=3D243718&amp;view=3Ddiff</a><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/lib/Serialization/ASTWriter.cpp (original)<br>
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp Thu Jul 30 19:58:32 2015<br>
@@ -1074,14 +1074,7 @@ void ASTWriter::WriteBlockInfoBlock() {<br>
=C2=A0/// \return \c true if the path was changed.<br>
=C2=A0static bool cleanPathForOutput(FileManager &amp;FileMgr,<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=
=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 SmallVectorImpl&lt;char&gt; &amp;Pat=
h) {<br>
-=C2=A0 bool Changed =3D false;<br>
-<br>
-=C2=A0 if (!llvm::sys::path::is_absolute(StringRef(Path.data(), Path.size(=
)))) {<br>
-=C2=A0 =C2=A0 llvm::sys::fs::make_absolute(Path);<br>
-=C2=A0 =C2=A0 Changed =3D true;<br>
-=C2=A0 }<br>
-<br>
-=C2=A0 return Changed | FileMgr.removeDotPaths(Path);<br>
+=C2=A0 return FileMgr.makeAbsolutePath(Path) | FileMgr.removeDotPaths(Path=
);<br></blockquote><div><br></div><div>These two operations are unsequenced=
, and I suspect the order in which they&#39;re performed matters...</div><d=
iv>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex=
;border-left:1px #ccc solid;padding-left:1ex">
=C2=A0}<br>
<br>
=C2=A0/// \brief Adjusts the given filename to only write out the portion o=
f the<br>
@@ -1429,7 +1422,7 @@ void ASTWriter::WriteControlBlock(Prepro<br>
<br>
=C2=A0 =C2=A0 =C2=A0SmallString&lt;128&gt; OutputPath(OutputFile);<br>
<br>
-=C2=A0 =C2=A0 llvm::sys::fs::make_absolute(OutputPath);<br>
+=C2=A0 =C2=A0 SM.getFileManager().makeAbsolutePath(OutputPath);<br>
=C2=A0 =C2=A0 =C2=A0StringRef origDir =3D llvm::sys::path::parent_path(Outp=
utPath);<br>
<br>
=C2=A0 =C2=A0 =C2=A0RecordData Record;<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Header=
s/Test.h<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_Inputs_working-2Ddir-2Dtes=
t_Test.framework_Headers_Test.h-3Frev-3D243718-26view-3Dauto&d=3DAwMFaQ&c=
=3D8hUWFZcy2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=
=3D8prpeY8zE-FlbXUPr4nwuIQDcr6evtVSB_NNxVOGQIw&s=3DUmb92o_ULXEn0v6kv5zMu9n2=
d_OpIjVb2HatTUGUhqA&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.=
org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/working-dir-test/Test=
.framework/Headers/Test.h?rev=3D243718&amp;view=3Dauto</a><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/T=
est.h (added)<br>
+++ cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Headers/T=
est.h Thu Jul 30 19:58:32 2015<br>
@@ -0,0 +1 @@<br>
+void test_me_call(void);<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Module=
s/module.modulemap<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_Inputs_working-2Ddir-2Dtes=
t_Test.framework_Modules_module.modulemap-3Frev-3D243718-26view-3Dauto&d=3D=
AwMFaQ&c=3D8hUWFZcy2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREe=
q0cCxk&m=3D8prpeY8zE-FlbXUPr4nwuIQDcr6evtVSB_NNxVOGQIw&s=3D6pAQfHUxT6OnIRwt=
6Jd9k6EhTKW6U0rvy1F2vR5l9ck&e=3D" rel=3D"noreferrer" target=3D"_blank">http=
://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/working-dir-t=
est/Test.framework/Modules/module.modulemap?rev=3D243718&amp;view=3Dauto</a=
><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/m=
odule.modulemap (added)<br>
+++ cfe/trunk/test/Modules/Inputs/working-dir-test/Test.framework/Modules/m=
odule.modulemap Thu Jul 30 19:58:32 2015<br>
@@ -0,0 +1,6 @@<br>
+framework module Test {<br>
+=C2=A0 umbrella header &quot;Test.h&quot;<br>
+<br>
+=C2=A0 export *<br>
+=C2=A0 module * { export * }<br>
+}<br>
<br>
Added: cfe/trunk/test/Modules/working-dir-flag.m<br>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_working-2Ddir-2Dflag.m-3Fr=
ev-3D243718-26view-3Dauto&d=3DAwMFaQ&c=3D8hUWFZcy2Z-Za5rBPlktOQ&r=3DBSqEv9K=
vKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D8prpeY8zE-FlbXUPr4nwuIQDcr6evtVSB_=
NNxVOGQIw&s=3DMxzwAzM1mIcJmsLrTzuar6C4Yn4ruuH3CBPwQmcaq94&e=3D" rel=3D"nore=
ferrer" target=3D"_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/tes=
t/Modules/working-dir-flag.m?rev=3D243718&amp;view=3Dauto</a><br>
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D<br>
--- cfe/trunk/test/Modules/working-dir-flag.m (added)<br>
+++ cfe/trunk/test/Modules/working-dir-flag.m Thu Jul 30 19:58:32 2015<br>
@@ -0,0 +1,9 @@<br>
+// RUN: rm -rf %t.mcp<br>
+// RUN: %clang_cc1 -fmodules-cache-path=3D%t.mcp -fmodules -fimplicit-modu=
le-maps -F . -working-directory=3D%S/Inputs/working-dir-test %s -verify<br>
+// expected-no-diagnostics<br>
+<br>
+@import Test;<br>
+<br>
+void foo() {<br>
+=C2=A0 test_me_call();<br>
+}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href=3D"mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href=3D"http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" rel=3D"no=
referrer" target=3D"_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-c=
ommits</a><br>
</blockquote></div><br></div></div>

--bcaec5196aab98e5c2051c21676c--

--===============4948634871667098473==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
cfe-commits mailing list
cfe-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits

--===============4948634871667098473==--