libswift: bridge RCIdentityAnalysis code

Author: MaxDesiatov

include/swift/SIL/SILBridging.h

@@ -86,6 +86,10 @@ typedef struct {
   SwiftObject obj;
 } BridgedFunction;
 
+typedef struct {
+  OptionalSwiftObject obj;
+} OptionalBridgedFunction;
+
 typedef struct {
   SwiftObject obj;
 } BridgedGlobalVar;
@@ -136,6 +140,12 @@ typedef enum {
   MayHaveSideEffectsBehavior
 } BridgedMemoryBehavior;
 
+// AST bridging
+
+typedef struct {
+  const void * _Nonnull op;
+} BridgedSubstitutionMap;
+
 typedef enum {
   UnknownBuiltin = 0,
 #define BUILTIN(Id, Name, Attrs) Id##Builtin,
@@ -189,6 +199,7 @@ BridgedType SILValue_getType(BridgedValue value);
 
 SwiftInt SILType_isAddress(BridgedType);
 SwiftInt SILType_isTrivial(BridgedType, BridgedFunction);
+BridgedSubstitutionMap SILType_getContextSubstitutionMap(BridgedType);
 
 BridgedBasicBlock SILArgument_getParent(BridgedArgument argument);
 
@@ -236,7 +247,7 @@ BridgedInstruction SILBuilder_createBuiltinBinaryFunction(
           BridgedLocation loc, BridgedStringRef name,
           BridgedType operandType, BridgedType resultType, BridgedValueArray arguments);
 BridgedInstruction SILBuilder_createCondFail(BridgedInstruction insertionPoint,
-          BridgedLocation loc, BridgedValue condition, BridgedStringRef messge);
+          BridgedLocation loc, BridgedValue condition, BridgedStringRef message);
 BridgedInstruction SILBuilder_createIntegerLiteral(BridgedInstruction insertionPoint,
           BridgedLocation loc, BridgedType type, SwiftInt value);
 BridgedInstruction SILBuilder_createDeallocStackRef(BridgedInstruction insertionPoint,

include/swift/SILOptimizer/OptimizerBridging.h

@@ -69,6 +69,14 @@ enum {
   BridgedSlabCapacity = 64 * sizeof(uintptr_t)
 };
 
+typedef struct {
+  void * _Nullable rcia;
+} BridgedRCIdentityAnalysis;
+
+typedef struct {
+  void * _Nonnull functionInfo;
+} BridgedRCIdentityFunctionInfo;
+
 typedef void (* _Nonnull BridgedFunctionPassRunFn)(BridgedFunctionPassCtxt);
 typedef void (* _Nonnull BridgedInstructionPassRunFn)(BridgedInstructionPassCtxt);
 
@@ -133,6 +141,18 @@ void BasicBlockSet_erase(BridgedBasicBlockSet set, BridgedBasicBlock block);
 BridgedFunction BasicBlockSet_getFunction(BridgedBasicBlockSet set);
 
 void AllocRefInstBase_setIsStackAllocatable(BridgedInstruction arb);
+BridgedRCIdentityAnalysis
+PassContext_getRCIdentityAnalysis(BridgedPassContext context);
+
+BridgedRCIdentityFunctionInfo
+RCIdentityAnalysis_getFunctionInfo(BridgedRCIdentityAnalysis bridgedAnalysis,
+                                   BridgedFunction function);
+
+BridgedValue RCIdentityFunctionInfo_getRCIdentityRoot(
+    BridgedRCIdentityFunctionInfo bridgedInfo, BridgedValue value);
+
+OptionalBridgedFunction PassContext_getDestructor(BridgedPassContext context,
+                                                  BridgedType type);
 
 #ifdef __cplusplus
 } // extern "C"

lib/SILOptimizer/Analysis/RCIdentityAnalysis.cpp

@@ -12,8 +12,10 @@
 
 #include "swift/SILOptimizer/Analysis/RCIdentityAnalysis.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
-#include "swift/SIL/SILInstruction.h"
 #include "swift/SIL/DynamicCasts.h"
+#include "swift/SIL/SILBridgingUtils.h"
+#include "swift/SIL/SILInstruction.h"
+#include "swift/SILOptimizer/OptimizerBridging.h"
 #include "llvm/Support/CommandLine.h"
 
 using namespace swift;
