From cfe-commits  Thu Jul 30 01:39:24 2015
From: Richard Smith <richard () metafoo ! co ! uk>
Date: Thu, 30 Jul 2015 01:39:24 +0000
To: cfe-commits
Subject: Re: r243597 - Avoid failure to canonicalize '..'.
Message-Id: <CAOfiQqkJbk2Nyggu2XygLu+tEvUC4ikPgHoxObO4X4R6hfHrDA () mail ! gmail ! com>
X-MARC-Message: https://marc.info/?l=cfe-commits&m=143822070500784
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--===============1823845955485480542=="

--===============1823845955485480542==
Content-Type: multipart/alternative; boundary=bcaec548a05ff63270051c0dc5c4

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

On Wed, Jul 29, 2015 at 6:27 PM, Sean Silva <chisophugis@gmail.com> wrote:

> On Wed, Jul 29, 2015 at 6:16 PM, Richard Smith <richard@metafoo.co.uk>
> wrote:
>
>> On Wed, Jul 29, 2015 at 6:13 PM, Sean Silva <chisophugis@gmail.com>
>> wrote:
>>
>>> On Wed, Jul 29, 2015 at 6:11 PM, Richard Smith <richard@metafoo.co.uk>
>>> wrote:
>>>
>>>> On Wed, Jul 29, 2015 at 5:26 PM, Sean Silva <chisophugis@gmail.com>
>>>> wrote:
>>>>
>>>>> Author: silvas
>>>>> Date: Wed Jul 29 19:26:34 2015
>>>>> New Revision: 243597
>>>>>
>>>>> URL: http://llvm.org/viewvc/llvm-project?rev=243597&view=rev
>>>>> Log:
>>>>> Avoid failure to canonicalize '..'.
>>>>>
>>>>> Also fix completely broken and untested code which was hiding the
>>>>> primary bug. The !LLVM_ON_UNIX branch of the ifdef was actually a
>>>>> no-op.
>>>>>
>>>>> I ran into this in the wild. It was causing failures in our SDK build.
>>>>>
>>>>> Ideally we'd have a perfect llvm::sys::fs::canonical, but at least this
>>>>> is a step in the right direction, and fixes an obviously broken case.
>>>>> In some sense the test case I've added here is an integration test. We
>>>>> should have these routines thoroughly unit tested in llvm::sys::fs.
>>>>>
>>>>
>>>> This may be correct for the !LLVM_ON_UNIX case (I'm not sure whether
>>>> the path foo/bar/.. is always the same as foo on Windows), but it's wrong
>>>> for the LLVM_ON_UNIX case. Please revert (except for the bugfix in
>>>> getCanonicalName); the right fix is to fix the places that are introducing
>>>> the unwanted .. path components.
>>>>
>>>
>>> I ran into this in the wild where they came from users.
>>>
>>
>> So why do you want to remove them? (Note: I'm OK with removing blah/..
>> components on Windows, if indeed that is a correct thing to do there. But
>> I'm not OK with it on Unix-like systems, where it's not correct in
>> general.) Which of the three callers of this function did you need this
>> change for?
>>
>
> As of r243600 we should only be hitting the '..' part of this in the
> !LLVM_ON_UNIX branch.
>

Thank you, that seems fine to me.


