!3214 fix codestyle

Merge pull request !3214 from Gymee/fix_codestyle
This commit is contained in:
openharmony_ci 2022-12-13 11:32:40 +00:00 committed by Gitee
commit b12a67c098
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
21 changed files with 39 additions and 38 deletions

View File

@ -490,7 +490,7 @@ public:
void SetAOTFuncEntry(const JSPandaFile *jsPandaFile, Method *method, uint32_t entryIndex);
void SetAOTFuncEntryForLiteral(const JSPandaFile *jsPandaFile, const TaggedArray *literal,
const AOTLiteralInfo *entryIndexes);
void LoadSnapshotFile([[maybe_unused]]const std::string& filename);
void LoadSnapshotFile([[maybe_unused]] const std::string& filename);
kungfu::ArkStackMapParser* GetStackMapParser() const;
static JSTaggedValue GetAbsolutePath(JSThread *thread, JSTaggedValue relativePathVal);
static bool GetAbsolutePath(const CString &relativePathCstr, CString &absPathCstr);

View File

@ -943,7 +943,7 @@ HWTEST_F_L0(BuiltinsAtomicsTest, Notify)
ecmaRuntimeCallInfo->SetCallArg(2, JSTaggedValue(static_cast<int32_t>(2)));
auto prev = TestHelper::SetupFrame(thread, ecmaRuntimeCallInfo);
[[maybe_unused]]JSTaggedValue result = BuiltinsAtomics::Notify(ecmaRuntimeCallInfo);
[[maybe_unused]] JSTaggedValue result = BuiltinsAtomics::Notify(ecmaRuntimeCallInfo);
TestHelper::TearDownFrame(thread, prev);
ASSERT_EQ(result, JSTaggedValue(0));
}

View File

