diff options
25 files changed, 94 insertions, 82 deletions
diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index 4a98342bfc..951b07585c 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -606,13 +606,13 @@ const DexFileMethodInliner::IntrinsicDef DexFileMethodInliner::kIntrinsicMethods INTRINSIC(SunMiscUnsafe, Get ## type, ObjectJ_ ## code, kIntrinsicUnsafeGet, \ type_flags), \ INTRINSIC(SunMiscUnsafe, Get ## type ## Volatile, ObjectJ_ ## code, kIntrinsicUnsafeGet, \ - type_flags | kIntrinsicFlagIsVolatile), \ + (type_flags) | kIntrinsicFlagIsVolatile), \ INTRINSIC(SunMiscUnsafe, Put ## type, ObjectJ ## code ## _V, kIntrinsicUnsafePut, \ type_flags), \ INTRINSIC(SunMiscUnsafe, Put ## type ## Volatile, ObjectJ ## code ## _V, kIntrinsicUnsafePut, \ - type_flags | kIntrinsicFlagIsVolatile), \ + (type_flags) | kIntrinsicFlagIsVolatile), \ INTRINSIC(SunMiscUnsafe, PutOrdered ## type, ObjectJ ## code ## _V, kIntrinsicUnsafePut, \ - type_flags | kIntrinsicFlagIsOrdered) + (type_flags) | kIntrinsicFlagIsOrdered) UNSAFE_GET_PUT(Int, I, kIntrinsicFlagNone), UNSAFE_GET_PUT(Long, J, kIntrinsicFlagIsLong), diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc index 8da9f06dd9..140db0c56c 100644 --- a/compiler/oat_writer.cc +++ b/compiler/oat_writer.cc @@ -1413,8 +1413,8 @@ size_t OatWriter::InitOatCode(size_t offset) { offset = CompiledCode::AlignCode(offset, instruction_set); \ adjusted_offset = offset + CompiledCode::CodeDelta(instruction_set); \ oat_header_->Set ## fn_name ## Offset(adjusted_offset); \ - field = compiler_driver_->Create ## fn_name(); \ - offset += field->size(); + (field) = compiler_driver_->Create ## fn_name(); \ + offset += (field)->size(); DO_TRAMPOLINE(jni_dlsym_lookup_, JniDlsymLookup); DO_TRAMPOLINE(quick_generic_jni_trampoline_, QuickGenericJniTrampoline); @@ -1526,8 +1526,8 @@ bool OatWriter::WriteCode(OutputStream* out) { if (kIsDebugBuild) { uint32_t size_total = 0; #define DO_STAT(x) \ - VLOG(compiler) << #x "=" << PrettySize(x) << " (" << x << "B)"; \ - size_total += x; + VLOG(compiler) << #x "=" << PrettySize(x) << " (" << (x) << "B)"; \ + size_total += (x); DO_STAT(size_dex_file_alignment_); DO_STAT(size_executable_offset_alignment_); @@ -1683,12 +1683,12 @@ size_t OatWriter::WriteCode(OutputStream* out, const size_t file_offset, size_t uint32_t alignment_padding = aligned_offset - relative_offset; \ out->Seek(alignment_padding, kSeekCurrent); \ size_trampoline_alignment_ += alignment_padding; \ - if (!WriteData(out, field->data(), field->size())) { \ + if (!WriteData(out, (field)->data(), (field)->size())) { \ PLOG(ERROR) << "Failed to write " # field " to " << out->GetLocation(); \ return false; \ } \ - size_ ## field += field->size(); \ - relative_offset += alignment_padding + field->size(); \ + size_ ## field += (field)->size(); \ + relative_offset += alignment_padding + (field)->size(); \ DCHECK_OFFSET(); \ } while (false) diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index e0106628c6..7ddd677fd0 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -59,7 +59,8 @@ static constexpr DRegister DTMP = D31; static constexpr uint32_t kPackedSwitchCompareJumpThreshold = 7; -#define __ down_cast<ArmAssembler*>(codegen->GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<ArmAssembler*>(codegen->GetAssembler())-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kArmWordSize, x).Int32Value() class NullCheckSlowPathARM : public SlowPathCode { @@ -674,7 +675,8 @@ class ReadBarrierForRootSlowPathARM : public SlowPathCode { }; #undef __ -#define __ down_cast<ArmAssembler*>(GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<ArmAssembler*>(GetAssembler())-> // NOLINT inline Condition ARMCondition(IfCondition cond) { switch (cond) { diff --git a/compiler/optimizing/code_generator_arm64.cc b/compiler/optimizing/code_generator_arm64.cc index 261c04f062..362957bb31 100644 --- a/compiler/optimizing/code_generator_arm64.cc +++ b/compiler/optimizing/code_generator_arm64.cc @@ -132,7 +132,8 @@ Location InvokeRuntimeCallingConvention::GetReturnLocation(Primitive::Type retur return ARM64ReturnLocation(return_type); } -#define __ down_cast<CodeGeneratorARM64*>(codegen)->GetVIXLAssembler()-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<CodeGeneratorARM64*>(codegen)->GetVIXLAssembler()-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kArm64WordSize, x).Int32Value() // Calculate memory accessing operand for save/restore live registers. diff --git a/compiler/optimizing/code_generator_mips.cc b/compiler/optimizing/code_generator_mips.cc index fb50680c91..c3f425ac0d 100644 --- a/compiler/optimizing/code_generator_mips.cc +++ b/compiler/optimizing/code_generator_mips.cc @@ -141,7 +141,8 @@ Location InvokeRuntimeCallingConvention::GetReturnLocation(Primitive::Type type) return MipsReturnLocation(type); } -#define __ down_cast<CodeGeneratorMIPS*>(codegen)->GetAssembler()-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<CodeGeneratorMIPS*>(codegen)->GetAssembler()-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kMipsWordSize, x).Int32Value() class BoundsCheckSlowPathMIPS : public SlowPathCodeMIPS { @@ -478,7 +479,8 @@ CodeGeneratorMIPS::CodeGeneratorMIPS(HGraph* graph, } #undef __ -#define __ down_cast<MipsAssembler*>(GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<MipsAssembler*>(GetAssembler())-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kMipsWordSize, x).Int32Value() void CodeGeneratorMIPS::Finalize(CodeAllocator* allocator) { diff --git a/compiler/optimizing/code_generator_mips64.cc b/compiler/optimizing/code_generator_mips64.cc index e67d8d0dc5..bb6df500cd 100644 --- a/compiler/optimizing/code_generator_mips64.cc +++ b/compiler/optimizing/code_generator_mips64.cc @@ -102,7 +102,8 @@ Location InvokeRuntimeCallingConvention::GetReturnLocation(Primitive::Type type) return Mips64ReturnLocation(type); } -#define __ down_cast<CodeGeneratorMIPS64*>(codegen)->GetAssembler()-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<CodeGeneratorMIPS64*>(codegen)->GetAssembler()-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kMips64DoublewordSize, x).Int32Value() class BoundsCheckSlowPathMIPS64 : public SlowPathCodeMIPS64 { @@ -424,7 +425,8 @@ CodeGeneratorMIPS64::CodeGeneratorMIPS64(HGraph* graph, } #undef __ -#define __ down_cast<Mips64Assembler*>(GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<Mips64Assembler*>(GetAssembler())-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kMips64DoublewordSize, x).Int32Value() void CodeGeneratorMIPS64::Finalize(CodeAllocator* allocator) { diff --git a/compiler/optimizing/code_generator_x86.cc b/compiler/optimizing/code_generator_x86.cc index 50892a9d48..eece18929c 100644 --- a/compiler/optimizing/code_generator_x86.cc +++ b/compiler/optimizing/code_generator_x86.cc @@ -47,7 +47,8 @@ static constexpr int kC2ConditionMask = 0x400; static constexpr int kFakeReturnRegister = Register(8); -#define __ down_cast<X86Assembler*>(codegen->GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<X86Assembler*>(codegen->GetAssembler())-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kX86WordSize, x).Int32Value() class NullCheckSlowPathX86 : public SlowPathCode { @@ -691,7 +692,8 @@ class ReadBarrierForRootSlowPathX86 : public SlowPathCode { }; #undef __ -#define __ down_cast<X86Assembler*>(GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<X86Assembler*>(GetAssembler())-> /* NOLINT */ inline Condition X86Condition(IfCondition cond) { switch (cond) { diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index 56c5b06945..cd040641a6 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -51,7 +51,8 @@ static constexpr FloatRegister kFpuCalleeSaves[] = { XMM12, XMM13, XMM14, XMM15 static constexpr int kC2ConditionMask = 0x400; -#define __ down_cast<X86_64Assembler*>(codegen->GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<X86_64Assembler*>(codegen->GetAssembler())-> // NOLINT #define QUICK_ENTRY_POINT(x) QUICK_ENTRYPOINT_OFFSET(kX86_64WordSize, x).Int32Value() class NullCheckSlowPathX86_64 : public SlowPathCode { @@ -710,7 +711,8 @@ class ReadBarrierForRootSlowPathX86_64 : public SlowPathCode { }; #undef __ -#define __ down_cast<X86_64Assembler*>(GetAssembler())-> +// NOLINT on __ macro to suppress wrong warning/fix from clang-tidy. +#define __ down_cast<X86_64Assembler*>(GetAssembler())-> // NOLINT inline Condition X86_64IntegerCondition(IfCondition cond) { switch (cond) { diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index 214250f337..83a512738b 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -165,7 +165,7 @@ public: \ void Set##name() { SetBit(k##name); } \ bool Get##name() const { return IsBitSet(k##name); } \ private: \ -static constexpr size_t k##name = bit + kNumberOfGenericOptimizations +static constexpr size_t k##name = (bit) + kNumberOfGenericOptimizations class StringEqualsOptimizations : public IntrinsicOptimizations { public: diff --git a/runtime/arch/x86_64/asm_support_x86_64.h b/runtime/arch/x86_64/asm_support_x86_64.h index eddd17206c..48bec73239 100644 --- a/runtime/arch/x86_64/asm_support_x86_64.h +++ b/runtime/arch/x86_64/asm_support_x86_64.h @@ -19,8 +19,8 @@ #include "asm_support.h" -#define FRAME_SIZE_SAVE_ALL_CALLEE_SAVE 64 + 4*8 -#define FRAME_SIZE_REFS_ONLY_CALLEE_SAVE 64 + 4*8 -#define FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE 176 + 4*8 +#define FRAME_SIZE_SAVE_ALL_CALLEE_SAVE (64 + 4*8) +#define FRAME_SIZE_REFS_ONLY_CALLEE_SAVE (64 + 4*8) +#define FRAME_SIZE_REFS_AND_ARGS_CALLEE_SAVE (176 + 4*8) #endif // ART_RUNTIME_ARCH_X86_64_ASM_SUPPORT_X86_64_H_ diff --git a/runtime/art_field-inl.h b/runtime/art_field-inl.h index d91149701e..98d33453e2 100644 --- a/runtime/art_field-inl.h +++ b/runtime/art_field-inl.h @@ -122,21 +122,21 @@ inline void ArtField::SetObj(mirror::Object* object, mirror::Object* new_value) #define FIELD_GET(object, type) \ DCHECK_EQ(Primitive::kPrim ## type, GetTypeAsPrimitiveType()) << PrettyField(this); \ - DCHECK(object != nullptr) << PrettyField(this); \ - DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); \ + DCHECK((object) != nullptr) << PrettyField(this); \ + DCHECK(!IsStatic() || ((object) == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); \ if (UNLIKELY(IsVolatile())) { \ - return object->GetField ## type ## Volatile(GetOffset()); \ + return (object)->GetField ## type ## Volatile(GetOffset()); \ } \ - return object->GetField ## type(GetOffset()); + return (object)->GetField ## type(GetOffset()); #define FIELD_SET(object, type, value) \ DCHECK_EQ(Primitive::kPrim ## type, GetTypeAsPrimitiveType()) << PrettyField(this); \ - DCHECK(object != nullptr) << PrettyField(this); \ - DCHECK(!IsStatic() || (object == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); \ + DCHECK((object) != nullptr) << PrettyField(this); \ + DCHECK(!IsStatic() || ((object) == GetDeclaringClass()) || !Runtime::Current()->IsStarted()); \ if (UNLIKELY(IsVolatile())) { \ - object->SetField ## type ## Volatile<kTransactionActive>(GetOffset(), value); \ + (object)->SetField ## type ## Volatile<kTransactionActive>(GetOffset(), value); \ } else { \ - object->SetField ## type<kTransactionActive>(GetOffset(), value); \ + (object)->SetField ## type<kTransactionActive>(GetOffset(), value); \ } inline uint8_t ArtField::GetBoolean(mirror::Object* object) { diff --git a/runtime/asm_support.h b/runtime/asm_support.h index 21725d3279..8eb3742b61 100644 --- a/runtime/asm_support.h +++ b/runtime/asm_support.h @@ -396,10 +396,10 @@ ADD_TEST_EQ(THREAD_SUSPEND_REQUEST, static_cast<int32_t>(art::kSuspendRequest)) #define THREAD_CHECKPOINT_REQUEST 2 ADD_TEST_EQ(THREAD_CHECKPOINT_REQUEST, static_cast<int32_t>(art::kCheckpointRequest)) -#define JIT_CHECK_OSR -1 +#define JIT_CHECK_OSR (-1) ADD_TEST_EQ(JIT_CHECK_OSR, static_cast<int32_t>(art::jit::kJitCheckForOSR)) -#define JIT_HOTNESS_DISABLE -2 +#define JIT_HOTNESS_DISABLE (-2) ADD_TEST_EQ(JIT_HOTNESS_DISABLE, static_cast<int32_t>(art::jit::kJitHotnessDisabled)) #if defined(__cplusplus) diff --git a/runtime/base/logging.h b/runtime/base/logging.h index 3b5b8b54a5..41a1aee6d1 100644 --- a/runtime/base/logging.h +++ b/runtime/base/logging.h @@ -140,11 +140,11 @@ extern const char* ProgramInvocationShortName(); // Helper for CHECK_STRxx(s1,s2) macros. #define CHECK_STROP(s1, s2, sense) \ - if (UNLIKELY((strcmp(s1, s2) == 0) != sense)) \ + if (UNLIKELY((strcmp(s1, s2) == 0) != (sense))) \ LOG(::art::FATAL) << "Check failed: " \ - << "\"" << s1 << "\"" \ - << (sense ? " == " : " != ") \ - << "\"" << s2 << "\"" + << "\"" << (s1) << "\"" \ + << ((sense) ? " == " : " != ") \ + << "\"" << (s2) << "\"" // Check for string (const char*) equality between s1 and s2, LOG(FATAL) if not. #define CHECK_STREQ(s1, s2) CHECK_STROP(s1, s2, true) @@ -156,7 +156,7 @@ extern const char* ProgramInvocationShortName(); int rc = call args; \ if (rc != 0) { \ errno = rc; \ - PLOG(::art::FATAL) << # call << " failed for " << what; \ + PLOG(::art::FATAL) << # call << " failed for " << (what); \ } \ } while (false) diff --git a/runtime/base/macros.h b/runtime/base/macros.h index 7a293c7a08..3c43253e67 100644 --- a/runtime/base/macros.h +++ b/runtime/base/macros.h @@ -75,7 +75,7 @@ template<typename T> ART_FRIEND_TEST(test_set_name, individual_test) ALWAYS_INLINE void* operator new(size_t, void* ptr) noexcept { return ptr; } \ ALWAYS_INLINE void operator delete(void*, void*) noexcept { } \ private: \ - void* operator new(size_t) = delete + void* operator new(size_t) = delete // NOLINT // The arraysize(arr) macro returns the # of elements in an array arr. // The expression is a compile-time constant, and therefore can be @@ -135,7 +135,7 @@ char (&ArraySizeHelper(T (&array)[N]))[N]; #define ARRAYSIZE_UNSAFE(a) \ ((sizeof(a) / sizeof(*(a))) / static_cast<size_t>(!(sizeof(a) % sizeof(*(a))))) -#define SIZEOF_MEMBER(t, f) sizeof((reinterpret_cast<t*>(4096))->f) +#define SIZEOF_MEMBER(t, f) sizeof((reinterpret_cast<t*>(4096))->f) // NOLINT #define OFFSETOF_MEMBER(t, f) \ (reinterpret_cast<uintptr_t>(&reinterpret_cast<t*>(16)->f) - static_cast<uintptr_t>(16u)) // NOLINT diff --git a/runtime/base/mutex.cc b/runtime/base/mutex.cc index 620bf9c8b7..71b238ba73 100644 --- a/runtime/base/mutex.cc +++ b/runtime/base/mutex.cc @@ -971,7 +971,7 @@ void Locks::Init() { instrument_entrypoints_lock_ = new Mutex("instrument entrypoint lock", current_lock_level); #define UPDATE_CURRENT_LOCK_LEVEL(new_level) \ - if (new_level >= current_lock_level) { \ + if ((new_level) >= current_lock_level) { \ /* Do not use CHECKs or FATAL here, abort_lock_ is not setup yet. */ \ fprintf(stderr, "New local level %d is not less than current level %d\n", \ new_level, current_lock_level); \ diff --git a/runtime/check_jni.cc b/runtime/check_jni.cc index beabce36fb..3e836fda81 100644 --- a/runtime/check_jni.cc +++ b/runtime/check_jni.cc @@ -2427,19 +2427,20 @@ class CheckJNI { Primitive::kPrimDouble)); } +// NOLINT added to avoid wrong warning/fix from clang-tidy. #define PRIMITIVE_ARRAY_FUNCTIONS(ctype, name, ptype) \ - static ctype* Get##name##ArrayElements(JNIEnv* env, ctype##Array array, jboolean* is_copy) { \ - return reinterpret_cast<ctype*>( \ + static ctype* Get##name##ArrayElements(JNIEnv* env, ctype##Array array, jboolean* is_copy) { /* NOLINT */ \ + return reinterpret_cast<ctype*>( /* NOLINT */ \ GetPrimitiveArrayElements(__FUNCTION__, ptype, env, array, is_copy)); \ } \ \ - static void Release##name##ArrayElements(JNIEnv* env, ctype##Array array, ctype* elems, \ + static void Release##name##ArrayElements(JNIEnv* env, ctype##Array array, ctype* elems, /* NOLINT */ \ jint mode) { \ ReleasePrimitiveArrayElements(__FUNCTION__, ptype, env, array, elems, mode); \ } \ \ static void Get##name##ArrayRegion(JNIEnv* env, ctype##Array array, jsize start, jsize len, \ - ctype* buf) { \ + ctype* buf) { /* NOLINT */ \ GetPrimitiveArrayRegion(__FUNCTION__, ptype, env, array, start, len, buf); \ } \ \ diff --git a/runtime/dex_file_verifier.cc b/runtime/dex_file_verifier.cc index bbffbbb7b7..88eca44a29 100644 --- a/runtime/dex_file_verifier.cc +++ b/runtime/dex_file_verifier.cc @@ -101,31 +101,31 @@ const DexFile::MethodId* DexFileVerifier::CheckLoadMethodId(uint32_t idx, const } // Helper macro to load string and return false on error. -#define LOAD_STRING(var, idx, error) \ - const char* var = CheckLoadStringByIdx(idx, error); \ - if (UNLIKELY(var == nullptr)) { \ - return false; \ +#define LOAD_STRING(var, idx, error) \ + const char* (var) = CheckLoadStringByIdx(idx, error); \ + if (UNLIKELY((var) == nullptr)) { \ + return false; \ } // Helper macro to load string by type idx and return false on error. -#define LOAD_STRING_BY_TYPE(var, type_idx, error) \ - const char* var = CheckLoadStringByTypeIdx(type_idx, error); \ - if (UNLIKELY(var == nullptr)) { \ - return false; \ +#define LOAD_STRING_BY_TYPE(var, type_idx, error) \ + const char* (var) = CheckLoadStringByTypeIdx(type_idx, error); \ + if (UNLIKELY((var) == nullptr)) { \ + return false; \ } // Helper macro to load method id. Return last parameter on error. -#define LOAD_METHOD(var, idx, error_string, error_stmt) \ - const DexFile::MethodId* var = CheckLoadMethodId(idx, error_string); \ - if (UNLIKELY(var == nullptr)) { \ - error_stmt; \ +#define LOAD_METHOD(var, idx, error_string, error_stmt) \ + const DexFile::MethodId* (var) = CheckLoadMethodId(idx, error_string); \ + if (UNLIKELY((var) == nullptr)) { \ + error_stmt; \ } // Helper macro to load method id. Return last parameter on error. -#define LOAD_FIELD(var, idx, fmt, error_stmt) \ - const DexFile::FieldId* var = CheckLoadFieldId(idx, fmt); \ - if (UNLIKELY(var == nullptr)) { \ - error_stmt; \ +#define LOAD_FIELD(var, idx, fmt, error_stmt) \ + const DexFile::FieldId* (var) = CheckLoadFieldId(idx, fmt); \ + if (UNLIKELY((var) == nullptr)) { \ + error_stmt; \ } bool DexFileVerifier::Verify(const DexFile* dex_file, const uint8_t* begin, size_t size, diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc index 3f621249c5..300e618c82 100644 --- a/runtime/dex_instruction.cc +++ b/runtime/dex_instruction.cc @@ -69,11 +69,11 @@ int const Instruction::kInstructionVerifyFlags[] = { int const Instruction::kInstructionSizeInCodeUnits[] = { #define INSTRUCTION_SIZE(opcode, c, p, format, r, i, a, v) \ - ((opcode == NOP) ? -1 : \ - ((format >= k10x) && (format <= k10t)) ? 1 : \ - ((format >= k20t) && (format <= k25x)) ? 2 : \ - ((format >= k32x) && (format <= k3rc)) ? 3 : \ - (format == k51l) ? 5 : -1), + (((opcode) == NOP) ? -1 : \ + (((format) >= k10x) && ((format) <= k10t)) ? 1 : \ + (((format) >= k20t) && ((format) <= k25x)) ? 2 : \ + (((format) >= k32x) && ((format) <= k3rc)) ? 3 : \ + ((format) == k51l) ? 5 : -1), #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_SIZE) #undef DEX_INSTRUCTION_LIST diff --git a/runtime/dex_instruction.h b/runtime/dex_instruction.h index 035230eb8c..89c3db6223 100644 --- a/runtime/dex_instruction.h +++ b/runtime/dex_instruction.h @@ -80,7 +80,7 @@ class Instruction { }; enum Code { // private marker to avoid generate-operator-out.py from processing. -#define INSTRUCTION_ENUM(opcode, cname, p, f, r, i, a, v) cname = opcode, +#define INSTRUCTION_ENUM(opcode, cname, p, f, r, i, a, v) cname = (opcode), #include "dex_instruction_list.h" DEX_INSTRUCTION_LIST(INSTRUCTION_ENUM) #undef DEX_INSTRUCTION_LIST diff --git a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc index 4e4f8510ec..c3b3ac0603 100644 --- a/runtime/entrypoints/quick/quick_alloc_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_alloc_entrypoints.cc @@ -32,7 +32,7 @@ extern "C" mirror::Object* artAllocObjectFromCode ##suffix##suffix2( \ uint32_t type_idx, ArtMethod* method, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ ScopedQuickEntrypointChecks sqec(self); \ - if (kUseTlabFastPath && !instrumented_bool && allocator_type == gc::kAllocatorTypeTLAB) { \ + if (kUseTlabFastPath && !(instrumented_bool) && (allocator_type) == gc::kAllocatorTypeTLAB) { \ mirror::Class* klass = method->GetDexCacheResolvedType<false>(type_idx, sizeof(void*)); \ if (LIKELY(klass != nullptr && klass->IsInitialized() && !klass->IsFinalizable())) { \ size_t byte_count = klass->GetObjectSize(); \ @@ -59,7 +59,7 @@ extern "C" mirror::Object* artAllocObjectFromCodeResolved##suffix##suffix2( \ mirror::Class* klass, ArtMethod* method ATTRIBUTE_UNUSED, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ ScopedQuickEntrypointChecks sqec(self); \ - if (kUseTlabFastPath && !instrumented_bool && allocator_type == gc::kAllocatorTypeTLAB) { \ + if (kUseTlabFastPath && !(instrumented_bool) && (allocator_type) == gc::kAllocatorTypeTLAB) { \ if (LIKELY(klass->IsInitialized())) { \ size_t byte_count = klass->GetObjectSize(); \ byte_count = RoundUp(byte_count, gc::space::BumpPointerSpace::kAlignment); \ @@ -85,7 +85,7 @@ extern "C" mirror::Object* artAllocObjectFromCodeInitialized##suffix##suffix2( \ mirror::Class* klass, ArtMethod* method ATTRIBUTE_UNUSED, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ ScopedQuickEntrypointChecks sqec(self); \ - if (kUseTlabFastPath && !instrumented_bool && allocator_type == gc::kAllocatorTypeTLAB) { \ + if (kUseTlabFastPath && !(instrumented_bool) && (allocator_type) == gc::kAllocatorTypeTLAB) { \ size_t byte_count = klass->GetObjectSize(); \ byte_count = RoundUp(byte_count, gc::space::BumpPointerSpace::kAlignment); \ mirror::Object* obj; \ @@ -136,7 +136,7 @@ extern "C" mirror::Array* artCheckAndAllocArrayFromCode##suffix##suffix2( \ uint32_t type_idx, int32_t component_count, ArtMethod* method, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ ScopedQuickEntrypointChecks sqec(self); \ - if (!instrumented_bool) { \ + if (!(instrumented_bool)) { \ return CheckAndAllocArrayFromCode(type_idx, component_count, method, self, false, allocator_type); \ } else { \ return CheckAndAllocArrayFromCodeInstrumented(type_idx, component_count, method, self, false, allocator_type); \ @@ -146,7 +146,7 @@ extern "C" mirror::Array* artCheckAndAllocArrayFromCodeWithAccessCheck##suffix## uint32_t type_idx, int32_t component_count, ArtMethod* method, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ ScopedQuickEntrypointChecks sqec(self); \ - if (!instrumented_bool) { \ + if (!(instrumented_bool)) { \ return CheckAndAllocArrayFromCode(type_idx, component_count, method, self, true, allocator_type); \ } else { \ return CheckAndAllocArrayFromCodeInstrumented(type_idx, component_count, method, self, true, allocator_type); \ @@ -170,7 +170,7 @@ extern "C" mirror::String* artAllocStringFromCharsFromCode##suffix##suffix2( \ return mirror::String::AllocFromCharArray<instrumented_bool>(self, char_count, handle_array, \ offset, allocator_type); \ } \ -extern "C" mirror::String* artAllocStringFromStringFromCode##suffix##suffix2( \ +extern "C" mirror::String* artAllocStringFromStringFromCode##suffix##suffix2( /* NOLINT */ \ mirror::String* string, Thread* self) \ SHARED_REQUIRES(Locks::mutator_lock_) { \ StackHandleScope<1> hs(self); \ diff --git a/runtime/gc/space/malloc_space.h b/runtime/gc/space/malloc_space.h index 4e56c4a429..c6b28706a6 100644 --- a/runtime/gc/space/malloc_space.h +++ b/runtime/gc/space/malloc_space.h @@ -39,7 +39,7 @@ class ZygoteSpace; int rc = call args; \ if (UNLIKELY(rc != 0)) { \ errno = rc; \ - PLOG(FATAL) << # call << " failed for " << what; \ + PLOG(FATAL) << # call << " failed for " << (what); \ } \ } while (false) diff --git a/runtime/jni_internal.cc b/runtime/jni_internal.cc index 7bd85ec040..8cdf96de8f 100644 --- a/runtime/jni_internal.cc +++ b/runtime/jni_internal.cc @@ -301,13 +301,13 @@ static JavaVMExt* JavaVmExtFromEnv(JNIEnv* env) { CHECK_NON_NULL_ARGUMENT_FN_NAME(__FUNCTION__, value, return_val) #define CHECK_NON_NULL_ARGUMENT_FN_NAME(name, value, return_val) \ - if (UNLIKELY(value == nullptr)) { \ + if (UNLIKELY((value) == nullptr)) { \ JavaVmExtFromEnv(env)->JniAbortF(name, #value " == null"); \ return return_val; \ } #define CHECK_NON_NULL_MEMCPY_ARGUMENT(length, value) \ - if (UNLIKELY(length != 0 && value == nullptr)) { \ + if (UNLIKELY((length) != 0 && (value) == nullptr)) { \ JavaVmExtFromEnv(env)->JniAbortF(__FUNCTION__, #value " == null"); \ return; \ } diff --git a/runtime/lambda/shorty_field_type.h b/runtime/lambda/shorty_field_type.h index 46ddaa9ab3..c314fd2ac3 100644 --- a/runtime/lambda/shorty_field_type.h +++ b/runtime/lambda/shorty_field_type.h @@ -391,7 +391,7 @@ struct ShortyFieldTypeTraits { private: #define IS_VALID_TYPE_SPECIALIZATION(type, name) \ - static inline constexpr bool Is ## name ## TypeImpl(type* const = 0) { \ + static inline constexpr bool Is ## name ## TypeImpl(type* const = 0) { /*NOLINT*/ \ return true; \ } \ \ diff --git a/runtime/runtime_options.h b/runtime/runtime_options.h index 4610f6f4a1..ab69d4f1cb 100644 --- a/runtime/runtime_options.h +++ b/runtime/runtime_options.h @@ -73,7 +73,7 @@ struct TestProfilerOptions; using Key = RuntimeArgumentMapKey<TValue>; // List of key declarations, shorthand for 'static const Key<T> Name' -#define RUNTIME_OPTIONS_KEY(Type, Name, ...) static const Key<Type> Name; +#define RUNTIME_OPTIONS_KEY(Type, Name, ...) static const Key<Type> (Name); #include "runtime_options.def" }; diff --git a/runtime/thread.cc b/runtime/thread.cc index fb248282be..50ec1f1890 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -2406,8 +2406,8 @@ template void Thread::DumpThreadOffset<8>(std::ostream& os, uint32_t offset); template<size_t ptr_size> void Thread::DumpThreadOffset(std::ostream& os, uint32_t offset) { #define DO_THREAD_OFFSET(x, y) \ - if (offset == x.Uint32Value()) { \ - os << y; \ + if (offset == (x).Uint32Value()) { \ + os << (y); \ return; \ } DO_THREAD_OFFSET(ThreadFlagsOffset<ptr_size>(), "state_and_flags") |