> -- Sean Silva
>
>
>>
>>
>>> -- Sean Silva
>>>
>>>
>>>>
>>>> Added:
>>>>>     cfe/trunk/test/Modules/Inputs/module-map-path-hash/
>>>>>     cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h
>>>>>     cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap
>>>>>     cfe/trunk/test/Modules/module-map-path-hash.cpp
>>>>> Modified:
>>>>>     cfe/trunk/lib/Basic/FileManager.cpp
>>>>>
>>>>> Modified: cfe/trunk/lib/Basic/FileManager.cpp
>>>>> URL:
>>>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/FileManager.cpp?rev=243597&r1=243596&r2=243597&view=diff
>>>>>
>>>>>
>>>>> ==============================================================================
>>>>> --- cfe/trunk/lib/Basic/FileManager.cpp (original)
>>>>> +++ cfe/trunk/lib/Basic/FileManager.cpp Wed Jul 29 19:26:34 2015
>>>>> @@ -514,7 +514,7 @@ void FileManager::modifyFileEntry(FileEn
>>>>>    File->ModTime = ModificationTime;
>>>>>  }
>>>>>
>>>>> -/// Remove '.' path components from the given absolute path.
>>>>> +/// Remove '.' and '..' path components from the given absolute path.
>>>>>  /// \return \c true if any changes were made.
>>>>>  // FIXME: Move this to llvm::sys::path.
>>>>>  bool FileManager::removeDotPaths(SmallVectorImpl<char> &Path) {
>>>>> @@ -525,24 +525,24 @@ bool FileManager::removeDotPaths(SmallVe
>>>>>
>>>>>    // Skip the root path, then look for traversal in the components.
>>>>>    StringRef Rel = path::relative_path(P);
>>>>> -  bool AnyDots = false;
>>>>>    for (StringRef C : llvm::make_range(path::begin(Rel),
>>>>> path::end(Rel))) {
>>>>> -    if (C == ".") {
>>>>> -      AnyDots = true;
>>>>> +    if (C == ".")
>>>>> +      continue;
>>>>> +    if (C == "..") {
>>>>> +      if (!ComponentStack.empty())
>>>>> +        ComponentStack.pop_back();
>>>>>        continue;
>>>>>      }
>>>>>      ComponentStack.push_back(C);
>>>>>    }
>>>>>
>>>>> -  if (!AnyDots)
>>>>> -    return false;
>>>>> -
>>>>>    SmallString<256> Buffer = path::root_path(P);
>>>>>    for (StringRef C : ComponentStack)
>>>>>      path::append(Buffer, C);
>>>>>
>>>>> +  bool Changed = (Path != Buffer);
>>>>>    Path.swap(Buffer);
>>>>> -  return true;
>>>>> +  return Changed;
>>>>>  }
>>>>>
>>>>>  StringRef FileManager::getCanonicalName(const DirectoryEntry *Dir) {
>>>>> @@ -567,6 +567,9 @@ StringRef FileManager::getCanonicalName(
>>>>>    llvm::sys::fs::make_absolute(CanonicalNameBuf);
>>>>>    llvm::sys::path::native(CanonicalNameBuf);
>>>>>    removeDotPaths(CanonicalNameBuf);
>>>>> +  char *Mem =
>>>>> CanonicalNameStorage.Allocate<char>(CanonicalNameBuf.size());
>>>>> +  memcpy(Mem, CanonicalNameBuf.data(), CanonicalNameBuf.size());
>>>>> +  CanonicalName = StringRef(Mem, CanonicalNameBuf.size());
>>>>>  #endif
>>>>>
>>>>>    CanonicalDirNames.insert(std::make_pair(Dir, CanonicalName));
>>>>>
>>>>> Added: cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h
>>>>> URL:
>>>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h?rev=243597&view=auto
>>>>>
>>>>> ==============================================================================
>>>>> --- cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h (added)
>>>>> +++ cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h Wed Jul 29
>>>>> 19:26:34 2015
>>>>> @@ -0,0 +1,2 @@
>>>>> +#pragma once
>>>>> +int a = 42;
>>>>>
>>>>> Added:
>>>>> cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap
>>>>> URL:
>>>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap?rev=243597&view=auto
>>>>>
>>>>> ==============================================================================
>>>>> ---
>>>>> cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap (added)
>>>>> +++
>>>>> cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap Wed Jul
>>>>> 29 19:26:34 2015
>>>>> @@ -0,0 +1,3 @@
>>>>> +module a {
>>>>> +  header "a.h"
>>>>> +}
>>>>>
>>>>> Added: cfe/trunk/test/Modules/module-map-path-hash.cpp
>>>>> URL:
>>>>> http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/module-map-path-hash.cpp?rev=243597&view=auto
>>>>>
>>>>> ==============================================================================
>>>>> --- cfe/trunk/test/Modules/module-map-path-hash.cpp (added)
>>>>> +++ cfe/trunk/test/Modules/module-map-path-hash.cpp Wed Jul 29
>>>>> 19:26:34 2015
>>>>> @@ -0,0 +1,9 @@
>>>>> +// rm -rf %t
>>>>> +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++
>>>>> -Rmodule-build -I%S/Inputs/module-map-path-hash -fmodules-cache-path=%t
>>>>> -fsyntax-only %s
>>>>> +// xUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++
>>>>> -Rmodule-build -I%S/Inputs//module-map-path-hash -fmodules-cache-path=%t
>>>>> -fsyntax-only %s 2>&1 | FileCheck -allow-empty %s
>>>>> +// xUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++
>>>>> -Rmodule-build -I%S/Inputs/./module-map-path-hash -fmodules-cache-path=%t
>>>>> -fsyntax-only %s 2>&1 | FileCheck -allow-empty %s
>>>>>
>>>>
>>>> Did you mean to commit with disabled RUN lines here?
>>>>
>>>>
>>>>> +// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++
>>>>> -Rmodule-build -I%S/Inputs/../Inputs/module-map-path-hash
>>>>> -fmodules-cache-path=%t -fsyntax-only %s 2>&1 | FileCheck -allow-empty %s
>>>>> +
>>>>> +#include "a.h"
>>>>> +
>>>>> +// CHECK-NOT: remark: building module
>>>>>
>>>>>
>>>>> _______________________________________________
>>>>> cfe-commits mailing list
>>>>> cfe-commits@cs.uiuc.edu
>>>>> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>>>>>
>>>>
>>>>
>>>
>>
>

--bcaec548a05ff63270051c0dc5c4
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 W=
ed, Jul 29, 2015 at 6:27 PM, Sean Silva <span dir=3D"ltr">&lt;<a href=3D"ma=
ilto:chisophugis@gmail.com" target=3D"_blank">chisophugis@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"><div dir=3D"ltr"><div clas=
s=3D"gmail_extra"><div class=3D"gmail_quote"><span class=3D"">On Wed, Jul 2=
9, 2015 at 6:16 PM, Richard Smith <span dir=3D"ltr">&lt;<a href=3D"mailto:r=
ichard@metafoo.co.uk" target=3D"_blank">richard@metafoo.co.uk</a>&gt;</span=
> wrote:<br><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;bo=
rder-left:1px #ccc solid;padding-left:1ex"><div dir=3D"ltr"><div class=3D"g=
mail_extra"><div class=3D"gmail_quote"><span>On Wed, Jul 29, 2015 at 6:13 P=
M, Sean Silva <span dir=3D"ltr">&lt;<a href=3D"mailto:chisophugis@gmail.com=
" target=3D"_blank">chisophugis@gmail.com</a>&gt;</span> wrote:<br><blockqu=
ote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc s=
olid;padding-left:1ex"><div dir=3D"ltr"><div class=3D"gmail_extra"><div cla=
ss=3D"gmail_quote"><span>On Wed, Jul 29, 2015 at 6:11 PM, Richard Smith <sp=
an dir=3D"ltr">&lt;<a href=3D"mailto:richard@metafoo.co.uk" target=3D"_blan=
k">richard@metafoo.co.uk</a>&gt;</span> wrote:<br><blockquote class=3D"gmai=
l_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left=
:1ex"><div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gmail_quote=
"><span>On Wed, Jul 29, 2015 at 5:26 PM, Sean Silva <span dir=3D"ltr">&lt;<=
a href=3D"mailto:chisophugis@gmail.com" target=3D"_blank">chisophugis@gmail=
.com</a>&gt;</span> wrote:<br></span><blockquote class=3D"gmail_quote" styl=
e=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span>A=
uthor: silvas<br>
Date: Wed Jul 29 19:26:34 2015<br>
New Revision: 243597<br>
<br></span>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject-3Frev-3D243597-26view-3Drev&d=3DAwMFaQ&c=3D8hUWFZ=
cy2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D-ET7tl=
RyVDe2GbcpyL5hYQeTa1Se4pFCuLiia-EcZZw&s=3DI5UJWSTDPw_ok-EYPPSq16qNULZsv-I9K=
oAIi86glA0&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewv=
c/llvm-project?rev=3D243597&amp;view=3Drev</a><span><br>
Log:<br>
Avoid failure to canonicalize &#39;..&#39;.<br>
<br>
Also fix completely broken and untested code which was hiding the<br>
primary bug. The !LLVM_ON_UNIX branch of the ifdef was actually a no-op.<br>
<br>
I ran into this in the wild. It was causing failures in our SDK build.<br>
<br>
Ideally we&#39;d have a perfect llvm::sys::fs::canonical, but at least this=
<br>
is a step in the right direction, and fixes an obviously broken case.<br>
In some sense the test case I&#39;ve added here is an integration test. We<=
br>
should have these routines thoroughly unit tested in llvm::sys::fs.<br></sp=
an></blockquote><div><br></div><div>This may be correct for the !LLVM_ON_UN=
IX case (I&#39;m not sure whether the path foo/bar/.. is always the same as=
 foo on Windows), but it&#39;s wrong for the LLVM_ON_UNIX case. Please reve=
rt (except for the bugfix in getCanonicalName); the right fix is to fix the=
 places that are introducing the unwanted .. path components.</div></div></=
div></div></blockquote><div><br></div></span><div>I ran into this in the wi=
ld where they came from users.</div></div></div></div></blockquote><div><br=
></div></span><div>So why do you want to remove them? (Note: I&#39;m OK wit=
h removing blah/.. components on Windows, if indeed that is a correct thing=
 to do there. But I&#39;m not OK with it on Unix-like systems, where it&#39=
;s not correct in general.) Which of the three callers of this function did=
 you need this change for?</div></div></div></div></blockquote><div><br></d=
iv></span><div>As of r243600 we should only be hitting the &#39;..&#39; par=
t of this in the !LLVM_ON_UNIX branch.</div></div></div></div></blockquote>=
<div><br></div><div>Thank you, that seems fine to me.</div><div>=C2=A0</div=
><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1=
px #ccc solid;padding-left:1ex"><div dir=3D"ltr"><div class=3D"gmail_extra"=
><div class=3D"gmail_quote"><span class=3D"HOEnZb"><font color=3D"#888888">=
<div>-- Sean Silva</div></font></span><div><div class=3D"h5"><div>=C2=A0</d=
iv><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left=
:1px #ccc solid;padding-left:1ex"><div dir=3D"ltr"><div class=3D"gmail_extr=
a"><div class=3D"gmail_quote"><div><div><div>=C2=A0</div><blockquote class=
=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #ccc solid;padd=
ing-left:1ex"><div dir=3D"ltr"><div class=3D"gmail_extra"><div class=3D"gma=
il_quote"><span><font color=3D"#888888"><div>-- Sean Silva</div></font></sp=
an><div><div><div>=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"ma=
rgin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir=3D"lt=
r"><div class=3D"gmail_extra"><div class=3D"gmail_quote"><div><br></div><bl=
ockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;border-left:1px #=
ccc solid;padding-left:1ex"><span>
Added:<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/module-map-path-hash/<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.mod=
ulemap<br>
=C2=A0 =C2=A0 cfe/trunk/test/Modules/module-map-path-hash.cpp<br>
Modified:<br>
=C2=A0 =C2=A0 cfe/trunk/lib/Basic/FileManager.cpp<br>
<br>
Modified: cfe/trunk/lib/Basic/FileManager.cpp<br></span>
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-3D24359=
7-26r1-3D243596-26r2-3D243597-26view-3Ddiff&d=3DAwMFaQ&c=3D8hUWFZcy2Z-Za5rB=
PlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D-ET7tlRyVDe2Gbcp=
yL5hYQeTa1Se4pFCuLiia-EcZZw&s=3D9Fo-cRKQTFjiEdSfZ04gvjyJkH7EprCBwl5gidBaxpw=
&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/llvm-pro=
ject/cfe/trunk/lib/Basic/FileManager.cpp?rev=3D243597&amp;r1=3D243596&amp;r=
2=3D243597&amp;view=3Ddiff</a><div><div><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 Wed Jul 29 19:26:34 2015<br>
@@ -514,7 +514,7 @@ void FileManager::modifyFileEntry(FileEn<br>
=C2=A0 =C2=A0File-&gt;ModTime =3D ModificationTime;<br>
=C2=A0}<br>
<br>
-/// Remove &#39;.&#39; path components from the given absolute path.<br>
+/// Remove &#39;.&#39; and &#39;..&#39; path components from the given abs=
olute path.<br>
=C2=A0/// \return \c true if any changes were made.<br>
=C2=A0// FIXME: Move this to llvm::sys::path.<br>
=C2=A0bool FileManager::removeDotPaths(SmallVectorImpl&lt;char&gt; &amp;Pat=
h) {<br>
@@ -525,24 +525,24 @@ bool FileManager::removeDotPaths(SmallVe<br>
<br>
=C2=A0 =C2=A0// Skip the root path, then look for traversal in the componen=
ts.<br>
=C2=A0 =C2=A0StringRef Rel =3D path::relative_path(P);<br>
-=C2=A0 bool AnyDots =3D false;<br>
=C2=A0 =C2=A0for (StringRef C : llvm::make_range(path::begin(Rel), path::en=
d(Rel))) {<br>
-=C2=A0 =C2=A0 if (C =3D=3D &quot;.&quot;) {<br>
-=C2=A0 =C2=A0 =C2=A0 AnyDots =3D true;<br>
+=C2=A0 =C2=A0 if (C =3D=3D &quot;.&quot;)<br>
+=C2=A0 =C2=A0 =C2=A0 continue;<br>
+=C2=A0 =C2=A0 if (C =3D=3D &quot;..&quot;) {<br>
+=C2=A0 =C2=A0 =C2=A0 if (!ComponentStack.empty())<br>
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 ComponentStack.pop_back();<br>
=C2=A0 =C2=A0 =C2=A0 =C2=A0continue;<br>
=C2=A0 =C2=A0 =C2=A0}<br>
=C2=A0 =C2=A0 =C2=A0ComponentStack.push_back(C);<br>
=C2=A0 =C2=A0}<br>
<br>
-=C2=A0 if (!AnyDots)<br>
-=C2=A0 =C2=A0 return false;<br>
-<br>
=C2=A0 =C2=A0SmallString&lt;256&gt; Buffer =3D path::root_path(P);<br>
=C2=A0 =C2=A0for (StringRef C : ComponentStack)<br>
=C2=A0 =C2=A0 =C2=A0path::append(Buffer, C);<br>
<br>
+=C2=A0 bool Changed =3D (Path !=3D Buffer);<br>
=C2=A0 =C2=A0Path.swap(Buffer);<br>
-=C2=A0 return true;<br>
+=C2=A0 return Changed;<br>
=C2=A0}<br>
<br>
=C2=A0StringRef FileManager::getCanonicalName(const DirectoryEntry *Dir) {<=
br>
@@ -567,6 +567,9 @@ StringRef FileManager::getCanonicalName(<br>
=C2=A0 =C2=A0llvm::sys::fs::make_absolute(CanonicalNameBuf);<br>
=C2=A0 =C2=A0llvm::sys::path::native(CanonicalNameBuf);<br>
=C2=A0 =C2=A0removeDotPaths(CanonicalNameBuf);<br>
+=C2=A0 char *Mem =3D CanonicalNameStorage.Allocate&lt;char&gt;(CanonicalNa=
meBuf.size());<br>
+=C2=A0 memcpy(Mem, CanonicalNameBuf.data(), CanonicalNameBuf.size());<br>
+=C2=A0 CanonicalName =3D StringRef(Mem, CanonicalNameBuf.size());<br>
=C2=A0#endif<br>
<br>
=C2=A0 =C2=A0CanonicalDirNames.insert(std::make_pair(Dir, CanonicalName));<=
br>
<br>
Added: cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h<br></div></di=
v>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_Inputs_module-2Dmap-2Dpath=
-2Dhash_a.h-3Frev-3D243597-26view-3Dauto&d=3DAwMFaQ&c=3D8hUWFZcy2Z-Za5rBPlk=
tOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D-ET7tlRyVDe2GbcpyL5=
hYQeTa1Se4pFCuLiia-EcZZw&s=3DhdK5p338YTPrNy8mQGxvrGkMsdS0wByH-5B1ziPZItE&e=
=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/llvm-proje=
ct/cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h?rev=3D243597&amp;=
view=3Dauto</a><span><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/module-map-path-hash/a.h (added)<br>
+++ cfe/trunk/test/Modules/Inputs/module-map-path-hash/a.h Wed Jul 29 19:26=
:34 2015<br>
@@ -0,0 +1,2 @@<br>
+#pragma once<br>
+int a =3D 42;<br>
<br>
Added: cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap<=
br></span>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_Inputs_module-2Dmap-2Dpath=
-2Dhash_module.modulemap-3Frev-3D243597-26view-3Dauto&d=3DAwMFaQ&c=3D8hUWFZ=
cy2Z-Za5rBPlktOQ&r=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D-ET7tl=
RyVDe2GbcpyL5hYQeTa1Se4pFCuLiia-EcZZw&s=3DPAzwUXWNQUze5CwMSDpJ5lIOqKmpVUZv7=
WbKywUHuJk&e=3D" rel=3D"noreferrer" target=3D"_blank">http://llvm.org/viewv=
c/llvm-project/cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.mo=
dulemap?rev=3D243597&amp;view=3Dauto</a><span><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/module-map-path-hash/module.modulemap (ad=
ded)<br>
+++ cfe/trunk/test/Modules/Inputs/module-map-path-hash/module.modulemap Wed=
 Jul 29 19:26:34 2015<br>
@@ -0,0 +1,3 @@<br>
+module a {<br>
+=C2=A0 header &quot;a.h&quot;<br>
+}<br>
<br>
Added: cfe/trunk/test/Modules/module-map-path-hash.cpp<br></span>
URL: <a href=3D"https://urldefense.proofpoint.com/v2/url?u=3Dhttp-3A__llvm.=
org_viewvc_llvm-2Dproject_cfe_trunk_test_Modules_module-2Dmap-2Dpath-2Dhash=
.cpp-3Frev-3D243597-26view-3Dauto&d=3DAwMFaQ&c=3D8hUWFZcy2Z-Za5rBPlktOQ&r=
=3DBSqEv9KvKMW_Ob8SyngJ70KdZISM_ASROnREeq0cCxk&m=3D-ET7tlRyVDe2GbcpyL5hYQeT=
a1Se4pFCuLiia-EcZZw&s=3D7FAgG_yKaay2IYSh6t2CQJpaogWZQByw2WYJs22Jsvc&e=3D" r=
el=3D"noreferrer" target=3D"_blank">http://llvm.org/viewvc/llvm-project/cfe=
/trunk/test/Modules/module-map-path-hash.cpp?rev=3D243597&amp;view=3Dauto</=
a><span><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/module-map-path-hash.cpp (added)<br>
+++ cfe/trunk/test/Modules/module-map-path-hash.cpp Wed Jul 29 19:26:34 201=
5<br>
@@ -0,0 +1,9 @@<br>
+// rm -rf %t<br>
+// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -Rmodule-build =
-I%S/Inputs/module-map-path-hash -fmodules-cache-path=3D%t -fsyntax-only %s=
<br>
+// xUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -Rmodule-build =
-I%S/Inputs//module-map-path-hash -fmodules-cache-path=3D%t -fsyntax-only %=
s 2&gt;&amp;1 | FileCheck -allow-empty %s<br>
+// xUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -Rmodule-build =
-I%S/Inputs/./module-map-path-hash -fmodules-cache-path=3D%t -fsyntax-only =
%s 2&gt;&amp;1 | FileCheck -allow-empty %s<br></span></blockquote><div><br>=
</div><div>Did you mean to commit with disabled RUN lines here?</div><div>=
=C2=A0</div><blockquote class=3D"gmail_quote" style=3D"margin:0 0 0 .8ex;bo=
rder-left:1px #ccc solid;padding-left:1ex"><span>
+// RUN: %clang_cc1 -fmodules -fimplicit-module-maps -x c++ -Rmodule-build =
-I%S/Inputs/../Inputs/module-map-path-hash -fmodules-cache-path=3D%t -fsynt=
ax-only %s 2&gt;&amp;1 | FileCheck -allow-empty %s<br>
+<br>
+#include &quot;a.h&quot;<br>
+<br>
+// CHECK-NOT: remark: building module<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
</span><a href=3D"mailto:cfe-commits@cs.uiuc.edu" target=3D"_blank">cfe-com=
mits@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>
</blockquote></div></div></div><br></div></div>
</blockquote></div></div></div><br></div></div>
</blockquote></div></div></div><br></div></div>
</blockquote></div><br></div></div>

--bcaec548a05ff63270051c0dc5c4--

--===============1823845955485480542==
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

--===============1823845955485480542==--