averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Demangle: Don’t use demangle_wrappers in the SwiftDemangle library.

Browse Source 
This avoids linking parts of the llvm utilities into the library.
It fixes an option-registere-more-than-once problem in the SwiftDemangle unit test.
rdar://problem/30503344
This commit is contained in:
Erik Eckstein
2017-02-16 09:59:21 -08:00
parent 863dfca3a2
commit b4c8f6bb15
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib/SwiftDemangle/SwiftDemangle.cpp
View File

@@ -15,27 +15,20 @@
//
//===----------------------------------------------------------------------===//
#include "swift/Basic/DemangleWrappers.h"
#include "swift/Basic/ManglingMacros.h"
#include "swift/Basic/Demangle.h"
#include "swift/SwiftDemangle/SwiftDemangle.h"
/// \returns true if \p MangledName starts with Swift prefix, "_T".
static bool isSwiftPrefixed(const char *MangledName) {
return MangledName[0] == '_' &&
(MangledName[1] == 'T' || MangledName[1] == MANGLING_PREFIX_STR[1]);
}
static size_t swift_demangle_getDemangledName_Options(const char *MangledName,
char *OutputBuffer, size_t Length,
swift::Demangle::DemangleOptions DemangleOptions) {
assert(MangledName != nullptr && "null input");
assert(OutputBuffer != nullptr || Length == 0);
if (!isSwiftPrefixed(MangledName))
if (!swift::Demangle::isSwiftSymbol(MangledName))
return 0; // Not a mangled name
std::string Result = swift::demangle_wrappers::demangleSymbolAsString(
MangledName, DemangleOptions);
std::string Result = swift::Demangle::demangleSymbolAsString(
llvm::StringRef(MangledName), DemangleOptions);
if (Result == MangledName)
return 0; // Not a mangled name