replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[llvm-cxxfilt] Fix -Wshadow warning. NFCI. 

Local variable Decorated was shadowing the global variable Decorated

llvm-svn: 360352
This commit is contained in:
Simon Pilgrim 2019-05-09 15:58:16 +00:00
parent 4e62554bfa
commit 952391d8eb
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
llvm/tools/llvm-cxxfilt/llvm-cxxfilt.cpp
View File

@ -55,22 +55,23 @@ Decorated(cl::Positional, cl::desc("<mangled>"), cl::ZeroOrMore);
static std::string demangle(llvm::raw_ostream &OS, const std::string &Mangled) {
int Status;
const char *Decorated = Mangled.c_str();
const char *DecoratedStr = Mangled.c_str();
if (StripUnderscore)
if (Decorated[0] == '_')
++Decorated;
size_t DecoratedLength = strlen(Decorated);
if (DecoratedStr[0] == '_')
++DecoratedStr;
size_t DecoratedLength = strlen(DecoratedStr);
char *Undecorated = nullptr;
if (Types || ((DecoratedLength >= 2 && strncmp(Decorated, "_Z", 2) == 0) ||
(DecoratedLength >= 4 && strncmp(Decorated, "___Z", 4) == 0)))
Undecorated = itaniumDemangle(Decorated, nullptr, nullptr, &Status);
if (Types ||
((DecoratedLength >= 2 && strncmp(DecoratedStr, "_Z", 2) == 0) ||
(DecoratedLength >= 4 && strncmp(DecoratedStr, "___Z", 4) == 0)))
Undecorated = itaniumDemangle(DecoratedStr, nullptr, nullptr, &Status);
if (!Undecorated &&
(DecoratedLength > 6 && strncmp(Decorated, "__imp_", 6) == 0)) {
(DecoratedLength > 6 && strncmp(DecoratedStr, "__imp_", 6) == 0)) {
OS << "import thunk for ";
Undecorated = itaniumDemangle(Decorated + 6, nullptr, nullptr, &Status);
Undecorated = itaniumDemangle(DecoratedStr + 6, nullptr, nullptr, &Status);
}
std::string Result(Undecorated ? Undecorated : Mangled);