---

yaml
---
r: 347630
b: refs/heads/master
c: d9602be
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 178406c9c2eff4787bc712370ca7e0c5a4bde455
+refs/heads/master: d9602be71598fe7fb927202077b0615b8007bbc5
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Demangling/Context.cpp

@@ -68,8 +68,24 @@ std::string Context::demangleTypeAsString(llvm::StringRef MangledName,
   return demangling;
 }
 
+// Removes a '.<n>' suffix from \p Name. <n> is either a number or a combination of
+// '.<other-text>.<n>'.
+// Such symbols are produced in IRGen or in LLVM optimizations.
+static llvm::StringRef stripSuffix(llvm::StringRef Name) {
+  // A suffix always ends with a digit. Do this quick check to avoid scanning through the whole
+  // symbol name if the symbol has no suffix (= the common case).
+  if (isdigit(Name.back())) {
+    size_t dotPos = Name.find('.');
+    if (dotPos != StringRef::npos) {
+      Name = Name.substr(0, dotPos);
+    }
+  }
+  return Name;
+}
+
 bool Context::isThunkSymbol(llvm::StringRef MangledName) {
   if (isMangledName(MangledName)) {
+    MangledName = stripSuffix(MangledName);
     // First do a quick check
     if (MangledName.endswith("TA") ||  // partial application forwarder
         MangledName.endswith("Ta") ||  // ObjC partial application forwarder
@@ -121,6 +137,10 @@ std::string Context::getThunkTarget(llvm::StringRef MangledName) {
     return std::string();
 
   if (isMangledName(MangledName)) {
+    // If the symbol has a suffix we cannot derive the target.
+    if (stripSuffix(MangledName) != MangledName)
+      return std::string();
+
     // The targets of those thunks not derivable from the mangling.
     if (MangledName.endswith("TR") ||
         MangledName.endswith("Tr") ||

trunk/test/Demangle/Inputs/manglings.txt

@@ -93,6 +93,7 @@ _$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo
 _$SSC3fooyS2d_SdtFTO ---> {T:_$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
 _$S3foo3barC3bas3zimyAaEC_tFTo ---> {T:_$S3foo3barC3bas3zimyAaEC_tF,C} @objc foo.bar.bas(zim: foo.zim) -> ()
 _$SSC3fooyS2d_SdtFTO ---> {T:_$SSC3fooyS2d_SdtF} @nonobjc __C_Synthesized.foo(Swift.Double, Swift.Double) -> Swift.Double
+_$sTA.123 ---> {T:} partial apply forwarder with unmangled suffix ".123"
 _TTDFC3foo3bar3basfT3zimCS_3zim_T_ ---> dynamic foo.bar.bas(zim: foo.zim) -> ()
 _TFC3foo3bar3basfT3zimCS_3zim_T_ ---> foo.bar.bas(zim: foo.zim) -> ()
 _TF3foooi1pFTCS_3barVS_3bas_OS_3zim ---> foo.+ infix(foo.bar, foo.bas) -> foo.zim