[SwiftCompilerSources] Moved Test into Optimizer.

And changed the type of the context argument to FunctionPassContext.

Author: nate-chandler

SwiftCompilerSources/Sources/Optimizer/PassManager/PassRegistration.swift

@@ -20,7 +20,7 @@ public func initializeSwiftModules() {
   registerSwiftAnalyses()
   registerSwiftPasses()
   initializeSwiftParseModules()
-  registerSILTests()
+  registerOptimizerTests()
 }
 
 private func registerPass(

SwiftCompilerSources/Sources/Optimizer/Utilities/CMakeLists.txt

@@ -13,4 +13,5 @@ swift_compiler_sources(Optimizer
   AccessUtils.swift
   SSAUpdater.swift
   StaticInitCloner.swift
+  Test.swift
 )

SwiftCompilerSources/Sources/SIL/Test.swift renamed to SwiftCompilerSources/Sources/Optimizer/Utilities/Test.swift

@@ -88,10 +88,12 @@
 //===----------------------------------------------------------------------===//
 
 import Basic
+import SIL
 import SILBridging
+import OptimizerBridging
 
 /// The primary interface to in-IR tests.
-public struct FunctionTest {
+struct FunctionTest {
   let name: String
   let invocation: FunctionTestInvocation
 
@@ -102,7 +104,7 @@ public struct FunctionTest {
 }
 
 /// The type of the closure passed to a FunctionTest.
-public typealias FunctionTestInvocation = @convention(thin) (Function, TestArguments, TestContext) -> ()
+typealias FunctionTestInvocation = @convention(thin) (Function, TestArguments, FunctionPassContext) -> ()
 
 /// Wraps the arguments specified in the specify_test instruction.
 public struct TestArguments {
@@ -127,20 +129,8 @@ extension BridgedTestArguments {
   public var native: TestArguments { TestArguments(bridged: self) }
 }
 
-/// An interface to the various analyses that are available.
-public struct TestContext {
-  public var bridged: BridgedTestContext
-  fileprivate init(bridged: BridgedTestContext) {
-    self.bridged = bridged
-  }
-}
-
-extension BridgedTestContext {
-  public var native: TestContext { TestContext(bridged: self) }
-}
-
 /// Registration of each test in the SIL module.
-public func registerSILTests() {
+public func registerOptimizerTests() {
   // Register each test.
   registerFunctionTest(parseTestSpecificationTest)
 
@@ -159,16 +149,18 @@ private func registerFunctionTest(_ test: FunctionTest) {
 /// actual test function.
 ///
 /// This function is necessary because tests need to be written in terms of
-/// native Swift types (Function, TestArguments, TestContext) rather than their
-/// bridged variants, but such a function isn't representable in C++.  This
-/// thunk unwraps the bridged types and invokes the real function.
+/// native Swift types (Function, TestArguments, BridgedPassContext)
+/// rather than their bridged variants, but such a function isn't representable
+/// in C++.  This thunk unwraps the bridged types and invokes the real
+/// function.
 private func functionTestThunk(
   _ erasedInvocation: UnsafeMutableRawPointer,
   _ function: BridgedFunction, 
   _ arguments: BridgedTestArguments, 
-  _ context: BridgedTestContext) {
+  _ passInvocation: BridgedSwiftPassInvocation) {
   let invocation = uneraseInvocation(erasedInvocation)
-  invocation(function.function, arguments.native, context.native)
+  let context = FunctionPassContext(_bridged: BridgedPassContext(invocation: passInvocation.invocation))
+  invocation(function.function, arguments.native, context)
 }
 
 /// Bitcast a thin test closure to void *.

SwiftCompilerSources/Sources/SIL/CMakeLists.txt

@@ -23,7 +23,6 @@ add_swift_compiler_module(SIL
     Registration.swift
     SmallProjectionPath.swift
     SubstitutionMap.swift
-    Test.swift
     Type.swift
     Utils.swift
     Value.swift

SwiftCompilerSources/Sources/SIL/Operand.swift

@@ -16,7 +16,7 @@ import SILBridging
 public struct Operand : CustomStringConvertible, NoReflectionChildren {
   fileprivate let bridged: BridgedOperand
 
-  init(bridged: BridgedOperand) {
+  public init(bridged: BridgedOperand) {
     self.bridged = bridged
   }
 

include/swift/SIL/SILBridging.h

@@ -1562,14 +1562,13 @@ struct BridgedTestArguments {
   BridgedFunction takeFunction() const;
 };
 
-struct BridgedTestContext {
+struct BridgedSwiftPassInvocation {
   swift::SwiftPassInvocation *_Nonnull invocation;
 };
 
-using SwiftNativeFunctionTestThunk = void (*_Nonnull)(void *_Nonnull,
-                                                      BridgedFunction,
-                                                      BridgedTestArguments,
-                                                      BridgedTestContext);
+using SwiftNativeFunctionTestThunk =
+    void (*_Nonnull)(void *_Nonnull, BridgedFunction, BridgedTestArguments,
+                     BridgedSwiftPassInvocation);
 
 void registerFunctionTestThunk(SwiftNativeFunctionTestThunk);
 

include/swift/SIL/Test.h

@@ -166,7 +166,7 @@ class FunctionTest final {
   template <typename Analysis, typename Transform = SILFunctionTransform>
   Analysis *getAnalysis();
 
-  BridgedTestContext getContext();
+  SwiftPassInvocation *getInvocation();
 
 //===----------------------------------------------------------------------===//
 //=== MARK: Implementation Details                                         ===

lib/SIL/Utils/Test.cpp

@@ -99,7 +99,7 @@ void FunctionTest::run(SILFunction &function, Arguments &arguments,
   } else {
     auto *fn = invocation.get<NativeSwiftInvocation>();
     Registry::get().getFunctionTestThunk()(fn, {&function}, {&arguments},
-                                           getContext());
+                                           {getInvocation()});
   }
   this->pass = nullptr;
   this->function = nullptr;
@@ -114,6 +114,6 @@ SILPassManager *FunctionTest::getPassManager() {
   return dependencies->getPassManager();
 }
 
-BridgedTestContext FunctionTest::getContext() {
-  return BridgedTestContext{dependencies->getInvocation()};
+SwiftPassInvocation *FunctionTest::getInvocation() {
+  return dependencies->getInvocation();
 }