diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-04-03 23:29:05 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-04-03 23:29:05 +0000 |
| commit | c5615c232685dd9e94003781f8fb31f96f141231 (patch) | |
| tree | 8f69069b79b407f436761eab127807220e1efb6c /llvm/lib | |
| parent | 52cac4b79f97b1793ad06e503a5a62a24e06859c (diff) | |
| download | bcm5719-llvm-c5615c232685dd9e94003781f8fb31f96f141231.tar.gz bcm5719-llvm-c5615c232685dd9e94003781f8fb31f96f141231.zip | |
llvm-undname: Name a pair. No behavior change.
Differential Revision: https://reviews.llvm.org/D60210
llvm-svn: 357653
Diffstat (limited to 'llvm/lib')
| -rw-r--r-- | llvm/lib/Demangle/MicrosoftDemangle.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/llvm/lib/Demangle/MicrosoftDemangle.cpp b/llvm/lib/Demangle/MicrosoftDemangle.cpp index 49fa7324ef9..0704f7bac51 100644 --- a/llvm/lib/Demangle/MicrosoftDemangle.cpp +++ b/llvm/lib/Demangle/MicrosoftDemangle.cpp @@ -1327,8 +1327,10 @@ Demangler::demangleLocallyScopedNamePiece(StringView &MangledName) { NamedIdentifierNode *Identifier = Arena.alloc<NamedIdentifierNode>(); MangledName.consumeFront('?'); - auto Number = demangleNumber(MangledName); - assert(!Number.second); + uint64_t Number = 0; + bool IsNegative = false; + std::tie(Number, IsNegative) = demangleNumber(MangledName); + assert(!IsNegative); // One ? to terminate the number MangledName.consumeFront('?'); @@ -1346,7 +1348,7 @@ Demangler::demangleLocallyScopedNamePiece(StringView &MangledName) { OS << '`'; Scope->output(OS, OF_Default); OS << '\''; - OS << "::`" << Number.first << "'"; + OS << "::`" << Number << "'"; OS << '\0'; char *Result = OS.getBuffer(); Identifier->Name = copyString(Result); |
