diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/arch/arm/asm_support_arm.h | 18 | ||||
| -rw-r--r-- | runtime/arch/arm64/asm_support_arm64.h | 10 | ||||
| -rw-r--r-- | runtime/entrypoints/quick/quick_field_entrypoints.cc | 4 | ||||
| -rw-r--r-- | runtime/handle.cc | 2 | ||||
| -rw-r--r-- | runtime/interpreter/unstarted_runtime.cc | 1 |
5 files changed, 19 insertions, 16 deletions
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; |