Merge pull request #37860 from buttaface/release/5.4

nate-chandler · web-flow · commit f3708686b82e · 2021-06-15T20:54:23.000-07:00
[5.4][IRGen] Disable pre-specialization for 32-bit ARM on Linux
diff --git a/lib/IRGen/IRGenModule.cpp b/lib/IRGen/IRGenModule.cpp
@@ -1609,7 +1609,8 @@ bool IRGenModule::useDllStorage() { return ::useDllStorage(Triple); }
 
 bool IRGenModule::shouldPrespecializeGenericMetadata() {
   auto canPrespecializeTarget =
-      (Triple.isOSDarwin() || Triple.isTvOS() || Triple.isOSLinux());
+      (Triple.isOSDarwin() || Triple.isTvOS() ||
+       (Triple.isOSLinux() && !(Triple.isARM() && Triple.isArch32Bit())));
   if (canPrespecializeTarget && isStandardLibrary()) {
     return true;
   }

Original file line number	Diff line number	Diff line change
`@@ -1609,7 +1609,8 @@ bool IRGenModule::useDllStorage() { return ::useDllStorage(Triple); }`
`1609`	`1609`
`1610`	`1610`	`bool IRGenModule::shouldPrespecializeGenericMetadata() {`
`1611`	`1611`	`auto canPrespecializeTarget =`
`1612`		`- (Triple.isOSDarwin() \|\| Triple.isTvOS() \|\| Triple.isOSLinux());`
	`1612`	`+ (Triple.isOSDarwin() \|\| Triple.isTvOS() \|\|`
	`1613`	`+ (Triple.isOSLinux() && !(Triple.isARM() && Triple.isArch32Bit())));`
`1613`	`1614`	`if (canPrespecializeTarget && isStandardLibrary()) {`
`1614`	`1615`	`return true;`
`1615`	`1616`	`}`