[compiler-rt][profile] Use flock shim on Windows even if detection fails (llvm#112695)

kateinoigakukun · kateinoigakukun · commit 5fe29a895a0f · 2024-10-24T17:06:24.000Z
diff --git a/compiler-rt/lib/profile/InstrProfilingUtil.c b/compiler-rt/lib/profile/InstrProfilingUtil.c
@@ -155,7 +155,8 @@ COMPILER_RT_VISIBILITY int lprofLockFd(int fd) {
     }
   }
   return 0;
-#elif defined(COMPILER_RT_HAS_FLOCK)
+#elif defined(COMPILER_RT_HAS_FLOCK) || defined(_WIN32)
+  // Windows doesn't have flock but WindowsMMap.h provides a shim
   flock(fd, LOCK_EX);
   return 0;
 #else
@@ -182,7 +183,8 @@ COMPILER_RT_VISIBILITY int lprofUnlockFd(int fd) {
     }
   }
   return 0;
-#elif defined(COMPILER_RT_HAS_FLOCK)
+#elif defined(COMPILER_RT_HAS_FLOCK) || defined(_WIN32)
+  // Windows doesn't have flock but WindowsMMap.h provides a shim
   flock(fd, LOCK_UN);
   return 0;
 #else

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,8 @@ COMPILER_RT_VISIBILITY int lprofLockFd(int fd) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`return 0;`
`158`		`-#elif defined(COMPILER_RT_HAS_FLOCK)`
	`158`	`+#elif defined(COMPILER_RT_HAS_FLOCK) \|\| defined(_WIN32)`
	`159`	`+ // Windows doesn't have flock but WindowsMMap.h provides a shim`
`159`	`160`	`flock(fd, LOCK_EX);`
`160`	`161`	`return 0;`
`161`	`162`	`#else`
`@@ -182,7 +183,8 @@ COMPILER_RT_VISIBILITY int lprofUnlockFd(int fd) {`
`182`	`183`	`}`
`183`	`184`	`}`
`184`	`185`	`return 0;`
`185`		`-#elif defined(COMPILER_RT_HAS_FLOCK)`
	`186`	`+#elif defined(COMPILER_RT_HAS_FLOCK) \|\| defined(_WIN32)`
	`187`	`+ // Windows doesn't have flock but WindowsMMap.h provides a shim`
`186`	`188`	`flock(fd, LOCK_UN);`
`187`	`189`	`return 0;`
`188`	`190`	`#else`