From d56ee6b546185ab91b0b3bd01858e720a8a4a63e Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Thu, 9 May 2019 15:58:16 +0000 Subject: [PATCH] [llvm-cxxfilt] Fix -Wshadow warning. NFCI. Local variable Decorated was shadowing the global variable Decorated git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@360352 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-cxxfilt/llvm-cxxfilt.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/llvm-cxxfilt/llvm-cxxfilt.cpp b/tools/llvm-cxxfilt/llvm-cxxfilt.cpp index a082dc7cfe8..eb84c3e8306 100644 --- a/tools/llvm-cxxfilt/llvm-cxxfilt.cpp +++ b/tools/llvm-cxxfilt/llvm-cxxfilt.cpp @@ -55,22 +55,23 @@ Decorated(cl::Positional, cl::desc(""), 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); -- 2.11.0