@ -56,7 +56,7 @@ public:
}
static const char *SymbolLookupCallback([[maybe_unused]] void *disInfo, [[maybe_unused]] uint64_t referenceValue,
uint64_t *referenceType, [[maybe_unused]]uint64_t referencePC,
uint64_t *referenceType, [[maybe_unused]] uint64_t referencePC,
[[maybe_unused]] const char **referenceName)
{
*referenceType = LLVMDisassembler_ReferenceType_InOut_None;

View File

@ -61,7 +61,7 @@ public:
}
static const char *SymbolLookupCallback([[maybe_unused]] void *disInfo, [[maybe_unused]] uint64_t referenceValue,
uint64_t *referenceType, [[maybe_unused]]uint64_t referencePC,
uint64_t *referenceType, [[maybe_unused]] uint64_t referencePC,
[[maybe_unused]] const char **referenceName)
{
*referenceType = LLVMDisassembler_ReferenceType_InOut_None;

View File

@ -248,7 +248,7 @@ void LLVMAssembler::Initialize(LOptions option)
}
static const char *SymbolLookupCallback([[maybe_unused]] void *disInfo, [[maybe_unused]] uint64_t referenceValue,
uint64_t *referenceType, [[maybe_unused]]uint64_t referencePC,
uint64_t *referenceType, [[maybe_unused]] uint64_t referencePC,
[[maybe_unused]] const char **referenceName)
{
*referenceType = LLVMDisassembler_ReferenceType_InOut_None;

View File

@ -501,7 +501,7 @@ LLVMValueRef LLVMIRBuilder::GetFunction(LLVMValueRef glue, const CallSignature *
return callee;
}
LLVMValueRef LLVMIRBuilder::GetFunctionFromGlobalValue([[maybe_unused]]LLVMValueRef glue,
LLVMValueRef LLVMIRBuilder::GetFunctionFromGlobalValue([[maybe_unused]] LLVMValueRef glue,
const CallSignature *signature, LLVMValueRef reloc) const
{
LLVMTypeRef rtfuncType = llvmModule_->GetFuncType(signature);
@ -1664,8 +1664,8 @@ void LLVMIRBuilder::VisitCmp(GateRef gate, GateRef e1, GateRef e2)
LLVMValueRef e1Value = gate2LValue_[e1];
LLVMValueRef e2Value = gate2LValue_[e2];
LLVMValueRef result = nullptr;
[[maybe_unused]]auto e1ValCode = acc_.GetMachineType(e1);
[[maybe_unused]]auto e2ValCode = acc_.GetMachineType(e2);
[[maybe_unused]] auto e1ValCode = acc_.GetMachineType(e1);
[[maybe_unused]] auto e2ValCode = acc_.GetMachineType(e2);
ASSERT((e1ValCode == e2ValCode) ||
(compCfg_->Is32Bit() && (e1ValCode == MachineType::ARCH) && (e2ValCode == MachineType::I32)) ||
(compCfg_->Is64Bit() && (e1ValCode == MachineType::ARCH) && (e2ValCode == MachineType::I64)) ||

View File

@ -40,7 +40,7 @@ void RuntimeStubCSigns::Initialize()
#define INIT_ASM_SIGNATURES(name) \
callSigns_[RuntimeStubCSigns::ID_##name].SetName(std::string("RTStub_") + #name); \
callSigns_[RuntimeStubCSigns::ID_##name].SetConstructor( \
[]([[maybe_unused]]void* arg) { \
[]([[maybe_unused]] void* arg) { \
return static_cast<void*>(new name##Stub()); \
});

View File

@ -526,7 +526,7 @@ void OptimizedCall::JSCallInternal(ExtendedAssembler *assembler, Register jsfunc
}
}
void OptimizedCall::ConstructorJSCall([[maybe_unused]]ExtendedAssembler *assembler)
void OptimizedCall::ConstructorJSCall([[maybe_unused]] ExtendedAssembler *assembler)
{
__ BindAssemblerStub(RTSTUB_ID(ConstructorJSCall));
Register jsfunc(X1);
@ -1093,7 +1093,7 @@ void OptimizedCall::JSCallWithArgV(ExtendedAssembler *assembler)
GenJSCallWithArgV(assembler, false);
}
void OptimizedCall::ConstructorJSCallWithArgV([[maybe_unused]]ExtendedAssembler *assembler)
void OptimizedCall::ConstructorJSCallWithArgV([[maybe_unused]] ExtendedAssembler *assembler)
{
__ BindAssemblerStub(RTSTUB_ID(ConstructorJSCallWithArgV));
Register sp(SP);

View File

@ -989,8 +989,8 @@ void HeapSnapshot::AddSyntheticRoot()
ROOT_EDGE_BUILDER_CORE(type, slot);
};
RootBaseAndDerivedVisitor rootBaseEdgeBuilder = []
([[maybe_unused]] Root type, [[maybe_unused]]ObjectSlot base, [[maybe_unused]]ObjectSlot derived,
[[maybe_unused]]uintptr_t baseOldObject) {
([[maybe_unused]] Root type, [[maybe_unused]] ObjectSlot base, [[maybe_unused]] ObjectSlot derived,
[[maybe_unused]] uintptr_t baseOldObject) {
};
RootRangeVisitor rootRangeEdgeBuilder = [this, syntheticRoot, &edgeOffset]([[maybe_unused]] Root type,

View File

@ -38,7 +38,7 @@ public:
TestProgress() = default;
~TestProgress() = default;
void ReportProgress([[maybe_unused]]int32_t done, [[maybe_unused]]int32_t total) override {}
void ReportProgress([[maybe_unused]] int32_t done, [[maybe_unused]] int32_t total) override {}
};
class TestStream : public Stream {
@ -52,7 +52,7 @@ public:
static const int heapProfilerChunkSise = 100_KB;
return heapProfilerChunkSise;
}
bool WriteChunk([[maybe_unused]]char *data, [[maybe_unused]]int32_t size) override
bool WriteChunk([[maybe_unused]] char *data, [[maybe_unused]] int32_t size) override
{
return true;
}
@ -61,11 +61,11 @@ public:
return testStream_.good();
}
void UpdateHeapStats([[maybe_unused]]HeapStat* updateData, [[maybe_unused]]int32_t count) override
void UpdateHeapStats([[maybe_unused]] HeapStat* updateData, [[maybe_unused]] int32_t count) override
{
}
void UpdateLastSeenObjectId([[maybe_unused]]int32_t lastSeenObjectId) override
void UpdateLastSeenObjectId([[maybe_unused]] int32_t lastSeenObjectId) override
{
}

View File

@ -397,7 +397,7 @@ int32_t Heap::GetHeapObjectCount() const
{
int32_t count = 0;
sweeper_->EnsureAllTaskFinished();
this->IterateOverObjects([&count]([[maybe_unused]]TaggedObject *obj) {
this->IterateOverObjects([&count]([[maybe_unused]] TaggedObject *obj) {
++count;
});
return count;

View File

@ -46,7 +46,7 @@ public:
NO_COPY_SEMANTIC(MemMapPool);
NO_MOVE_SEMANTIC(MemMapPool);
MemMap GetMemFromCache([[maybe_unused]]size_t size)
MemMap GetMemFromCache([[maybe_unused]] size_t size)
{
ASSERT(size == REGULAR_MMAP_SIZE);
os::memory::LockHolder lock(lock_);

View File

@ -229,7 +229,7 @@ void ParallelEvacuator::UpdateRoot()
}
};
RootBaseAndDerivedVisitor gcUpdateDerived =
[]([[maybe_unused]]Root type, ObjectSlot base, ObjectSlot derived, uintptr_t baseOldObject) {
[]([[maybe_unused]] Root type, ObjectSlot base, ObjectSlot derived, uintptr_t baseOldObject) {
if (JSTaggedValue(base.GetTaggedType()).IsHeapObject()) {
derived.Update(base.GetTaggedType() + derived.GetTaggedType() - baseOldObject);
}

View File

@ -219,7 +219,7 @@ bool ModuleNamespace::HasProperty(JSThread *thread, const JSHandle<JSTaggedValue
return false;
}
bool ModuleNamespace::SetPrototype([[maybe_unused]]const JSHandle<JSTaggedValue> &obj,
bool ModuleNamespace::SetPrototype([[maybe_unused]] const JSHandle<JSTaggedValue> &obj,
const JSHandle<JSTaggedValue> &proto)
{
ASSERT(obj->IsModuleNamespace());

View File

@ -197,8 +197,8 @@ JSHandle<EcmaString> CjsModule::ResolveFilenameFromNative(JSThread *thread, JSTa
}
JSTaggedValue CjsModule::Require(JSThread *thread, JSHandle<EcmaString> &request,
[[maybe_unused]]JSHandle<CjsModule> &parent,
[[maybe_unused]]bool isMain)
[[maybe_unused]] JSHandle<CjsModule> &parent,
[[maybe_unused]] bool isMain)
{
Load(thread, request);
return JSTaggedValue::Undefined();

View File

@ -124,7 +124,7 @@ void Snapshot::SerializeBuiltins(const CString &fileName)
auto globalEnvHandle = vm_->GetGlobalEnv();
auto constant = const_cast<GlobalEnvConstants *>(vm_->GetJSThread()->GlobalConstants());
constant->VisitRangeSlot([&objectQueue, &data, &processor]([[maybe_unused]]Root type,
constant->VisitRangeSlot([&objectQueue, &data, &processor]([[maybe_unused]] Root type,
ObjectSlot start, ObjectSlot end) {
processor.EncodeTaggedObjectRange(start, end, &objectQueue, &data);
});

View File

@ -63,8 +63,8 @@ void SnapshotEnv::InitGlobalEnv()
void SnapshotEnv::HandleObjectField(TaggedObject *objectHeader, CQueue<TaggedObject *> *objectQueue,
std::set<TaggedObject *> *objectSet)
{
auto visitor = [objectQueue, objectSet]([[maybe_unused]]TaggedObject *root, ObjectSlot start, ObjectSlot end,
[[maybe_unused]]bool isNative) {
auto visitor = [objectQueue, objectSet]([[maybe_unused]] TaggedObject *root, ObjectSlot start, ObjectSlot end,
[[maybe_unused]] bool isNative) {
for (ObjectSlot slot = start; slot < end; slot++) {
auto fieldAddr = reinterpret_cast<JSTaggedType *>(slot.SlotAddress());
JSTaggedValue fieldValue(*fieldAddr);

View File

@ -243,7 +243,7 @@ HWTEST_F_L0(SnapshotTest, SerializeBuiltins)
auto globalConst = const_cast<GlobalEnvConstants *>(ecmaVm2->GetJSThread()->GlobalConstants());
size_t hclassEndIndex = static_cast<size_t>(ConstantIndex::UNDEFINED_INDEX);
size_t hclassIndex = 0;
globalConst->VisitRangeSlot([&hclassIndex, &hclassEndIndex]([[maybe_unused]]Root type,
globalConst->VisitRangeSlot([&hclassIndex, &hclassEndIndex]([[maybe_unused]] Root type,
ObjectSlot start, ObjectSlot end) {
while (start < end) {
JSTaggedValue object(start.GetTaggedType());

View File

@ -360,7 +360,7 @@ void RuntimeStubs::DebugPrint(int fmtMessageId, ...)
va_end(args);
}
void RuntimeStubs::DebugPrintInstruction([[maybe_unused]]uintptr_t argGlue, const uint8_t *pc)
void RuntimeStubs::DebugPrintInstruction([[maybe_unused]] uintptr_t argGlue, const uint8_t *pc)
{
BytecodeInstruction inst(pc);
LOG_INTERPRETER(DEBUG) << inst;
@ -1913,7 +1913,8 @@ DEF_RUNTIME_STUBS(SlowFlattenString)
return JSTaggedValue(EcmaStringAccessor::SlowFlatten(thread->GetEcmaVM(), str)).GetRawData();
}
JSTaggedType RuntimeStubs::CreateArrayFromList([[maybe_unused]]uintptr_t argGlue, int32_t argc, JSTaggedValue *argvPtr)
JSTaggedType RuntimeStubs::CreateArrayFromList([[maybe_unused]] uintptr_t argGlue, int32_t argc,
JSTaggedValue *argvPtr)
{
auto thread = JSThread::GlueToJSThread(argGlue);
ObjectFactory *factory = thread->GetEcmaVM()->GetFactory();
@ -1989,7 +1990,7 @@ int32_t RuntimeStubs::DoubleToInt(double x)
return base::NumberHelper::DoubleToInt(x, base::INT32_BITS);
}
void RuntimeStubs::InsertOldToNewRSet([[maybe_unused]]uintptr_t argGlue,
void RuntimeStubs::InsertOldToNewRSet([[maybe_unused]] uintptr_t argGlue,
uintptr_t object, size_t offset)
{
Region *region = Region::ObjectAddressToRange(object);
@ -1997,7 +1998,7 @@ void RuntimeStubs::InsertOldToNewRSet([[maybe_unused]]uintptr_t argGlue,
return region->InsertOldToNewRSet(slotAddr);
}
void RuntimeStubs::MarkingBarrier([[maybe_unused]]uintptr_t argGlue,
void RuntimeStubs::MarkingBarrier([[maybe_unused]] uintptr_t argGlue,
uintptr_t object, size_t offset, TaggedObject *value)
{
uintptr_t slotAddr = object + offset;
@ -2009,7 +2010,7 @@ void RuntimeStubs::MarkingBarrier([[maybe_unused]]uintptr_t argGlue,
Barriers::Update(slotAddr, objectRegion, value, valueRegion);
}
void RuntimeStubs::StoreBarrier([[maybe_unused]]uintptr_t argGlue,
void RuntimeStubs::StoreBarrier([[maybe_unused]] uintptr_t argGlue,
uintptr_t object, size_t offset, TaggedObject *value)
{
uintptr_t slotAddr = object + offset;

View File

@ -324,15 +324,15 @@ public:
}
static void DebugPrint(int fmtMessageId, ...);
static void DebugPrintInstruction([[maybe_unused]]uintptr_t argGlue, const uint8_t *pc);
static void DebugPrintInstruction([[maybe_unused]] uintptr_t argGlue, const uint8_t *pc);
static void PGOProfiler(uintptr_t argGlue, uintptr_t func);
static void FatalPrint(int fmtMessageId, ...);
static void MarkingBarrier([[maybe_unused]]uintptr_t argGlue,
static void MarkingBarrier([[maybe_unused]] uintptr_t argGlue,
uintptr_t object, size_t offset, TaggedObject *value);
static void StoreBarrier([[maybe_unused]]uintptr_t argGlue,
static void StoreBarrier([[maybe_unused]] uintptr_t argGlue,
uintptr_t object, size_t offset, TaggedObject *value);
static JSTaggedType CreateArrayFromList([[maybe_unused]]uintptr_t argGlue, int32_t argc, JSTaggedValue *argv);
static void InsertOldToNewRSet([[maybe_unused]]uintptr_t argGlue, uintptr_t object, size_t offset);
static JSTaggedType CreateArrayFromList([[maybe_unused]] uintptr_t argGlue, int32_t argc, JSTaggedValue *argv);
static void InsertOldToNewRSet([[maybe_unused]] uintptr_t argGlue, uintptr_t object, size_t offset);
static int32_t DoubleToInt(double x);
static JSTaggedType FloatMod(double x, double y);
static JSTaggedType FloatSqrt(double x);

View File

@ -97,7 +97,7 @@ namespace OHOS {
if (value->IsNumber()) {
TaggedArray *elements = TaggedArray::Cast(JSAPIArrayList::Cast(arrayList.GetTaggedValue().
GetTaggedObject())->GetElements().GetTaggedObject());
[[maybe_unused]]JSTaggedValue result = elements->Get(key->GetInt());
[[maybe_unused]] JSTaggedValue result = elements->Get(key->GetInt());
}
}
return JSTaggedValue::Undefined();