[PATCH] D58661: [llvm-cov] Fix llvm-cov on Windows and un-XFAIL test

[Reid Kleckner via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rCRT354840: [llvm-cov] Fix llvm-cov on Windows and un-XFAIL test (authored by rnk, committed by ).

Changed prior to commit:
  https://reviews.llvm.org/D58661?vs=188287&id=188292#toc

Repository:
  rCRT Compiler Runtime

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

https://reviews.llvm.org/D58661

Files:
  lib/profile/InstrProfilingPlatformWindows.c
  test/profile/instrprof-merging.cpp


Index: lib/profile/InstrProfilingPlatformWindows.c
===================================================================
--- lib/profile/InstrProfilingPlatformWindows.c
+++ lib/profile/InstrProfilingPlatformWindows.c
@@ -16,9 +16,9 @@
 #pragma comment(linker, "/MERGE:.lprfd=.data")
 #pragma comment(linker, "/MERGE:.lprfv=.data")
 #pragma comment(linker, "/MERGE:.lprfnd=.data")
-/* Merge read-only sections into .rdata. */
-#pragma comment(linker, "/MERGE:.lprfn=.rdata")
-#pragma comment(linker, "/MERGE:.lcovmap=.rdata")
+/* Do *NOT* merge .lprfn and .lcovmap into .rdata. llvm-cov must be able to find
+ * after the fact.
+ */
 
 /* Allocate read-only section bounds. */
 #pragma section(".lprfn$A", read)
Index: test/profile/instrprof-merging.cpp
===================================================================
--- test/profile/instrprof-merging.cpp
+++ test/profile/instrprof-merging.cpp
@@ -21,9 +21,6 @@
 //    and prefer it over others.) When only limited coverage information is
 //    available (just from one binary), don't try to guess any region counts.
 
-// FIXME: Fails with: "Failed to load coverage: No coverage data found"
-// XFAIL: windows
-
 struct A {
   A() {}    // V1: [[@LINE]]{{ *}}|{{ *}}1
             // V1-ONLY: [[@LINE+1]]{{ *}}|{{ *}}|


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58661.188292.patch
Type: text/x-patch
Size: 1274 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190226/386b4eaf/attachment.bin>