From 7370e45fb480672bea6483876090c33df5f66228 Mon Sep 17 00:00:00 2001
From: Kazu Hirata <kazu@google.com>
Date: Fri, 24 Mar 2023 09:52:17 -0700
Subject: [PATCH] Fix warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

This patch fixes:

  clang/lib/Driver/ToolChains/OHOS.cpp:410:18: warning: unused
  variable ‘A’ [-Wunused-variable]

  clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp:293:15:
  warning: unused variable ‘II’ [-Wunused-variable]

  llvm/lib/ProfileData/RawMemProfReader.cpp:364:68: warning: suggest
  parentheses around ‘&&’ within ‘||’ [-Wparentheses]
---
 clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp | 2 +-
 clang/lib/Driver/ToolChains/OHOS.cpp                  | 2 +-
 llvm/lib/ProfileData/RawMemProfReader.cpp             | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
index 1e51d8f..5ca45f9 100644
--- a/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
+++ b/clang-tools-extra/clangd/refactor/tweaks/AddUsing.cpp
@@ -290,7 +290,7 @@ bool AddUsing::prepare(const Selection &Inputs) {
 
   SourceRange SpelledNameRange;
   if (auto *D = Node->ASTNode.get<DeclRefExpr>()) {
-    if (auto *II = D->getDecl()->getIdentifier()) {
+    if (D->getDecl()->getIdentifier()) {
       QualifierToRemove = D->getQualifierLoc();
       SpelledNameRange = D->getSourceRange();
       MustInsertAfterLoc = D->getDecl()->getBeginLoc();
diff --git a/clang/lib/Driver/ToolChains/OHOS.cpp b/clang/lib/Driver/ToolChains/OHOS.cpp
index bd0409d..d25c293 100644
--- a/clang/lib/Driver/ToolChains/OHOS.cpp
+++ b/clang/lib/Driver/ToolChains/OHOS.cpp
@@ -407,7 +407,7 @@ std::string OHOS::getArchSpecificLibPath() const {
 }
 
 ToolChain::UnwindLibType OHOS::GetUnwindLibType(const llvm::opt::ArgList &Args) const {
-  if (const Arg *A = Args.getLastArg(options::OPT_unwindlib_EQ))
+  if (Args.getLastArg(options::OPT_unwindlib_EQ))
     return Generic_ELF::GetUnwindLibType(Args);
   return GetDefaultUnwindLibType();
 }
diff --git a/llvm/lib/ProfileData/RawMemProfReader.cpp b/llvm/lib/ProfileData/RawMemProfReader.cpp
index 27df399..0c14ab4 100644
--- a/llvm/lib/ProfileData/RawMemProfReader.cpp
+++ b/llvm/lib/ProfileData/RawMemProfReader.cpp
@@ -360,10 +360,10 @@ Error RawMemProfReader::setupForSymbolization() {
     }
   }
   assert(NumMatched != 0 && "No matching executable segments in segment info.");
-  assert(PreferredTextSegmentAddress == 0 ||
-         (PreferredTextSegmentAddress == ProfiledTextSegmentStart) &&
-             "Expect text segment address to be 0 or equal to profiled text "
-             "segment start.");
+  assert((PreferredTextSegmentAddress == 0 ||
+          (PreferredTextSegmentAddress == ProfiledTextSegmentStart)) &&
+         "Expect text segment address to be 0 or equal to profiled text "
+         "segment start.");
   return Error::success();
 }
 
-- 
2.7.4