Fix bugprone-macro-parentheses clang-tidy issues

This CL also fixes a performance-unnecessary-copy-initialization issue which was present on the master branch and prevented m tidy-art to complete successfully.

Test: m tidy-art
Bug: 213953102
Change-Id: I821d797be4a866d9e1546e62bafa5a8bb0ac0578

9 files changed, 26 insertions, 22 deletions

diff --git a/build/Android.bp b/build/Android.bp
index d2545a401d..6b1330959d 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -30,6 +30,7 @@ bootstrap_go_package {
 art_clang_tidy_errors = [
     "android-cloexec-open",
     "bugprone-lambda-function-name",
+    "bugprone-macro-parentheses",
     "bugprone-unused-raii", // Protect scoped things like MutexLock.
     "bugprone-virtual-near-miss",
     "modernize-use-bool-literals",
diff --git a/build/art.go b/build/art.go
index 79149503c5..8272335b55 100644
--- a/build/art.go
+++ b/build/art.go
@@ -132,7 +132,7 @@ func deviceFlags(ctx android.LoadHookContext) []string {
 	)
 
 	cflags = append(cflags, "-DART_BASE_ADDRESS="+ctx.Config().LibartImgDeviceBaseAddress())
-	minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MIN_BASE_ADDRESS_DELTA", "-0x1000000")
+	minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MIN_BASE_ADDRESS_DELTA", "(-0x1000000)")
 	maxDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_TARGET_MAX_BASE_ADDRESS_DELTA", "0x1000000")
 	cflags = append(cflags, "-DART_BASE_ADDRESS_MIN_DELTA="+minDelta)
 	cflags = append(cflags, "-DART_BASE_ADDRESS_MAX_DELTA="+maxDelta)
@@ -154,7 +154,7 @@ func hostFlags(ctx android.LoadHookContext) []string {
 	)
 
 	cflags = append(cflags, "-DART_BASE_ADDRESS="+ctx.Config().LibartImgHostBaseAddress())
-	minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MIN_BASE_ADDRESS_DELTA", "-0x1000000")
+	minDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MIN_BASE_ADDRESS_DELTA", "(-0x1000000)")
 	maxDelta := ctx.Config().GetenvWithDefault("LIBART_IMG_HOST_MAX_BASE_ADDRESS_DELTA", "0x1000000")
 	cflags = append(cflags, "-DART_BASE_ADDRESS_MIN_DELTA="+minDelta)
 	cflags = append(cflags, "-DART_BASE_ADDRESS_MAX_DELTA="+maxDelta)
@@ -165,7 +165,7 @@ func hostFlags(ctx android.LoadHookContext) []string {
 	}
 
 	clang_path := filepath.Join(config.ClangDefaultBase, ctx.Config().PrebuiltOS(), config.ClangDefaultVersion)
-	cflags = append(cflags, "-DART_CLANG_PATH=\""+clang_path+"\"")
+	cflags = append(cflags, fmt.Sprintf("-DART_CLANG_PATH=\"%s\"", clang_path))
 
 	return cflags
 }
diff --git a/libartbase/base/metrics/metrics.h b/libartbase/base/metrics/metrics.h
index 4a1664ad24..197d69b1f5 100644
--- a/libartbase/base/metrics/metrics.h
+++ b/libartbase/base/metrics/metrics.h
@@ -116,7 +116,7 @@ enum class CompilationReason {
 #define REASON_NAME(kind, kind_name) \
     case CompilationReason::kind: return kind_name;
 #define REASON_FROM_NAME(kind, kind_name) \
-    if (name == kind_name) { return CompilationReason::kind; }
+    if (name == (kind_name)) { return CompilationReason::kind; }
 
 constexpr const char* CompilationReasonName(CompilationReason reason) {
   switch (reason) {
@@ -157,7 +157,7 @@ enum class CompilerFilterReporting {
 #define FILTER_NAME(kind, kind_name) \
     case CompilerFilterReporting::kind: return kind_name;
 #define FILTER_FROM_NAME(kind, kind_name) \
-    if (name == kind_name) { return CompilerFilterReporting::kind; }
+    if (name == (kind_name)) { return CompilerFilterReporting::kind; }
 
 constexpr const char* CompilerFilterReportingName(CompilerFilterReporting filter) {
   switch (filter) {
diff --git a/libnativeloader/native_loader_test.cpp b/libnativeloader/native_loader_test.cpp
index 9648713e70..7663f904d1 100644
--- a/libnativeloader/native_loader_test.cpp
+++ b/libnativeloader/native_loader_test.cpp
@@ -169,7 +169,7 @@ INSTANTIATE_TEST_SUITE_P(NativeLoaderTests, NativeLoaderTest, testing::Bool());
 
 std::string default_public_and_extended_libraries() {
   std::string public_libs = default_public_libraries();
-  std::string ext_libs = extended_public_libraries();
+  const std::string& ext_libs = extended_public_libraries();
   if (!ext_libs.empty()) {
     public_libs = public_libs + ":" + ext_libs;
   }
diff --git a/runtime/arch/arm/asm_support_arm.h b/runtime/arch/arm/asm_support_arm.h
index 5e3f85484a..a3d46c22d3 100644
--- a/runtime/arch/arm/asm_support_arm.h
+++ b/runtime/arch/arm/asm_support_arm.h
@@ -45,22 +45,22 @@
 
 // The offset of the reference load LDR from the return address in LR for field loads.
 #ifdef USE_HEAP_POISONING
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_WIDE_OFFSET -8
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_NARROW_OFFSET -4
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_WIDE_OFFSET (-8)
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_NARROW_OFFSET (-4)
 #else
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_WIDE_OFFSET -4
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_NARROW_OFFSET -2
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_WIDE_OFFSET (-4)
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_NARROW_OFFSET (-2)
 #endif
 // The offset of the reference load LDR from the return address in LR for array loads.
 #ifdef USE_HEAP_POISONING
-#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET -8
+#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET (-8)
 #else
-#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET -4
+#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET (-4)
 #endif
 // The offset of the reference load LDR from the return address in LR for GC root loads.
-#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_WIDE_OFFSET -8
-#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_NARROW_OFFSET -6
+#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_WIDE_OFFSET (-8)
+#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_NARROW_OFFSET (-6)
 // The offset of the MOV from the return address in LR for intrinsic CAS.
-#define BAKER_MARK_INTROSPECTION_INTRINSIC_CAS_MOV_OFFSET -8
+#define BAKER_MARK_INTROSPECTION_INTRINSIC_CAS_MOV_OFFSET (-8)
 
 #endif  // ART_RUNTIME_ARCH_ARM_ASM_SUPPORT_ARM_H_
diff --git a/runtime/arch/arm64/asm_support_arm64.h b/runtime/arch/arm64/asm_support_arm64.h
index 5a285a4d9d..983fe3a06f 100644
--- a/runtime/arch/arm64/asm_support_arm64.h
+++ b/runtime/arch/arm64/asm_support_arm64.h
@@ -40,17 +40,17 @@
 
 // The offset of the reference load LDR from the return address in LR for field loads.
 #ifdef USE_HEAP_POISONING
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_OFFSET -8
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_OFFSET (-8)
 #else
-#define BAKER_MARK_INTROSPECTION_FIELD_LDR_OFFSET -4
+#define BAKER_MARK_INTROSPECTION_FIELD_LDR_OFFSET (-4)
 #endif
 // The offset of the reference load LDR from the return address in LR for array loads.
 #ifdef USE_HEAP_POISONING
-#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET -8
+#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET (-8)
 #else
-#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET -4
+#define BAKER_MARK_INTROSPECTION_ARRAY_LDR_OFFSET (-4)
 #endif
 // The offset of the reference load LDR from the return address in LR for GC root loads.
-#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_OFFSET -8
+#define BAKER_MARK_INTROSPECTION_GC_ROOT_LDR_OFFSET (-8)
 
 #endif  // ART_RUNTIME_ARCH_ARM64_ASM_SUPPORT_ARM64_H_
diff --git a/runtime/entrypoints/quick/quick_field_entrypoints.cc b/runtime/entrypoints/quick/quick_field_entrypoints.cc
index d32aa39996..e7b362339a 100644
--- a/runtime/entrypoints/quick/quick_field_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_field_entrypoints.cc
@@ -175,7 +175,7 @@ static ArtMethod* GetReferrer(Thread* self) REQUIRES_SHARED(Locks::mutator_lock_
         return -1;                                                             \
       }                                                                        \
     }                                                                          \
-    if (!referrer->SkipAccessChecks() && IsObject && new_value != 0) {         \
+    if (!referrer->SkipAccessChecks() && (IsObject) && new_value != 0) {       \
       StackArtFieldHandleScope<1> rhs(self);                                   \
       ReflectiveHandle<ArtField> field_handle(rhs.NewHandle(field));           \
       if (field->ResolveType().IsNull()) {                                     \
@@ -223,7 +223,7 @@ static ArtMethod* GetReferrer(Thread* self) REQUIRES_SHARED(Locks::mutator_lock_
         return -1;                                                             \
       }                                                                        \
     }                                                                          \
-    if (!referrer->SkipAccessChecks() && IsObject && new_value != 0) {         \
+    if (!referrer->SkipAccessChecks() && (IsObject) && new_value != 0) {       \
       StackArtFieldHandleScope<1> rhs(self);                                   \
       ReflectiveHandle<ArtField> field_handle(rhs.NewHandle(field));           \
       if (field->ResolveType().IsNull()) {                                     \
diff --git a/runtime/handle.cc b/runtime/handle.cc
index af77e2362b..e9c91135f5 100644
--- a/runtime/handle.cc
+++ b/runtime/handle.cc
@@ -42,6 +42,7 @@
 
 namespace art {
 
+// NOLINTBEGIN(bugprone-macro-parentheses)
 #define MAKE_OBJECT_FOR_GDB(ROOT, NAME, MIRROR)                 \
   template <> MIRROR* Handle<MIRROR>::GetFromGdb() {            \
     return Get();                                               \
@@ -53,5 +54,6 @@ namespace art {
 CLASS_MIRROR_ROOT_LIST(MAKE_OBJECT_FOR_GDB)
 
 #undef MAKE_OBJECT_FOR_GDB
+// NOLINTEND(bugprone-macro-parentheses)
 
 }  // namespace art
diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc
index 62051ee9db..cec6f1dc8d 100644
--- a/runtime/interpreter/unstarted_runtime.cc
+++ b/runtime/interpreter/unstarted_runtime.cc
@@ -2163,6 +2163,7 @@ using JNIHandler = void(*)(Thread* self,
                            uint32_t* args,
                            JValue* result);
 
+// NOLINTNEXTLINE
 #define ONE_PLUS(ShortNameIgnored, DescriptorIgnored, NameIgnored, SignatureIgnored) 1 +
 static constexpr size_t kInvokeHandlersSize = UNSTARTED_RUNTIME_DIRECT_LIST(ONE_PLUS) 0;
 static constexpr size_t kJniHandlersSize = UNSTARTED_RUNTIME_JNI_LIST(ONE_PLUS) 0;