[llvm] r357653 - llvm-undname: Name a pair. No behavior change.

[Nico Weber via llvm-commits]

Author: nico
Date: Wed Apr  3 16:29:05 2019
New Revision: 357653

URL: http://llvm.org/viewvc/llvm-project?rev=357653&view=rev
Log:
llvm-undname: Name a pair. No behavior change.

Differential Revision: https://reviews.llvm.org/D60210

Modified:
    llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp

Modified: llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp?rev=357653&r1=357652&r2=357653&view=diff
==============================================================================
--- llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp (original)
+++ llvm/trunk/lib/Demangle/MicrosoftDemangle.cpp Wed Apr  3 16:29:05 2019
@@ -1327,8 +1327,10 @@ Demangler::demangleLocallyScopedNamePiec
 
   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::demangleLocallyScopedNamePiec
   OS << '`';
   Scope->output(OS, OF_Default);
   OS << '\'';
-  OS << "::`" << Number.first << "'";
+  OS << "::`" << Number << "'";
   OS << '\0';
   char *Result = OS.getBuffer();
   Identifier->Name = copyString(Result);