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

kateinoigakukun · web-flow · commit 7a90ff752c4e · 2024-10-22T07:09:16.000+09:00
diff --git a/compiler-rt/lib/profile/InstrProfilingUtil.c b/compiler-rt/lib/profile/InstrProfilingUtil.c
@@ -152,7 +152,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
@@ -179,7 +180,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
`@@ -152,7 +152,8 @@ COMPILER_RT_VISIBILITY int lprofLockFd(int fd) {`
`152`	`152`	`}`
`153`	`153`	`}`
`154`	`154`	`return 0;`
`155`		`-#elif defined(COMPILER_RT_HAS_FLOCK)`
	`155`	`+#elif defined(COMPILER_RT_HAS_FLOCK) \|\| defined(_WIN32)`
	`156`	`+ // Windows doesn't have flock but WindowsMMap.h provides a shim`
`156`	`157`	`flock(fd, LOCK_EX);`
`157`	`158`	`return 0;`
`158`	`159`	`#else`
`@@ -179,7 +180,8 @@ COMPILER_RT_VISIBILITY int lprofUnlockFd(int fd) {`
`179`	`180`	`}`
`180`	`181`	`}`
`181`	`182`	`return 0;`
`182`		`-#elif defined(COMPILER_RT_HAS_FLOCK)`
	`183`	`+#elif defined(COMPILER_RT_HAS_FLOCK) \|\| defined(_WIN32)`
	`184`	`+ // Windows doesn't have flock but WindowsMMap.h provides a shim`
`183`	`185`	`flock(fd, LOCK_UN);`
`184`	`186`	`return 0;`
`185`	`187`	`#else`