Skip to content

Commit 80519fb

Browse files
authored
Avoid using system isdigit in favor of swift::Mangle::isDigit (swiftlang#39382)
1 parent 9313efc commit 80519fb

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

lib/Demangling/Context.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "swift/Demangling/Demangler.h"
1818
#include "swift/Demangling/ManglingMacros.h"
19+
#include "swift/Demangling/ManglingUtils.h"
1920
#include "swift/Demangling/NamespaceMacros.h"
2021

2122
namespace swift {
@@ -76,7 +77,7 @@ std::string Context::demangleTypeAsString(llvm::StringRef MangledName,
7677
static llvm::StringRef stripSuffix(llvm::StringRef Name) {
7778
// A suffix always ends with a digit. Do this quick check to avoid scanning through the whole
7879
// symbol name if the symbol has no suffix (= the common case).
79-
if (isdigit(Name.back())) {
80+
if (swift::Mangle::isDigit(Name.back())) {
8081
size_t dotPos = Name.find('.');
8182
if (dotPos != StringRef::npos) {
8283
Name = Name.substr(0, dotPos);

lib/Demangling/OldRemangler.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1103,7 +1103,8 @@ void Remangler::mangleNamedEntity(Node *node, char basicKind,
11031103
Buffer << entityKind;
11041104

11051105
auto privateDiscriminator = ctx.takeAnonymousContextDiscriminator();
1106-
if (!privateDiscriminator.empty() && isdigit(privateDiscriminator[0]))
1106+
if (!privateDiscriminator.empty() &&
1107+
swift::Mangle::isDigit(privateDiscriminator[0]))
11071108
privateDiscriminator = "_" + privateDiscriminator;
11081109
if (!artificialPrivateDiscriminator.empty())
11091110
privateDiscriminator.append(artificialPrivateDiscriminator.data(),

0 commit comments

Comments
 (0)