Swift Optimizer: add bridging to the DeadEndBlocksAnalysis

Author: eeckstein

SwiftCompilerSources/Sources/Optimizer/Analysis/CMakeLists.txt

@@ -8,4 +8,5 @@
 
 swift_compiler_sources(Optimizer
   AliasAnalysis.swift
-  CalleeAnalysis.swift)
+  CalleeAnalysis.swift
+  DeadEndBlocksAnalysis.swift)

SwiftCompilerSources/Sources/Optimizer/Analysis/DeadEndBlocksAnalysis.swift

@@ -0,0 +1,22 @@
+//===--- DeadEndBlocksAnalysis.swift - the dead-end blocks analysis -------===//
+//
+// This source file is part of the Swift.org open source project
+//
+// Copyright (c) 2014 - 2021 Apple Inc. and the Swift project authors
+// Licensed under Apache License v2.0 with Runtime Library Exception
+//
+// See https://swift.org/LICENSE.txt for license information
+// See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
+//
+//===----------------------------------------------------------------------===//
+
+import OptimizerBridging
+import SIL
+
+public struct DeadEndBlocksAnalysis {
+  let bridged: BridgedDeadEndBlocksAnalysis
+
+  public func isDeadEnd(_ block: BasicBlock) -> Bool {
+    return DeadEndBlocksAnalysis_isDeadEnd(bridged, block.bridged) != 0
+  }
+}

SwiftCompilerSources/Sources/Optimizer/PassManager/PassUtils.swift

@@ -36,6 +36,11 @@ struct PassContext {
     return CalleeAnalysis(bridged: bridgeCA)
   }
 
+  var deadEndBlocks: DeadEndBlocksAnalysis {
+    let bridgeDEA = PassContext_getDeadEndBlocksAnalysis(_bridged)
+    return DeadEndBlocksAnalysis(bridged: bridgeDEA)
+  }
+
   func notifyInstructionsChanged() {
     PassContext_notifyChanges(_bridged, instructionsChanged)
   }

include/swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h

@@ -26,6 +26,10 @@ class DeadEndBlocksAnalysis final : public FunctionAnalysisBase<DeadEndBlocks> {
   DeadEndBlocksAnalysis(const DeadEndBlocksAnalysis &) = delete;
   DeadEndBlocksAnalysis &operator=(const DeadEndBlocksAnalysis &) = delete;
 
+  static SILAnalysisKind getAnalysisKind() {
+    return SILAnalysisKind::DeadEndBlocks;
+  }
+
   static bool classof(const SILAnalysis *s) {
     return s->getKind() == SILAnalysisKind::DeadEndBlocks;
   }

include/swift/SILOptimizer/OptimizerBridging.h

@@ -39,6 +39,10 @@ typedef struct {
   void * _Nullable bca;
 } BridgedCalleeAnalysis;
 
+typedef struct {
+  void * _Nullable dea;
+} BridgedDeadEndBlocksAnalysis;
+
 typedef struct {
   void * _Nonnull opaquePtr;
   unsigned char kind;
@@ -82,6 +86,12 @@ SwiftInt BridgedFunctionArray_size(BridgedCalleeList callees);
 BridgedFunction BridgedFunctionArray_get(BridgedCalleeList callees,
                                          SwiftInt index);
 
+BridgedDeadEndBlocksAnalysis
+PassContext_getDeadEndBlocksAnalysis(BridgedPassContext context);
+
+SwiftInt DeadEndBlocksAnalysis_isDeadEnd(BridgedDeadEndBlocksAnalysis debAnalysis,
+                                         BridgedBasicBlock);
+
 BridgedSlab PassContext_getNextSlab(BridgedSlab slab);
 BridgedSlab PassContext_getPreviousSlab(BridgedSlab slab);
 BridgedSlab PassContext_allocSlab(BridgedPassContext passContext,

lib/SILOptimizer/Analysis/DeadEndBlocksAnalysis.cpp

@@ -10,7 +10,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "swift/SIL/SILBridgingUtils.h"
 #include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
+#include "swift/SILOptimizer/OptimizerBridging.h"
 #include "swift/AST/Decl.h"
 #include "swift/SIL/SILFunction.h"
 
@@ -55,3 +57,13 @@ void DeadEndBlocksAnalysis::verify(DeadEndBlocks *deBlocks) const {
 SILAnalysis *swift::createDeadEndBlocksAnalysis(SILModule *) {
   return new DeadEndBlocksAnalysis();
 }
+
+//===----------------------------------------------------------------------===//
+//                            Swift Bridging
+//===----------------------------------------------------------------------===//
+
+SwiftInt DeadEndBlocksAnalysis_isDeadEnd(BridgedDeadEndBlocksAnalysis debAnalysis,
+                                         BridgedBasicBlock block) {
+  auto *dea = static_cast<DeadEndBlocks *>(debAnalysis.dea);
+  return dea->isDeadEnd(castToBasicBlock(block));
+}

lib/SILOptimizer/PassManager/PassManager.cpp

@@ -21,6 +21,7 @@
 #include "swift/SIL/SILModule.h"
 #include "swift/SILOptimizer/Analysis/AliasAnalysis.h"
 #include "swift/SILOptimizer/Analysis/BasicCalleeAnalysis.h"
+#include "swift/SILOptimizer/Analysis/DeadEndBlocksAnalysis.h"
 #include "swift/SILOptimizer/Analysis/FunctionOrder.h"
 #include "swift/SILOptimizer/OptimizerBridging.h"
 #include "swift/SILOptimizer/PassManager/PrettyStackTrace.h"
@@ -1241,6 +1242,13 @@ BridgedCalleeAnalysis PassContext_getCalleeAnalysis(BridgedPassContext context)
   return {pm->getAnalysis<BasicCalleeAnalysis>()};
 }
 
+BridgedDeadEndBlocksAnalysis
+PassContext_getDeadEndBlocksAnalysis(BridgedPassContext context) {
+  SwiftPassInvocation *invocation = castToPassInvocation(context);
+  SILPassManager *pm = invocation->getPassManager();
+  return {pm->getAnalysis<DeadEndBlocksAnalysis>(invocation->getFunction())};
+}
+
 BridgedBasicBlockSet PassContext_allocBasicBlockSet(BridgedPassContext context) {
   return {castToPassInvocation(context)->allocBlockSet()};
 }