SIL: rename Type.instanceTypeOfMetatype -> Type.loweredInstanceTypeOfMetatype

The same for SILType

It needs to be made clear that this is not the "original", but the lowered SIL type.

NFC

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/InstructionSimplification/SimplifyBuiltin.swift

@@ -200,7 +200,7 @@ private extension BuiltinInst {
       return
     }
 
-    let instanceType = type.instanceTypeOfMetatype(in: parentFunction)
+    let instanceType = type.loweredInstanceTypeOfMetatype(in: parentFunction)
     let builder = Builder(before: self, context)
     let newMetatype = builder.createMetatype(of: instanceType, representation: .Thin)
     operands[argument].set(to: newMetatype, context)
@@ -277,8 +277,8 @@ private func typesOfValuesAreEqual(_ lhs: Value, _ rhs: Value, in function: Func
   if lhsMetatype.isDynamicSelfMetatype != rhsMetatype.isDynamicSelfMetatype {
     return nil
   }
-  let lhsTy = lhsMetatype.instanceTypeOfMetatype(in: function)
-  let rhsTy = rhsMetatype.instanceTypeOfMetatype(in: function)
+  let lhsTy = lhsMetatype.loweredInstanceTypeOfMetatype(in: function)
+  let rhsTy = rhsMetatype.loweredInstanceTypeOfMetatype(in: function)
 
   // Do we know the exact types? This is not the case e.g. if a type is passed as metatype
   // to the function.

SwiftCompilerSources/Sources/Optimizer/Utilities/FunctionSignatureTransforms.swift

@@ -148,7 +148,7 @@ private func removeMetatypArguments(in specializedFunction: Function, _ context:
     if funcArg.type.isRemovableMetatype(in: specializedFunction) {
       // Rematerialize the metatype value in the entry block.
       let builder = Builder(atBeginOf: entryBlock, context)
-      let instanceType = funcArg.type.instanceTypeOfMetatype(in: specializedFunction)
+      let instanceType = funcArg.type.loweredInstanceTypeOfMetatype(in: specializedFunction)
       let metatype = builder.createMetatype(of: instanceType, representation: .Thick)
       funcArg.uses.replaceAll(with: metatype, context)
       entryBlock.eraseArgument(at: funcArgIdx, context)
@@ -234,7 +234,7 @@ private extension Type {
   func isRemovableMetatype(in function: Function) -> Bool {
     if isMetatype {
       if representationOfMetatype(in: function) == .Thick {
-        let instanceTy = instanceTypeOfMetatype(in: function)
+        let instanceTy = loweredInstanceTypeOfMetatype(in: function)
         // For structs and enums we know the metatype statically.
         return instanceTy.isStruct || instanceTy.isEnum
       }

SwiftCompilerSources/Sources/SIL/Type.swift

@@ -131,8 +131,8 @@ public struct Type : CustomStringConvertible, NoReflectionChildren {
 
   public typealias MetatypeRepresentation = BridgedType.MetatypeRepresentation
 
-  public func instanceTypeOfMetatype(in function: Function) -> Type {
-    bridged.getInstanceTypeOfMetatype(function.bridged).type
+  public func loweredInstanceTypeOfMetatype(in function: Function) -> Type {
+    bridged.getLoweredInstanceTypeOfMetatype(function.bridged).type
   }
 
   public var isDynamicSelfMetatype: Bool {

include/swift/SIL/SILBridging.h

@@ -417,7 +417,7 @@ struct BridgedType {
   SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getBuiltinVectorElementType() const;
   BRIDGED_INLINE bool isBuiltinFixedWidthInteger(SwiftInt width) const;
   BRIDGED_INLINE bool isExactSuperclassOf(BridgedType t) const;
-  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getInstanceTypeOfMetatype(BridgedFunction f) const;
+  SWIFT_IMPORT_UNSAFE BRIDGED_INLINE BridgedType getLoweredInstanceTypeOfMetatype(BridgedFunction f) const;
   BRIDGED_INLINE bool isDynamicSelfMetatype() const;
   BRIDGED_INLINE MetatypeRepresentation getRepresentationOfMetatype(BridgedFunction f) const;
   BRIDGED_INLINE bool isCalleeConsumedFunction() const;

include/swift/SIL/SILBridgingImpl.h

@@ -364,8 +364,8 @@ bool BridgedType::isExactSuperclassOf(BridgedType t) const {
   return unbridged().isExactSuperclassOf(t.unbridged());
 }
 
-BridgedType BridgedType::getInstanceTypeOfMetatype(BridgedFunction f) const {
-  return unbridged().getInstanceTypeOfMetatype(f.getFunction());
+BridgedType BridgedType::getLoweredInstanceTypeOfMetatype(BridgedFunction f) const {
+  return unbridged().getLoweredInstanceTypeOfMetatype(f.getFunction());
 }
 
 bool BridgedType::isDynamicSelfMetatype() const {

include/swift/SIL/SILType.h

@@ -944,7 +944,7 @@ class SILType {
     return getSILBoxFieldType(fn).isMoveOnlyWrapped();
   }
 
-  SILType getInstanceTypeOfMetatype(SILFunction *function) const;
+  SILType getLoweredInstanceTypeOfMetatype(SILFunction *function) const;
 
   MetatypeRepresentation getRepresentationOfMetatype(SILFunction *function) const;
 

lib/SIL/IR/SILType.cpp

@@ -1142,7 +1142,7 @@ bool SILType::isValueTypeWithDeinit() const {
   return false;
 }
 
-SILType SILType::getInstanceTypeOfMetatype(SILFunction *function) const {
+SILType SILType::getLoweredInstanceTypeOfMetatype(SILFunction *function) const {
   auto metaType = castTo<MetatypeType>();
   CanType instanceTy = metaType.getInstanceType();
   auto &tl = function->getModule().Types.getTypeLowering(instanceTy, TypeExpansionContext(*function));

lib/SILOptimizer/Transforms/VTableSpecializer.cpp

@@ -73,7 +73,7 @@ static bool specializeVTablesInFunction(SILFunction &func, SILModule &module,
                                             transform) != nullptr);
       } else if (auto *metatype = dyn_cast<MetatypeInst>(&inst)) {
         changed |= (specializeVTableForType(
-                        metatype->getType().getInstanceTypeOfMetatype(&func),
+                        metatype->getType().getLoweredInstanceTypeOfMetatype(&func),
                         module, transform) != nullptr);
       } else if (auto *cm = dyn_cast<ClassMethodInst>(&inst)) {
         changed |= specializeClassMethodInst(cm);