[PATCH] D111579: [clang] Fix DIFile directory root on Windows

[Martin Storsjö via Phabricator via cfe-commits]

mstorsjo added inline comments.


================
Comment at: clang/test/CodeGen/debug-prefix-map.c:24
+// CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: "{{/|C:\\\\}}UNLIKELY_PATH{{/|\\\\}}empty{{/|\\\\}}{{.*}}",
+// CHECK-NO-MAIN-FILE-NAME-SAME:    directory: "")
+// CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: "{{/|C:\\\\}}UNLIKELY_PATH{{/|\\\\}}empty{{/|\\\\}}Inputs{{/|\\\\}}stdio.h",
----------------
keith wrote:
> keith wrote:
> > mstorsjo wrote:
> > > I presume that this patch goes on top of D111457? It might be good to set that one as the parent revision of this one, so that the premerge test runs applies them on top of each other (right now, this one failed to apply).
> > > 
> > > Isn't this particular change present (`directory` being `""` here) already after the previous patch?
> > > 
> > > 
> > That is marked as the parent of this patch in phab, but maybe I need to do something else to get them to apply?
> > Isn't this particular change present (directory being "" here) already after the previous patch?
> 
> This does still require this change since otherwise directory still gets `C:`
> 
> 
Hmm, it seems like the premerge testing managed to start running this before the parent was set (and I didn't notice it when I looked at the patches the last round). If you reupload the patch later when this already is set, I think it should work though - but no hurry with that right now.


================
Comment at: clang/test/CodeGen/debug-prefix-map.c:24
+// CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: "{{/|C:\\\\}}UNLIKELY_PATH{{/|\\\\}}empty{{/|\\\\}}{{.*}}",
+// CHECK-NO-MAIN-FILE-NAME-SAME:    directory: "")
+// CHECK-NO-MAIN-FILE-NAME: !DIFile(filename: "{{/|C:\\\\}}UNLIKELY_PATH{{/|\\\\}}empty{{/|\\\\}}Inputs{{/|\\\\}}stdio.h",
----------------
mstorsjo wrote:
> keith wrote:
> > keith wrote:
> > > mstorsjo wrote:
> > > > I presume that this patch goes on top of D111457? It might be good to set that one as the parent revision of this one, so that the premerge test runs applies them on top of each other (right now, this one failed to apply).
> > > > 
> > > > Isn't this particular change present (`directory` being `""` here) already after the previous patch?
> > > > 
> > > > 
> > > That is marked as the parent of this patch in phab, but maybe I need to do something else to get them to apply?
> > > Isn't this particular change present (directory being "" here) already after the previous patch?
> > 
> > This does still require this change since otherwise directory still gets `C:`
> > 
> > 
> Hmm, it seems like the premerge testing managed to start running this before the parent was set (and I didn't notice it when I looked at the patches the last round). If you reupload the patch later when this already is set, I think it should work though - but no hurry with that right now.
Oh, ok.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D111579/new/

https://reviews.llvm.org/D111579