@@ -605,3 +607,22 @@ void RCIdentityAnalysis::initialize(SILPassManager *PM) {
 SILAnalysis *swift::createRCIdentityAnalysis(SILModule *M) {
   return new RCIdentityAnalysis(M);
 }
+
+//===----------------------------------------------------------------------===//
+//                            Swift Bridging
+//===----------------------------------------------------------------------===//
+
+BridgedRCIdentityFunctionInfo
+RCIdentityAnalysis_getFunctionInfo(BridgedRCIdentityAnalysis bridgedAnalysis,
+                                   BridgedFunction function) {
+  RCIdentityAnalysis *rcia =
+    static_cast<RCIdentityAnalysis *>(bridgedAnalysis.rcia);
+  return {rcia->get(castToFunction(function))};
+}
+
+BridgedValue RCIdentityFunctionInfo_getRCIdentityRoot(
+    BridgedRCIdentityFunctionInfo bridgedInfo, BridgedValue value) {
+  RCIdentityFunctionInfo *info =
+    static_cast<RCIdentityFunctionInfo *>(bridgedInfo.functionInfo);
+  return {info->getRCIdentityRoot(castToSILValue(value))};
+}

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -24,6 +24,7 @@
 #include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
 #include "swift/SILOptimizer/Analysis/FunctionOrder.h"
 #include "swift/SILOptimizer/Analysis/DominanceAnalysis.h"
+#include "swift/SILOptimizer/Analysis/RCIdentityAnalysis.h"
 #include "swift/SILOptimizer/OptimizerBridging.h"
 #include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
 #include "swift/SILOptimizer/PassManager/Transforms.h"
@@ -1222,7 +1223,7 @@ void PassContext_notifyChanges(BridgedPassContext passContext,
 }
 
 void PassContext_eraseInstruction(BridgedPassContext passContext,
-                                   BridgedInstruction inst) {
+                                  BridgedInstruction inst) {
   castToPassInvocation(passContext)->eraseInstruction(castToInst(inst));
 }
 
@@ -1243,8 +1244,8 @@ void PassContext_fixStackNesting(BridgedPassContext passContext,
 SwiftInt PassContext_isSwift51RuntimeAvailable(BridgedPassContext context) {
   SILPassManager *pm = castToPassInvocation(context)->getPassManager();
   ASTContext &ctxt = pm->getModule()->getASTContext();
-  return AvailabilityContext::forDeploymentTarget(ctxt).
-           isContainedIn(ctxt.getSwift51Availability());
+  return AvailabilityContext::forDeploymentTarget(ctxt).isContainedIn(
+    ctxt.getSwift51Availability());
 }
 
 BridgedAliasAnalysis PassContext_getAliasAnalysis(BridgedPassContext context) {
@@ -1253,7 +1254,8 @@ BridgedAliasAnalysis PassContext_getAliasAnalysis(BridgedPassContext context) {
   return {pm->getAnalysis<AliasAnalysis>(invocation->getFunction())};
 }
 
-BridgedCalleeAnalysis PassContext_getCalleeAnalysis(BridgedPassContext context) {
+BridgedCalleeAnalysis
+PassContext_getCalleeAnalysis(BridgedPassContext context) {
   SILPassManager *pm = castToPassInvocation(context)->getPassManager();
   return {pm->getAnalysis<BasicCalleeAnalysis>()};
 }
@@ -1318,4 +1320,32 @@ BridgedFunction BasicBlockSet_getFunction(BridgedBasicBlockSet set) {
 
 void AllocRefInstBase_setIsStackAllocatable(BridgedInstruction arb) {
   castToInst<AllocRefInstBase>(arb)->setStackAllocatable();
+BridgedRCIdentityAnalysis
+PassContext_getRCIdentityAnalysis(BridgedPassContext context) {
+  SILPassManager *pm = castToPassInvocation(context)->getPassManager();
+  return {pm->getAnalysis<RCIdentityAnalysis>()};
+}
+
+OptionalBridgedFunction PassContext_getDestructor(BridgedPassContext context,
+                                                  BridgedType type) {
+  auto *cd = castToSILType(type).getClassOrBoundGenericClass();
+  assert(cd && "no class type allocated with alloc_ref");
+
+  auto *pm = castToPassInvocation(context)->getPassManager();
+  // Find the destructor of the type.
+  auto *destructor = cd->getDestructor();
+  SILDeclRef deallocRef(destructor, SILDeclRef::Kind::Deallocator);
+
+  return {pm->getModule()->lookUpFunction(deallocRef)};
+}
+
+BridgedSubstitutionMap
+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()};
 }

lib/SILOptimizer/Transforms/ReleaseDevirtualizer.cpp

@@ -133,15 +133,10 @@ bool ReleaseDevirtualizer::createDeallocCall(SILType AllocType,
   SILFunction *Dealloc = M.lookUpFunction(DeallocRef);
   if (!Dealloc)
     return false;
-  TypeExpansionContext context(*ReleaseInst->getFunction());
-  CanSILFunctionType DeallocType =
-      Dealloc->getLoweredFunctionTypeInContext(context);
   auto *NTD = AllocType.getASTType()->getAnyNominal();
   auto AllocSubMap = AllocType.getASTType()
     ->getContextSubstitutionMap(M.getSwiftModule(), NTD);
 
-  DeallocType = DeallocType->substGenericArgs(M, AllocSubMap, context);
-
   SILBuilder B(ReleaseInst);
   if (object->getType() != AllocType)
     object = B.createUncheckedRefCast(ReleaseInst->getLoc(), object, AllocType);