[compiler-rt] add SANITIZER_OSX

[aralisza]

Summary

This will allow us to make osx specific changes easier. Because apple silicon macs also run on aarch64, it was easy to confuse it with iOS.

rdar://75302812

[aralisza]

remove linter changes

[aralisza]

fix whitespace

[aralisza]

remove change that doesn't belong in this diff

[delcypher]

I'm not a big fan of the name but the sensible name (SANTIZER_MAC) is already taken unfortunately.

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

72

How about this instead?

#if TARGET_OS_OSX
#  define SANITIZER_OSX 1
#else
#  define SANITIZER_OSX 0
#endif

It's more inline with the existing defines and doesn't require us to explicitly list platforms that aren't macOS.

[yln]

From the TargetConditionals.h header:

TARGET_OS_MAC             - Generated code will run under Mac OS X variant
   TARGET_OS_OSX          - Generated code will run under OS X devices
   TARGET_OS_IPHONE          - Generated code for firmware, devices, or simulator
      TARGET_OS_IOS             - Generated code will run under iOS
      TARGET_OS_TV              - Generated code will run under Apple TV OS
      TARGET_OS_WATCH           - Generated code will run under Apple Watch OS
      TARGET_OS_MACCATALYST     - Generated code will run under macOS
   TARGET_OS_SIMULATOR      - Generated code will run under a simulator

 +----------------------------------------------------------+
 |                      TARGET_OS_MAC                       |
 | +---+ +------------------------------------+ +---------+ |
 | |   | |            TARGET_OS_IPHONE        | |         | |
 | |   | | +---------------+ +----+ +-------+ | |         | |
 | |   | | |      IOS      | |    | |       | | |         | |
 | |OSX| | |+-------------+| | TV | | WATCH | | |DRIVERKIT| |
 | |   | | || MACCATALYST || |    | |       | | |         | |
 | |   | | |+-------------+| |    | |       | | |         | |
 | |   | | +---------------+ +----+ +-------+ | |         | |
 | +---+ +------------------------------------+ +---------+ |
 +----------------------------------------------------------+

So adding SANITIZER_OSX would mirror this even though the name is a bad (outdated) one.
Renaming everything to make sense, e.g., SANITIZER_DARWIN for everything and then macOS, iOS, ... as more specific subsets is probably out of the question.

LGTM (with Dan's suggestions)!

Note: in some places we use the order of #if-#elif-#else to make the #else mean maOS. Having an explicit macro should be better.

[aralisza]

use target conditionals

[aralisza]

indentation

[delcypher]

@aralisza You can ignore the lint checks here.

[delcypher]

Just floating this as on option. We could call the new define SANITIZER_MACOS.

pro:

• Name better reflects the current name of macOS

cons:

• Easily confused with SANITIZER_MAC
• Doesn't follow the naming conventions in`TargetConditionals.h`

I don't have strong opinions either way, we should just pick one and stick with it. @aralisza @yln Any opinions on this?

[yln]

In D100157#2680742, @delcypher wrote:

I don't have strong opinions either way, we should just pick one and stick with it. @aralisza @yln Any opinions on this?

I would vote for the "extremes", i.e., either

• keep closely mirroring TargetConditionals.h with all its idiosyncrasies, or
• newly design/rename things to "make sense" and be consistent. My biggest beef is that TARGET_OS_MAC/SANITIZER_MAC is such a misnomer (but one can easily guess how it evolved and why it means what it means).

The second option would leave us in a better state, but is probably not worth the churn. Renaming everything at once in upstream llvm doesn't sound too bad, but one has to consider the downstream implications.
I would not use the name SANITIZER_MACOS without also "fixing"/renaming SANITIZER_MAC .

[aralisza]

Personally, I would prefer option 1

keep closely mirroring TargetConditionals.h with all its idiosyncrasies

because I don't really want to end up on the git blame for all the lines I rename :(

compiler-rt/lib/sanitizer_common/sanitizer_platform.h

 # else
 #  define SANITIZER_IOS    0
 # endif
 # if TARGET_OS_SIMULATOR
 #  define SANITIZER_IOSSIM 1
 # else
 #  define SANITIZER_IOSSIM 0
 # endif
+#if SANITIZER_IOS || SANITIZER_IOSSIM
+#define SANITIZER_OSX 0
+#else
+#define SANITIZER_OSX 1
+#endif
 #else
 # define SANITIZER_MAC     0
 # define SANITIZER_IOS     0
 # define SANITIZER_IOSSIM  0
+# define SANITIZER_OSX 0
 #endif
 
 #if defined(__APPLE__) && TARGET_OS_IPHONE && TARGET_OS_WATCH
 # define SANITIZER_WATCHOS 1
 #else
 # define SANITIZER_WATCHOS 0
 #endif
 

 #if SANITIZER_GO && defined(__mips64)
 #define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 47)
 #else
 # define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 40)
 #endif
 #elif SANITIZER_RISCV64
 #define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 38)
 #elif defined(__aarch64__)
-# if SANITIZER_MAC
+# if SANITIZER_MAC && !SANITIZER_OSX 
 // Darwin iOS/ARM64 has a 36-bit VMA, 64GiB VM
 #  define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 36)
 # else
 #  define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 48)
 # endif
 #elif defined(__sparc__)
 #define SANITIZER_MMAP_RANGE_SIZE FIRST_32_SECOND_64(1ULL << 32, 1ULL << 52)
 #else