Merge pull request swiftlang#31952 from gottesmm/pr-6e3317403aa8653e12171104f9e33f8c2224bb82

[fso] Do not try to specialize pseudo-generic functions today.

Author: gottesmm

lib/SILOptimizer/FunctionSignatureTransforms/FunctionSignatureOpts.cpp

@@ -642,7 +642,6 @@ bool FunctionSignatureTransform::run(bool hasCaller) {
       TransformDescriptor.hasOnlyDirectInModuleCallers;
   SILFunction *F = TransformDescriptor.OriginalFunction;
 
-
   // If we are asked to assume a caller for testing purposes, set the flag.
   hasCaller |= FSOOptimizeIfNotCalled;
 
@@ -652,6 +651,16 @@ bool FunctionSignatureTransform::run(bool hasCaller) {
     return false;
   }
 
+  // Bail if we have a pseudo-generic function. We do not handle these today. If
+  // we let it through here we crash when attempting to compute the optimized
+  // function type.
+  //
+  // TODO: Add support for this.
+  if (F->getLoweredFunctionType()->isPseudogeneric()) {
+    LLVM_DEBUG(llvm::dbgs() << "  function is pseudo-generic -> abort\n");
+    return false;
+  }
+
   // Run OwnedToGuaranteed optimization.
   if (OwnedToGuaranteedAnalyze()) {
     Changed = true;

test/SILOptimizer/funcsig_pseudogenerics.sil

@@ -0,0 +1,31 @@
+// RUN: %empty-directory(%t)
+// RUN: %build-clang-importer-objc-overlays
+// RUN: %target-sil-opt(mock-sdk: %clang-importer-sdk-nosource -I %t) -function-signature-opts -sil-fso-optimize-if-not-called %s | %FileCheck %s
+
+// Make sure that we do not try to specialize pseudo-generics with FSO.
+
+// REQUIRES: objc_interop
+
+sil_stage canonical
+
+import Swift
+import Foundation
+import objc_generics
+
+// CHECK: sil [signature_optimized_thunk] [always_inline] @non_pseudo_method :
+sil @non_pseudo_method : $@convention(thin) <T: AnyObject> (Int64) -> () {
+entry(%0 : $Int64):
+  return undef : $()
+}
+
+// CHECK: sil @method :
+sil @method : $@convention(method) @pseudogeneric <T: AnyObject> (Int64, @guaranteed GenericClass<T>) -> () {
+entry(%0 : $Int64, %1 : $GenericClass<T>):
+  return undef : $()
+}
+
+// CHECK: sil @objcMethod :
+sil @objcMethod : $@convention(objc_method) @pseudogeneric <T: AnyObject> (Int64, @guaranteed GenericClass<T>) -> () {
+entry(%0 : $Int64, %1 : $GenericClass<T>):
+  return undef : $()
+}

test/lit.cfg

@@ -962,6 +962,11 @@ if run_vendor == 'apple':
     config.target_sil_opt = (
         "%s %s %s %s" %
         (xcrun_prefix, config.sil_opt, target_options, config.sil_test_options))
+    subst_target_sil_opt_mock_sdk = (
+        "%s %s" %
+        (config.sil_opt, target_options_for_mock_sdk))
+    subst_target_sil_opt_mock_sdk_after = \
+        target_options_for_mock_sdk_after
     config.target_swift_symbolgraph_extract = (
         "%s %s %s" %
         (xcrun_prefix, config.swift_symbolgraph_extract, target_options))
@@ -1042,6 +1047,8 @@ elif run_os in ['windows-msvc']:
             ('%r -target %s %s %s %s' % (config.sil_opt, config.variant_triple,  \
                                          resource_dir_opt, mcp_opt,              \
                                          config.sil_test_options))
+    subst_target_sil_opt_mock_sdk = config.target_sil_opt
+    subst_target_sil_opt_mock_sdk_after = ''
     config.target_swift_symbolgraph_extract =                                    \
             ('%r -target %s %s' % (config.swift_symbolgraph_extract,             \
                                          config.variant_triple,                  \
@@ -1151,6 +1158,8 @@ elif (run_os in ['linux-gnu', 'linux-gnueabihf', 'freebsd', 'openbsd', 'windows-
     config.target_sil_opt = (
         '%s -target %s %s %s %s' %
         (config.sil_opt, config.variant_triple, resource_dir_opt, mcp_opt, config.sil_test_options))
+    subst_target_sil_opt_mock_sdk = config.target_sil_opt
+    subst_target_sil_opt_mock_sdk_after = ""
     config.target_swift_symbolgraph_extract = (
         '%s -target %s %s' %
         (config.swift_symbolgraph_extract, config.variant_triple, mcp_opt))
@@ -1272,6 +1281,8 @@ elif run_os == 'linux-androideabi' or run_os == 'linux-android':
         '-target', config.variant_triple,
         android_include_paths_opt,
         resource_dir_opt, mcp_opt, config.sil_test_options])
+    subst_target_sil_opt_mock_sdk = config.target_sil_opt
+    subst_target_sil_opt_mock_sdk_after = ""
     config.target_swift_symbolgraph_extract = ' '.join([
         config.swift_symbolgraph_extract,
         '-target', config.variant_triple,
@@ -1794,7 +1805,13 @@ config.substitutions.append(('%scale-test',
 config.substitutions.append(('%empty-directory\(([^)]+)\)',
                              SubstituteCaptures(r'rm -rf "\1" && mkdir -p "\1"')))
 
+config.substitutions.append(('%target-sil-opt\(mock-sdk:([^)]+)\)',
+                             SubstituteCaptures(r'%s \1 %s' % (subst_target_sil_opt_mock_sdk,
+                                                               subst_target_sil_opt_mock_sdk_after))))
+# NOTE: This needs to be appended after the mock-sdk expansion to ensure that we
+# first expand the mock-sdk when lit is processing.
 config.substitutions.append(('%target-sil-opt', config.target_sil_opt))
+
 config.substitutions.append(('%target-sil-func-extractor', config.target_sil_func_extractor))
 config.substitutions.append(('%target-sil-llvm-gen', config.target_sil_llvm_gen))
 config.substitutions.append(('%target-sil-nm', config.target_sil_nm))