IRGen: Rename -read-type-info-path flag to -read-legacy-type-info-path

Author: slavapestov

include/swift/AST/IRGenOptions.h

@@ -179,7 +179,7 @@ class IRGenOptions {
   unsigned LazyInitializeClassMetadata : 1;
 
   /// The path to load legacy type layouts from.
-  StringRef ReadTypeInfoPath;
+  StringRef ReadLegacyTypeInfoPath;
 
   /// Should we try to build incrementally by not emitting an object file if it
   /// has the same IR hash as the module that we are preparing to emit?

include/swift/Option/FrontendOptions.td

@@ -177,8 +177,8 @@ def enable_resilience : Flag<["-"], "enable-resilience">,
 def enable_class_resilience : Flag<["-"], "enable-class-resilience">,
    HelpText<"Enable resilient layout for classes containing resilient value types">;
 
-def read_type_info_path_EQ : Joined<["-"], "read-type-info-path=">,
-  HelpText<"Read legacy type layout from the given path">;
+def read_legacy_type_info_path_EQ : Joined<["-"], "read-legacy-type-info-path=">,
+  HelpText<"Read legacy type layout from the given path instead of default path">;
 }
 
 

lib/Frontend/CompilerInvocation.cpp

@@ -1079,8 +1079,8 @@ static bool ParseIRGenArgs(IRGenOptions &Opts, ArgList &Args,
   // (e.g. NativeObject).  Force the lazy initialization of the VWT always.
   Opts.LazyInitializeClassMetadata = Triple.isOSBinFormatCOFF();
 
-  if (const Arg *A = Args.getLastArg(OPT_read_type_info_path_EQ)) {
-    Opts.ReadTypeInfoPath = A->getValue();
+  if (const Arg *A = Args.getLastArg(OPT_read_legacy_type_info_path_EQ)) {
+    Opts.ReadLegacyTypeInfoPath = A->getValue();
   }
 
   for (const auto &Lib : Args.getAllArgValues(options::OPT_autolink_library))

lib/IRGen/GenClass.cpp

@@ -378,7 +378,7 @@ namespace {
         if (CompletelyFragileLayout && !eltType->isFixedSize()) {
           // For staging purposes, only do the new thing if the path flag
           // is provided.
-          auto mode = (IGM.IRGen.Opts.ReadTypeInfoPath.empty()
+          auto mode = (IGM.IRGen.Opts.ReadLegacyTypeInfoPath.empty()
                        ? TypeConverter::Mode::CompletelyFragile
                        : TypeConverter::Mode::Legacy);
           LoweringModeScope scope(IGM, mode);

lib/IRGen/GenType.cpp

@@ -1125,7 +1125,7 @@ TypeConverter::TypeConverter(IRGenModule &IGM)
   if (IGM.IRGen.Opts.EnableResilienceBypass)
     LoweringMode = Mode::CompletelyFragile;
 
-  StringRef path = IGM.IRGen.Opts.ReadTypeInfoPath;
+  StringRef path = IGM.IRGen.Opts.ReadLegacyTypeInfoPath;
   if (!path.empty()) {
     bool error = readLegacyTypeInfo(path);
     if (error) {

test/IRGen/completely_fragile_class_layout.sil

@@ -3,7 +3,7 @@
 
 // RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience %s | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
 
-// RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience %s -read-type-info-path=%S/Inputs/legacy_type_info/a.yaml | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
+// RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience %s -read-legacy-type-info-path=%S/Inputs/legacy_type_info/a.yaml | %FileCheck %s --check-prefix=CHECK --check-prefix=CHECK-%target-ptrsize -DINT=i%target-ptrsize
 
 // RUN: %target-swift-frontend  -I %t -emit-ir -enable-resilience -O %s