Merge pull request #84555 from gottesmm/pr-4f37ab5228b75850c247af4f8dd913996a0390bd

[irgen] Make HasAArch64TBI an IRGen option instead of a LangOpts.

Author: gottesmm

include/swift/AST/IRGenOptions.h

@@ -605,6 +605,9 @@ class IRGenOptions {
   /// Paths to the pass plugins registered via -load-pass-plugin.
   std::vector<std::string> LLVMPassPlugins;
 
+  /// Set to true if we support AArch64TBI.
+  bool HasAArch64TBI = false;
+
   IRGenOptions()
       : OutputKind(IRGenOutputKind::LLVMAssemblyAfterOptimization),
         Verify(true), VerifyEach(false), OptMode(OptimizationMode::NotSet),
@@ -641,22 +644,20 @@ class IRGenOptions {
         DisableStandardSubstitutionsInReflectionMangling(false),
         EnableGlobalISel(false), VirtualFunctionElimination(false),
         WitnessMethodElimination(false), ConditionalRuntimeRecords(false),
-        AnnotateCondFailMessage(false),
-        InternalizeAtLink(false), InternalizeSymbols(false),
-        EmitGenericRODatas(true),
+        AnnotateCondFailMessage(false), InternalizeAtLink(false),
+        InternalizeSymbols(false), EmitGenericRODatas(true),
         NoPreallocatedInstantiationCaches(false),
         DisableReadonlyStaticObjects(false), CollocatedMetadataFunctions(false),
         ColocateTypeDescriptors(true), UseRelativeProtocolWitnessTables(false),
         UseFragileResilientProtocolWitnesses(false), EnableHotColdSplit(false),
         EmitAsyncFramePushPopMetadata(true), EmitTypeMallocForCoroFrame(true),
         AsyncFramePointerAll(false), UseProfilingMarkerThunks(false),
-        UseCoroCCX8664(false), UseCoroCCArm64(false),
-        MergeableTraps(false),
+        UseCoroCCX8664(false), UseCoroCCArm64(false), MergeableTraps(false),
         DebugInfoForProfiling(false), CmdArgs(),
         SanitizeCoverage(llvm::SanitizerCoverageOptions()),
         TypeInfoFilter(TypeInfoDumpFilter::All),
         PlatformCCallingConvention(llvm::CallingConv::C), UseCASBackend(false),
-        CASObjMode(llvm::CASBackendMode::Native) {
+        CASObjMode(llvm::CASBackendMode::Native), HasAArch64TBI(false) {
     DisableRoundTripDebugTypes = !CONDITIONAL_ASSERT_enabled();
   }
 

include/swift/Basic/LangOptions.h

@@ -679,9 +679,6 @@ namespace swift {
     bool RestrictNonProductionExperimentalFeatures = false;
 #endif
 
-    /// Set to true if we support AArch64TBI.
-    bool HasAArch64TBI = false;
-
     bool isConcurrencyModelTaskToThread() const {
       return ActiveConcurrencyModel == ConcurrencyModel::TaskToThread;
     }

lib/DriverTool/sil_llvm_gen_main.cpp

@@ -167,6 +167,7 @@ int sil_llvm_gen_main(ArrayRef<const char *> argv, void *MainAddr) {
   IRGenOptions &Opts = Invocation.getIRGenOptions();
   Opts.OutputKind = options.OutputKind;
   Opts.DisableLegacyTypeInfo = options.DisableLegacyTypeInfo;
+  Invocation.computeAArch64TBIOptions();
 
   serialization::ExtendedValidationInfo extendedInfo;
   llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =

lib/Frontend/CompilerInvocation.cpp

@@ -377,7 +377,7 @@ void CompilerInvocation::computeAArch64TBIOptions() {
   auto &LLVMArgs = getFrontendOptions().LLVMArgs;
   auto aarch64_use_tbi =
       std::find(LLVMArgs.begin(), LLVMArgs.end(), "-aarch64-use-tbi");
-  LangOpts.HasAArch64TBI = aarch64_use_tbi != LLVMArgs.end();
+  IRGenOpts.HasAArch64TBI = aarch64_use_tbi != LLVMArgs.end();
 }
 
 void CompilerInvocation::computeCXXStdlibOptions() {