Revert "[IRGen] Mangling for async, non-constant partial_apply thunks."

This reverts commit efaaee3.

Author: nate-chandler

docs/ABI/Mangling.rst

@@ -147,7 +147,6 @@ Globals
   // TODO check this::
   global ::= mangled-name 'TA'                     // partial application forwarder
   global ::= mangled-name 'Ta'                     // ObjC partial application forwarder
-  global ::= mangled-name 'Tw' index               // async partial apply thunk for a non-constant function
   global ::= mangled-name 'TQ' index               // Async await continuation partial function
   global ::= mangled-name 'TY' index               // Async suspend continuation partial function
 

include/swift/Demangling/DemangleNodes.def

@@ -313,7 +313,6 @@ NODE(AutoDiffSubsetParametersThunk)
 NODE(AutoDiffDerivativeVTableThunk)
 NODE(DifferentiabilityWitness)
 NODE(IndexSubset)
-NODE(AsyncNonconstantPartialApplyThunk)
 NODE(AsyncAwaitResumePartialFunction)
 NODE(AsyncSuspendResumePartialFunction)
 

lib/Demangling/Demangler.cpp

@@ -123,7 +123,6 @@ bool swift::Demangle::isFunctionAttr(Node::Kind kind) {
     case Node::Kind::DynamicallyReplaceableFunctionKey:
     case Node::Kind::DynamicallyReplaceableFunctionVar:
     case Node::Kind::AsyncFunctionPointer:
-    case Node::Kind::AsyncNonconstantPartialApplyThunk:
     case Node::Kind::AsyncAwaitResumePartialFunction:
     case Node::Kind::AsyncSuspendResumePartialFunction:
       return true;
@@ -2536,11 +2535,6 @@ NodePointer Demangler::demangleThunkOrSpecialization() {
         return demangleAutoDiffFunctionOrSimpleThunk(
             Node::Kind::AutoDiffFunction);
       }
-    case 'w': {
-      NodePointer discriminator = demangleIndexAsNode();
-      return createWithChild(Node::Kind::AsyncNonconstantPartialApplyThunk,
-                             discriminator);
-    }
     default:
       return nullptr;
   }

lib/Demangling/NodePrinter.cpp

