Merge pull request #39194 from aschwaighofer/disable_arm64_32_global_isel

swift-ci · web-flow · commit 8817de589a0f · 2021-09-07T10:20:56.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -444,7 +444,7 @@ option(SWIFT_ENABLE_DISPATCH
   TRUE)
 
 option(SWIFT_ENABLE_GLOBAL_ISEL_ARM64
-  "Enable global isel on arm64, arm64e, arm64_32"
+  "Enable global isel on arm64"
   FALSE)
 
 cmake_dependent_option(SWIFT_BUILD_SYNTAXPARSERLIB
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -1891,8 +1891,7 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
   }
 
   if (SWIFT_ENABLE_GLOBAL_ISEL_ARM64 &&
-      (Triple.getArch() == llvm::Triple::aarch64 ||
-       Triple.getArch() == llvm::Triple::aarch64_32) &&
+      Triple.getArch() == llvm::Triple::aarch64 &&
       Triple.getArchName() != "arm64e") {
     Opts.EnableGlobalISel = true;
   }

Original file line number	Diff line number	Diff line change
`@@ -1891,8 +1891,7 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,`
`1891`	`1891`	`}`
`1892`	`1892`
`1893`	`1893`	`if (SWIFT_ENABLE_GLOBAL_ISEL_ARM64 &&`
`1894`		`- (Triple.getArch() == llvm::Triple::aarch64 \|\|`
`1895`		`- Triple.getArch() == llvm::Triple::aarch64_32) &&`
	`1894`	`+ Triple.getArch() == llvm::Triple::aarch64 &&`
`1896`	`1895`	`Triple.getArchName() != "arm64e") {`
`1897`	`1896`	`Opts.EnableGlobalISel = true;`
`1898`	`1897`	`}`