commit 0d5ad57ae34bacbc4f5e5f42508d579bf39bb8cf
author Simon Pilgrim <llvm-dev@redking.me.uk> Fri Nov 08 22:30:12 2019 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Sat Nov 09 13:01:03 2019 +0000
tree b9f676a1e45f15609a8c0153a2a3fa2657f7c849
parent 092577e317229df600539f678064f321737a761b

Remarks - fix shadow variable warnings. NFCI.

Avoid conflict with llvm::remarks::Magic global variable.

llvm/lib/Remarks/BitstreamRemarkParser.cpp

diff --git a/llvm/lib/Remarks/BitstreamRemarkParser.cpp b/llvm/lib/Remarks/BitstreamRemarkParser.cpp
index 99a82e1..1cfde11 100644
--- a/llvm/lib/Remarks/BitstreamRemarkParser.cpp
+++ b/llvm/lib/Remarks/BitstreamRemarkParser.cpp
@@ -278,19 +278,20 @@
   return isBlock(Stream, META_BLOCK_ID);
 }
 
-static Error validateMagicNumber(StringRef Magic) {
-  if (Magic != remarks::ContainerMagic)
+static Error validateMagicNumber(StringRef MagicNumber) {
+  if (MagicNumber != remarks::ContainerMagic)
     return createStringError(std::make_error_code(std::errc::invalid_argument),
                              "Unknown magic number: expecting %s, got %.4s.",
-                             remarks::ContainerMagic.data(), Magic.data());
+                             remarks::ContainerMagic.data(), MagicNumber.data());
   return Error::success();
 }
 
 static Error advanceToMetaBlock(BitstreamParserHelper &Helper) {
-  Expected<std::array<char, 4>> Magic = Helper.parseMagic();
-  if (!Magic)
-    return Magic.takeError();
-  if (Error E = validateMagicNumber(StringRef(Magic->data(), Magic->size())))
+  Expected<std::array<char, 4>> MagicNumber = Helper.parseMagic();
+  if (!MagicNumber)
+    return MagicNumber.takeError();
+  if (Error E = validateMagicNumber(
+          StringRef(MagicNumber->data(), MagicNumber->size())))
     return E;
   if (Error E = Helper.parseBlockInfoBlock())
     return E;
@@ -309,11 +310,12 @@
     StringRef Buf, Optional<ParsedStringTable> StrTab,
     Optional<StringRef> ExternalFilePrependPath) {
   BitstreamParserHelper Helper(Buf);
-  Expected<std::array<char, 4>> Magic = Helper.parseMagic();
-  if (!Magic)
-    return Magic.takeError();
+  Expected<std::array<char, 4>> MagicNumber = Helper.parseMagic();
+  if (!MagicNumber)
+    return MagicNumber.takeError();
 
-  if (Error E = validateMagicNumber(StringRef(Magic->data(), Magic->size())))
+  if (Error E = validateMagicNumber(
+          StringRef(MagicNumber->data(), MagicNumber->size())))
     return std::move(E);
 
   auto Parser =

llvm/lib/Remarks/RemarkFormat.cpp

diff --git a/llvm/lib/Remarks/RemarkFormat.cpp b/llvm/lib/Remarks/RemarkFormat.cpp
index c7fce15..5006421 100644
--- a/llvm/lib/Remarks/RemarkFormat.cpp
+++ b/llvm/lib/Remarks/RemarkFormat.cpp
@@ -32,9 +32,9 @@
   return Result;
 }
 
-Expected<Format> llvm::remarks::magicToFormat(StringRef Magic) {
+Expected<Format> llvm::remarks::magicToFormat(StringRef MagicStr) {
   auto Result =
-      StringSwitch<Format>(Magic)
+      StringSwitch<Format>(MagicStr)
           .StartsWith("--- ", Format::YAML) // This is only an assumption.
           .StartsWith(remarks::Magic, Format::YAMLStrTab)
           .StartsWith(remarks::ContainerMagic, Format::Bitstream)
@@ -42,6 +42,6 @@
 
   if (Result == Format::Unknown)
     return createStringError(std::make_error_code(std::errc::invalid_argument),
-                             "Unknown remark magic: '%s'", Magic.data());
+                             "Unknown remark magic: '%s'", MagicStr.data());
   return Result;
 }