[Demangler] Adjust the implementation of isObjCSymbol().

Davide Italiano · Davide Italiano · commit e4d9813b40f9 · 2018-09-18T13:48:51.000-07:00
Pointed out by Jordan.
diff --git a/lib/Demangling/Demangler.cpp b/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) {
diff --git a/unittests/Basic/DemangleTest.cpp b/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")));
 }

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,9 @@ bool swift::Demangle::isSwiftSymbol(const char *mangledName) {`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`bool swift::Demangle::isObjCSymbol(llvm::StringRef mangledName) {`
`172`		`- return dropSwiftManglingPrefix(mangledName).startswith("So");`
	`172`	`+ StringRef nameWithoutPrefix = dropSwiftManglingPrefix(mangledName);`
	`173`	`+ return nameWithoutPrefix.startswith("So") \|\|`
	`174`	`+ nameWithoutPrefix.startswith("SC");`
`173`	`175`	`}`
`174`	`176`
`175`	`177`	`bool swift::Demangle::isOldFunctionTypeMangling(llvm::StringRef mangledName) {`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,5 @@ TEST(Demangle, IsObjCSymbol) {`
`29`	`29`	`EXPECT_EQ(true, isObjCSymbol(llvm::StringRef("_$SSo8NSNumberCMa")));`
`30`	`30`	`EXPECT_EQ(false,`
`31`	`31`	`isObjCSymbol(llvm::StringRef("_$S3pat7inlinedSo8NSNumberCvp")));`
	`32`	`+ EXPECT_EQ(true, isObjCSymbol(llvm::StringRef("_$SSC3fooyS2d_SdtFTO")));`
`32`	`33`	`}`