Merge pull request #9526 from eeckstein/thunks

Author: swift-ci

lib/Demangling/Context.cpp

@@ -83,6 +83,8 @@ bool Context::isThunkSymbol(llvm::StringRef MangledName) {
         MangledName.endswith("Ta") ||  // ObjC partial application forwarder
         MangledName.endswith("To") ||  // swift-as-ObjC thunk
         MangledName.endswith("TO") ||  // ObjC-as-swift thunk
+        MangledName.endswith("TR") ||  // reabstraction thunk helper function
+        MangledName.endswith("Tr") ||  // reabstraction thunk
         MangledName.endswith("TW")) {  // protocol witness thunk
 
       // To avoid false positives, we need to fully demangle the symbol.
@@ -96,6 +98,8 @@ bool Context::isThunkSymbol(llvm::StringRef MangledName) {
         case Node::Kind::NonObjCAttribute:
         case Node::Kind::PartialApplyObjCForwarder:
         case Node::Kind::PartialApplyForwarder:
+        case Node::Kind::ReabstractionThunkHelper:
+        case Node::Kind::ReabstractionThunk:
         case Node::Kind::ProtocolWitness:
           return true;
         default:
@@ -127,8 +131,10 @@ std::string Context::getThunkTarget(llvm::StringRef MangledName) {
       // TODO: remove this line as soon as MANGLING_PREFIX_STR gets "_S".
       || MangledName.startswith("_S")) {
 
-    // The target of a protocol witness is not derivable from the mangling.
-    if (MangledName.endswith("TW"))
+    // The targets of those thunks not derivable from the mangling.
+    if (MangledName.endswith("TR") ||
+        MangledName.endswith("Tr") ||
+        MangledName.endswith("TW") )
       return std::string();
 
     return MangledName.substr(0, MangledName.size() - 2).str();

test/Demangle/Inputs/manglings.txt

@@ -252,6 +252,6 @@ _T0s13_UnicodeViewsVss22RandomAccessCollectionRzs0A8EncodingR_11SubSequence_5Ind
 _T010Foundation11MeasurementV12SimulatorKitSo9UnitAngleCRszlE11OrientationO2eeoiSbAcDEAGOyAF_G_AKtFZ ---> static (extension in SimulatorKit):Foundation.Measurement<A where A == __ObjC.UnitAngle>.Orientation.== infix((extension in SimulatorKit):Foundation.Measurement<__ObjC.UnitAngle>.Orientation, (extension in SimulatorKit):Foundation.Measurement<__ObjC.UnitAngle>.Orientation) -> Swift.Bool
 _T04main1_yyF ---> main._() -> ()
 _T04test6testitSiyt_tF ---> test.testit(()) -> Swift.Int
-_T08_ElementQzSbs5Error_pIxxdzo_ABSbsAC_pIxidzo_s26RangeReplaceableCollectionRzABRLClTR -> reabstraction thunk helper <A where A: Swift.RangeReplaceableCollection, A._Element: AnyObject> from @callee_owned (@owned A._Element) -> (@unowned Swift.Bool, @error @owned Swift.Error) to @callee_owned (@in A._Element) -> (@unowned Swift.Bool, @error @owned Swift.Error)
-
+_T08_ElementQzSbs5Error_pIxxdzo_ABSbsAC_pIxidzo_s26RangeReplaceableCollectionRzABRLClTR ---> {T:} reabstraction thunk helper <A where A: Swift.RangeReplaceableCollection, A._Element: AnyObject> from @callee_owned (@owned A._Element) -> (@unowned Swift.Bool, @error @owned Swift.Error) to @callee_owned (@in A._Element) -> (@unowned Swift.Bool, @error @owned Swift.Error)
+_T0Ix_IyB_Tr ---> {T:} reabstraction thunk from @callee_owned () -> () to @callee_unowned @convention(block) () -> ()