@@ -570,7 +570,6 @@ class NodePrinter {
     case Node::Kind::AutoDiffFunctionKind:
     case Node::Kind::DifferentiabilityWitness:
     case Node::Kind::IndexSubset:
-    case Node::Kind::AsyncNonconstantPartialApplyThunk:
     case Node::Kind::AsyncAwaitResumePartialFunction:
     case Node::Kind::AsyncSuspendResumePartialFunction:
       return false;
@@ -2807,12 +2806,6 @@ NodePointer NodePrinter::print(NodePointer Node, bool asPrefixContext) {
   case Node::Kind::AsyncFunctionPointer:
     Printer << "async function pointer to ";
     return nullptr;
-  case Node::Kind::AsyncNonconstantPartialApplyThunk:
-    Printer << "(";
-    print(Node->getChild(0));
-    Printer << ")";
-    Printer << " thunk for non-constant partial apply in ";
-    return nullptr;
   case Node::Kind::AsyncAwaitResumePartialFunction:
     Printer << "(";
     print(Node->getChild(0));

lib/Demangling/OldRemangler.cpp

@@ -606,10 +606,6 @@ void Remangler::mangleDynamicallyReplaceableFunctionVar(Node *node) {
   Buffer << "TX";
 }
 
-void Remangler::mangleAsyncNonconstantPartialApplyThunk(Node *node) {
-  unreachable("unsupported");
-}
-
 void Remangler::mangleAsyncAwaitResumePartialFunction(Node *node) {
   unreachable("unsupported");
 }

lib/Demangling/Remangler.cpp

@@ -1376,7 +1376,6 @@ void Remangler::mangleGlobal(Node *node) {
       case Node::Kind::DynamicallyReplaceableFunctionImpl:
       case Node::Kind::DynamicallyReplaceableFunctionVar:
       case Node::Kind::AsyncFunctionPointer:
-      case Node::Kind::AsyncNonconstantPartialApplyThunk:
       case Node::Kind::AsyncAwaitResumePartialFunction:
       case Node::Kind::AsyncSuspendResumePartialFunction:
         mangleInReverseOrder = true;
@@ -1887,11 +1886,6 @@ void Remangler::mangleDynamicallyReplaceableFunctionVar(Node *node) {
   Buffer << "TX";
 }
 
-void Remangler::mangleAsyncNonconstantPartialApplyThunk(Node *node) {
-  Buffer << "Tw";
-  mangleChildNode(node, 0);
-}
-
 void Remangler::mangleAsyncAwaitResumePartialFunction(Node *node) {
   Buffer << "TQ";
   mangleChildNode(node, 0);

lib/IRGen/IRGenMangler.cpp

@@ -79,23 +79,6 @@ std::string IRGenMangler::manglePartialApplyForwarder(StringRef FuncName) {
   return finalize();
 }
 
-std::string
-IRGenMangler::mangleAsyncNonconstantPartialApplyThunk(StringRef FuncName,
-                                                      unsigned index) {
-  if (FuncName.empty()) {
-    beginMangling();
-  } else {
-    if (FuncName.startswith(MANGLING_PREFIX_STR)) {
-      Buffer << FuncName;
-    } else {
-      beginMangling();
-      appendIdentifier(FuncName);
-    }
-  }
-  appendOperator("Tw", Index(index));
-  return finalize();
-}
-
 SymbolicMangling
 IRGenMangler::withSymbolicReferences(IRGenModule &IGM,
                                   llvm::function_ref<void ()> body) {

lib/IRGen/IRGenMangler.h

@@ -574,9 +574,7 @@ class IRGenMangler : public Mangle::ASTMangler {
   }
 
   std::string manglePartialApplyForwarder(StringRef FuncName);
-  std::string mangleAsyncNonconstantPartialApplyThunk(StringRef FuncName,
-                                                      unsigned index);
-
+  
   std::string mangleTypeForForeignMetadataUniquing(Type type) {
     return mangleTypeWithoutPrefix(type);
   }

test/Demangle/Inputs/manglings.txt

@@ -393,8 +393,6 @@ $sS2f8mangling3FooV13TangentVectorVIegydd_SfAESfIegydd_TJOp ---> autodiff self-r
 $s13test_mangling3fooyS2f_S2ftFWJrSpSr ---> reverse-mode differentiability witness for test_mangling.foo(Swift.Float, Swift.Float, Swift.Float) -> Swift.Float with respect to parameters {0} and results {0}
 $s13test_mangling3fooyS2f_xq_t16_Differentiation14DifferentiableR_r0_lFAcDRzAcDR_r0_lWJrUSSpSr ---> reverse-mode differentiability witness for test_mangling.foo<A, B where B: _Differentiation.Differentiable>(Swift.Float, A, B) -> Swift.Float with respect to parameters {1, 2} and results {0} with <A, B where A: _Differentiation.Differentiable, B: _Differentiation.Differentiable>
 $s5async1hyyS2iJXEF ---> async.h(@Sendable (Swift.Int) -> Swift.Int) -> ()
-$s12create_pa_f2Tw_ ---> (0) thunk for non-constant partial apply in create_pa_f2
-$s12create_pa_f2Tw0_ ---> (1) thunk for non-constant partial apply in create_pa_f2
 $s5Actor02MyA0C17testAsyncFunctionyyYKFTY0_ ---> (1) suspend resume partial function for Actor.MyActor.testAsyncFunction() async throws -> ()
 $s5Actor02MyA0C17testAsyncFunctionyyYKFTQ1_ ---> (2) await resume partial function for Actor.MyActor.testAsyncFunction() async throws -> ()
 $s4diff1hyyS2ijfXEF ---> diff.h(@differentiable(_forward) (Swift.Int) -> Swift.Int) -> ()