[cxx-interop][SwiftCompilerSources] Use swift::SubstitutionMap instead of BridgedSubstitutionMap

rdar://83361087

Author: egorzhdan

SwiftCompilerSources/Sources/SIL/SubstitutionMap.swift

@@ -13,13 +13,13 @@
 import SILBridging
 
 public struct SubstitutionMap {
-  public let bridged: BridgedSubstitutionMap
+  public let bridged: swift.SubstitutionMap
 
-  public init(_ bridged: BridgedSubstitutionMap) {
+  public init(_ bridged: swift.SubstitutionMap) {
     self.bridged = bridged
   }
 
   public init() {
-    self.bridged = SubstitutionMap_getEmpty();
+    self.bridged = swift.SubstitutionMap()
   }
 }

include/swift/SIL/SILBridging.h

@@ -15,6 +15,7 @@
 
 #include "swift/Basic/BasicBridging.h"
 #include "swift/Basic/BridgedSwiftObject.h"
+#include "swift/AST/SubstitutionMap.h"
 #include "swift/SIL/SILLocation.h"
 #include <stdbool.h>
 #include <stddef.h>
@@ -202,10 +203,6 @@ typedef enum {
 
 // AST bridging
 
-typedef struct {
-  const void * _Nonnull op;
-} BridgedSubstitutionMap;
-
 typedef enum {
   UnknownBuiltin = 0,
 #define BUILTIN(Id, Name, Attrs) Id##Builtin,
@@ -330,8 +327,6 @@ llvm::StringRef SILType_getNominalFieldName(BridgedType type, SwiftInt index);
 SwiftInt SILType_getCaseIdxOfEnumType(BridgedType type,
                                       llvm::StringRef caseName);
 
-BridgedSubstitutionMap SubstitutionMap_getEmpty();
-
 swift::SILDebugLocation
 SILLocation_getAutogeneratedLocation(swift::SILDebugLocation loc);
 
@@ -404,7 +399,7 @@ SwiftInt KeyPathInst_getNumComponents(BridgedInstruction kpi);
 void KeyPathInst_getReferencedFunctions(BridgedInstruction kpi, SwiftInt componentIdx,
                                             KeyPathFunctionResults * _Nonnull results);
 
-BridgedSubstitutionMap ApplySite_getSubstitutionMap(BridgedInstruction inst);
+swift::SubstitutionMap ApplySite_getSubstitutionMap(BridgedInstruction inst);
 BridgedArgumentConvention
 ApplySite_getArgumentConvention(BridgedInstruction inst, SwiftInt calleeArgIdx);
 SwiftInt ApplySite_getNumArguments(BridgedInstruction inst);
@@ -438,7 +433,7 @@ BridgedInstruction SILBuilder_createCopyAddr(BridgedBuilder builder,
 BridgedInstruction SILBuilder_createDestroyValue(BridgedBuilder builder,
           BridgedValue op);
 BridgedInstruction SILBuilder_createApply(BridgedBuilder builder,
-          BridgedValue function, BridgedSubstitutionMap subMap,
+          BridgedValue function, swift::SubstitutionMap subMap,
           BridgedValueArray arguments);
 BridgedInstruction SILBuilder_createSwitchEnumInst(BridgedBuilder builder,
           BridgedValue enumVal, OptionalBridgedBasicBlock defaultBlock,

include/swift/SIL/SILBridgingUtils.h

@@ -41,10 +41,6 @@ inline SILType castToSILType(BridgedType type) {
   return SILType::getFromOpaqueValue(type.typePtr);
 }
 
-inline SubstitutionMap castToSubstitutionMap(BridgedSubstitutionMap subMap) {
-  return SubstitutionMap::getFromOpaqueValue(subMap.op);
-}
-
 template <class I = SILInstruction> I *castToInst(BridgedInstruction inst) {
   return cast<I>(static_cast<SILNode *>(inst.obj)->castToInstruction());
 }

include/swift/SILOptimizer/OptimizerBridging.h

@@ -159,7 +159,7 @@ BridgedFunction NodeSet_getFunction(BridgedNodeSet set);
 
 void AllocRefInstBase_setIsStackAllocatable(BridgedInstruction arb);
 
-BridgedSubstitutionMap
+swift::SubstitutionMap
 PassContext_getContextSubstitutionMap(BridgedPassContext context,
                                       BridgedType bridgedType);
 

include/swift/module.modulemap

@@ -10,6 +10,7 @@ module ASTBridging {
   header "AST/ASTBridging.h"
   header "AST/DiagnosticEngine.h"
   header "AST/DiagnosticConsumer.h"
+  header "AST/SubstitutionMap.h"
   requires cplusplus
   export *
 }

lib/SIL/Utils/SILBridging.cpp

@@ -549,15 +549,6 @@ SwiftInt SILType_getCaseIdxOfEnumType(BridgedType type,
   return -1;
 }
 
-
-//===----------------------------------------------------------------------===//
-//                            SubstitutionMap
-//===----------------------------------------------------------------------===//
-
-BridgedSubstitutionMap SubstitutionMap_getEmpty() {
-  return {SubstitutionMap().getOpaqueValue()};
-}
-
 //===----------------------------------------------------------------------===//
 //                                SILLocation
 //===----------------------------------------------------------------------===//
@@ -942,9 +933,9 @@ void KeyPathInst_getReferencedFunctions(BridgedInstruction kpi, SwiftInt compone
     }, [](SILDeclRef) {});
 }
 
-BridgedSubstitutionMap ApplySite_getSubstitutionMap(BridgedInstruction inst) {
+SubstitutionMap ApplySite_getSubstitutionMap(BridgedInstruction inst) {
   auto as = ApplySite(castToInst(inst));
-  return {as.getSubstitutionMap().getOpaqueValue()};
+  return as.getSubstitutionMap();
 }
 
 BridgedArgumentConvention
@@ -1075,14 +1066,14 @@ BridgedInstruction SILBuilder_createDestroyValue(BridgedBuilder b,
 
 BridgedInstruction SILBuilder_createApply(BridgedBuilder b,
                                           BridgedValue function,
-                                          BridgedSubstitutionMap subMap,
+                                          SubstitutionMap subMap,
                                           BridgedValueArray arguments) {
   SILBuilder builder(castToInst(b.insertBefore), castToBasicBlock(b.insertAtEnd),
                      b.loc.getScope());
   SmallVector<SILValue, 16> argValues;
-  return {builder.createApply(
-      RegularLocation(b.loc.getLocation()), castToSILValue(function),
-      castToSubstitutionMap(subMap), getSILValues(arguments, argValues))};
+  return {builder.createApply(RegularLocation(b.loc.getLocation()),
+                              castToSILValue(function), subMap,
+                              getSILValues(arguments, argValues))};
 }
 
 static EnumElementDecl *getEnumElement(SILType enumType, int caseIndex) {

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -1551,15 +1551,15 @@ void AllocRefInstBase_setIsStackAllocatable(BridgedInstruction arb) {
   castToInst<AllocRefInstBase>(arb)->setStackAllocatable();
 }
 
-BridgedSubstitutionMap
+SubstitutionMap
 PassContext_getContextSubstitutionMap(BridgedPassContext context,
                                       BridgedType bridgedType) {
   auto type = castToSILType(bridgedType);
   auto *ntd = type.getASTType()->getAnyNominal();
   auto *pm = castToPassInvocation(context)->getPassManager();
   auto *m = pm->getModule()->getSwiftModule();
-  
-  return {type.getASTType()->getContextSubstitutionMap(m, ntd).getOpaqueValue()};
+
+  return type.getASTType()->getContextSubstitutionMap(m, ntd);
 }
 
 void PassContext_beginTransformFunction(BridgedFunction function, BridgedPassContext ctxt) {