Reflection: Don't use the old box mangling

The TypeDecoder doesn't support the new box mangling yet and instead
just decodes it as Builtin.NativeObject, but that's OK because the
Remote Mirrors lowered the old box mangling as Builtin.NativeObject
anyway.

Author: slavapestov

lib/IRGen/GenReflection.cpp

@@ -203,27 +203,16 @@ class ReflectionMetadataBuilder {
 
   /// Add a 32-bit relative offset to a mangled typeref string
   /// in the typeref reflection section.
-  void addTypeRef(ModuleDecl *ModuleContext, CanType type,
-                  CanGenericSignature Context = {}) {
+  void addTypeRef(ModuleDecl *ModuleContext, CanType type) {
     assert(type);
 
     // Generic parameters should be written in terms of interface types
     // for the purposes of reflection metadata
     assert(!type->hasArchetype() && "Forgot to map typeref out of context");
 
-    // TODO: As a compatibility hack, mangle single-field boxes with the legacy
-    // mangling in reflection metadata.
-    bool isSingleFieldOfBox = false;
-    auto boxTy = dyn_cast<SILBoxType>(type);
-    if (boxTy && boxTy->getLayout()->getFields().size() == 1) {
-      GenericContextScope scope(IGM, Context);
-      type = boxTy->getFieldLoweredType(IGM.getSILModule(), 0);
-      isSingleFieldOfBox = true;
-    }
     IRGenMangler mangler;
     auto MangledStr = mangler.mangleTypeForReflection(IGM, type,
-                                                      ModuleContext,
-                                                      isSingleFieldOfBox);
+                                                      ModuleContext);
     auto mangledName = IGM.getAddrOfStringForTypeRef(MangledStr);
     B.addRelativeAddress(mangledName);
   }
@@ -238,8 +227,7 @@ class ReflectionMetadataBuilder {
     } else {
       CanType type = nominal->getDeclaredType()->getCanonicalType();
       mangledStr =
-        mangler.mangleTypeForReflection(IGM, type, nominal->getModuleContext(),
-                                        /*isSingleFieldOfBox=*/false);
+        mangler.mangleTypeForReflection(IGM, type, nominal->getModuleContext());
     }
     auto mangledName = IGM.getAddrOfStringForTypeRef(mangledStr);
     B.addRelativeAddress(mangledName);
@@ -754,8 +742,7 @@ class CaptureDescriptorBuilder : public ReflectionMetadataBuilder {
 
     // Now add typerefs of all of the captures.
     for (auto CaptureType : CaptureTypes) {
-      addTypeRef(IGM.getSILModule().getSwiftModule(), CaptureType,
-                 OrigCalleeType->getGenericSignature());
+      addTypeRef(IGM.getSILModule().getSwiftModule(), CaptureType);
       addBuiltinTypeRefs(CaptureType);
     }
 

lib/IRGen/IRGenMangler.cpp

@@ -82,8 +82,7 @@ std::string IRGenMangler::manglePartialApplyForwarder(StringRef FuncName) {
 SymbolicMangling
 IRGenMangler::mangleTypeForReflection(IRGenModule &IGM,
                                       Type Ty,
-                                      ModuleDecl *Module,
-                                      bool isSingleFieldOfBox) {
+                                      ModuleDecl *Module) {
   Mod = Module;
   OptimizeProtocolNames = false;
 
@@ -109,8 +108,6 @@ IRGenMangler::mangleTypeForReflection(IRGenModule &IGM,
   SymbolicReferences.clear();
 
   appendType(Ty);
-  if (isSingleFieldOfBox)
-    appendOperator("Xb");
 
   return {finalize(), std::move(SymbolicReferences)};
 }

lib/IRGen/IRGenMangler.h

@@ -355,8 +355,7 @@ class IRGenMangler : public Mangle::ASTMangler {
 
   SymbolicMangling mangleTypeForReflection(IRGenModule &IGM,
                                            Type Ty,
-                                           ModuleDecl *Module,
-                                           bool isSingleFieldOfBox);
+                                           ModuleDecl *Module);
 
   std::string mangleTypeForLLVMTypeName(CanType Ty);
 

lib/IRGen/MetadataRequest.cpp

@@ -303,8 +303,7 @@ llvm::Constant *IRGenModule::getAddrOfStringForTypeRef(
 llvm::Constant *irgen::getTypeRef(IRGenModule &IGM, CanType type) {
   IRGenMangler Mangler;
   auto SymbolicName = Mangler.mangleTypeForReflection(IGM, type,
-                                                    IGM.getSwiftModule(),
-                                                    /*single-field box*/ false);
+                                                    IGM.getSwiftModule());
 
   return IGM.getAddrOfStringForTypeRef(SymbolicName);
 }

test/Reflection/capture_descriptors.sil

@@ -41,8 +41,7 @@ bb0(%i: $Int, %p: $@thick P.Type):
 
 // CHECK:      - Capture types:
 // CHECK-NEXT: (struct Swift.Int)
-// CHECK-NEXT: (sil_box
-// CHECK-NEXT:   (struct Swift.Int))
+// CHECK-NEXT: (builtin Builtin.NativeObject)
 // CHECK-NEXT: (existential_metatype
 // CHECK-NEXT:   (protocol_composition
 // CHECK-NEXT:     (protocol capture_descriptors.P)))
@@ -76,8 +75,7 @@ bb0:
 
 // CHECK:      - Capture types:
 // CHECK-NEXT: (struct Swift.Int)
-// CHECK-NEXT: (sil_box
-// CHECK-NEXT:   (struct Swift.String))
+// CHECK-NEXT: (builtin Builtin.NativeObject)
 // CHECK-NEXT:   - Metadata sources:
 
 

test/Reflection/typeref_decoding.swift

@@ -708,8 +708,7 @@
 // CHECK: CAPTURE DESCRIPTORS:
 // CHECK: ====================
 // CHECK: - Capture types:
-// CHECK: (sil_box
-// CHECK:   (generic_type_parameter depth=0 index=0))
+// CHECK: (builtin Builtin.NativeObject)
 // CHECK: - Metadata sources:
 // CHECK: (generic_type_parameter depth=0 index=0)
 // CHECK: (closure_binding index=0)

test/Reflection/typeref_decoding_asan.swift

@@ -708,8 +708,7 @@
 // CHECK: CAPTURE DESCRIPTORS:
 // CHECK: ====================
 // CHECK: - Capture types:
-// CHECK: (sil_box
-// CHECK:   (generic_type_parameter depth=0 index=0))
+// CHECK: (builtin Builtin.NativeObject)
 // CHECK: - Metadata sources:
 // CHECK: (generic_type_parameter depth=0 index=0)
 // CHECK: (closure_binding index=0)