Merge commit 'c96d0cceb684' from llvm.org/master into apple/main

Author: git apple-llvm automerger

compiler-rt/lib/asan/asan_rtl.cpp

@@ -498,10 +498,10 @@ static void AsanInitInternal() {
   force_interface_symbols();  // no-op.
   SanitizerInitializeUnwinder();
 
-  if (CAN_SANITIZE_LEAKS) {
-    __lsan::InitCommonLsan();
-    InstallAtExitCheckLeaks();
-  }
+#if CAN_SANITIZE_LEAKS
+  __lsan::InitCommonLsan();
+  InstallAtExitCheckLeaks();
+#endif
 
 #if CAN_SANITIZE_UB
   __ubsan::InitAsPlugin();

compiler-rt/lib/lsan/lsan_common_fuchsia.cpp

@@ -51,7 +51,7 @@ void ProcessPlatformSpecificAllocations(Frontier *frontier) {}
 // behavior and causes rare race conditions.
 void HandleLeaks() {}
 
-// This is defined differently in asan_fuchsiap.cpp and lsan_fuchsia.cpp.
+// This is defined differently in asan_fuchsia.cpp and lsan_fuchsia.cpp.
 bool UseExitcodeOnLeak();
 
 int ExitHook(int status) {