1 files changed, 12 insertions, 11 deletions
diff --git a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
index 874361d4755..8a1129aa9a0 100644
--- a/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/HWAddressSanitizer.cpp
@@ -369,6 +369,18 @@ void HWAddressSanitizer::initializeModule() {
   Int32Ty = IRB.getInt32Ty();
 
   HwasanCtorFunction = nullptr;
+
+  // Older versions of Android do not have the required runtime support for
+  // global or personality function instrumentation. On other platforms we
+  // currently require using the latest version of the runtime.
+  bool NewRuntime =
+      !TargetTriple.isAndroid() || !TargetTriple.isAndroidVersionLT(30);
+
+  // If we don't have personality function support, fall back to landing pads.
+  InstrumentLandingPads = ClInstrumentLandingPads.getNumOccurrences()
+                              ? ClInstrumentLandingPads
+                              : !NewRuntime;
+
   if (!CompileKernel) {
     std::tie(HwasanCtorFunction, std::ignore) =
         getOrCreateSanitizerCtorAndInitFunctions(
@@ -383,22 +395,11 @@ void HWAddressSanitizer::initializeModule() {
               appendToGlobalCtors(M, Ctor, 0, Ctor);
             });
 
-    // Older versions of Android do not have the required runtime support for
-    // global or personality function instrumentation. On other platforms we
-    // currently require using the latest version of the runtime.
-    bool NewRuntime =
-        !TargetTriple.isAndroid() || !TargetTriple.isAndroidVersionLT(30);
-
     bool InstrumentGlobals =
         ClGlobals.getNumOccurrences() ? ClGlobals : NewRuntime;
     if (InstrumentGlobals)
       instrumentGlobals();
 
-    // If we don't have personality function support, fall back to landing pads.
-    InstrumentLandingPads = ClInstrumentLandingPads.getNumOccurrences()
-                                ? ClInstrumentLandingPads
-                                : !NewRuntime;
-
     bool InstrumentPersonalityFunctions =
         ClInstrumentPersonalityFunctions.getNumOccurrences()
             ? ClInstrumentPersonalityFunctions