[clang] fix linker executable path in test

[ashay-github]

Summary

A previous patch (https://reviews.llvm.org/D132810) introduced a test
that fails on systems where the linker executable (ld) has a .exe
extension. This patch updates the regex in the test so that lit can
look for both ld as well as ld.exe.

[alvinhochun]

Ah sorry about that, I didn't realize the command includes .exe on Windows. (For the record, ld" matches both ld and ld.lld.)

clang/test/Driver/mingw-cfguard.c

6

Literal dot needs to be escaped as \. in regex.

[mstorsjo]

In D133773#3786484, @alvinhochun wrote:

Ah sorry about that, I didn't realize the command includes .exe on Windows. (For the record, ld" matches both ld and ld.lld.)

No, iirc these quotes are checked as literal part of the matched string here; otherwise the pattern ld" would match ld.exe" too. So to match any linker name, I'd write ld{{.*}}" or maybe something like ld{{[\.a-z]*}}", modulo regex syntax.

[alvinhochun]

In D133773#3786602, @mstorsjo wrote:

In D133773#3786484, @alvinhochun wrote:

Ah sorry about that, I didn't realize the command includes .exe on Windows. (For the record, ld" matches both ld and ld.lld.)

No, iirc these quotes are checked as literal part of the matched string here; otherwise the pattern ld" would match ld.exe" too. So to match any linker name, I'd write ld{{.*}}" or maybe something like ld{{[\.a-z]*}}", modulo regex syntax.

Oops, I meant ld" and ld.lld", because both ends in ld".

[mstorsjo]

In D133773#3786611, @alvinhochun wrote:

In D133773#3786602, @mstorsjo wrote:

In D133773#3786484, @alvinhochun wrote:

Ah sorry about that, I didn't realize the command includes .exe on Windows. (For the record, ld" matches both ld and ld.lld.)

No, iirc these quotes are checked as literal part of the matched string here; otherwise the pattern ld" would match ld.exe" too. So to match any linker name, I'd write ld{{.*}}" or maybe something like ld{{[\.a-z]*}}", modulo regex syntax.

Oops, I meant ld" and ld.lld", because both ends in ld".

Oh, I see - that's very sneaky!

[ashay-github]

Thanks! I updated the regex to be ld{{.*}}".

[ashay-github]

Updated the regex to ld{{(.lld)?}}{{(.exe)?}}", so that it matches the
following sequences: ld", ld.lld", ld.exe", ld.lld.exe".

[ashay-github]

@alvinhochun @mstorsjo Let me know if you'd like to see more changes. With the new regex, the tests pass at my end as well as in the Phabricator CI.

[stella.stamenova]

LGTM

[alvinhochun]

The literal dots have not been escaped as \., but the current change works anyway and the chance of false positives here should be very low. I guess this is acceptable.

clang/test/Driver/mingw-cfguard.c

 // RUN: %clang --target=x86_64-w64-windows-gnu -### %s 2>&1 | FileCheck -check-prefixes=NO_CF,DEFAULT %s
 // RUN: %clang --target=x86_64-w64-windows-gnu -### %s -mguard=none 2>&1 | FileCheck -check-prefixes=NO_CF,GUARD_NONE %s
 // NO_CF: "-cc1"
 // NO_CF-NOT: "-cfguard"
 // NO_CF-NOT: "-cfguard-no-checks"
-// NO_CF-NEXT: ld"
+// NO_CF-NEXT: ld{{(.lld)?}}{{(.exe)?}}"
 // NO_CF-NOT: "--guard-cf"
 // DEFAULT-NOT: "--no-guard-cf"
 // GUARD_NONE-SAME: "--no-guard-cf"
 
 // RUN: %clang --target=x86_64-w64-windows-gnu -### %s -mguard=cf 2>&1 | FileCheck -check-prefix=GUARD_CF %s
 // GUARD_CF: "-cc1"
 // GUARD_CF-SAME: "-cfguard"
-// GUARD_CF-NEXT: ld"
+// GUARD_CF-NEXT: ld{{(.lld)?}}{{(.exe)?}}"
 // GUARD_CF-SAME: "--guard-cf"
 // GUARD_CF-NOT: "--no-guard-cf"
 
 // RUN: %clang --target=x86_64-w64-windows-gnu -### %s -mguard=cf-nochecks 2>&1 | FileCheck -check-prefix=GUARD_NOCHECKS %s
 // GUARD_NOCHECKS: "-cc1"
 // GUARD_NOCHECKS-NOT: "-cfguard"
 // GUARD_NOCHECKS-SAME: "-cfguard-no-checks"
 // GUARD_NOCHECKS-NOT: "-cfguard"
-// GUARD_NOCHECKS-NEXT: ld"
+// GUARD_NOCHECKS-NEXT: ld{{(.lld)?}}{{(.exe)?}}"
 // GUARD_NOCHECKS-SAME: "--guard-cf"
 // GUARD_NOCHECKS-NOT: "--no-guard-cf"
 
 // RUN: %clang --target=x86_64-w64-windows-gnu -### %s -mguard=xxx 2>&1 | FileCheck -check-prefix=GUARD_UNKNOWN %s
 // GUARD_UNKNOWN: error: unsupported argument 'xxx' to option '--mguard='