Merge pull request #19374 from apple/fixmeSC

Author: swift-ci

lib/Demangling/Demangler.cpp

@@ -169,7 +169,9 @@ bool swift::Demangle::isSwiftSymbol(const char *mangledName) {
 }
 
 bool swift::Demangle::isObjCSymbol(llvm::StringRef mangledName) {
-  return dropSwiftManglingPrefix(mangledName).startswith("So");
+  StringRef nameWithoutPrefix = dropSwiftManglingPrefix(mangledName);
+  return nameWithoutPrefix.startswith("So") ||
+         nameWithoutPrefix.startswith("SC");
 }
 
 bool swift::Demangle::isOldFunctionTypeMangling(llvm::StringRef mangledName) {

unittests/Basic/DemangleTest.cpp

@@ -29,4 +29,5 @@ TEST(Demangle, IsObjCSymbol) {
   EXPECT_EQ(true, isObjCSymbol(llvm::StringRef("_$SSo8NSNumberCMa")));
   EXPECT_EQ(false,
             isObjCSymbol(llvm::StringRef("_$S3pat7inlinedSo8NSNumberCvp")));
+  EXPECT_EQ(true, isObjCSymbol(llvm::StringRef("_$SSC3fooyS2d_SdtFTO")));
 }