openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-23 10:09:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!7580 fix warning of memory

Browse Source 
Merge pull request !7580 from hanweiqi/fix_warning_memory
This commit is contained in:
openharmony_ci 2024-05-30 11:05:42 +00:00 committed by Gitee
commit 7605f64188
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
11 changed files with 47 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler_service/interface/aot_compiler_interface_stub.cpp
View File

@ -51,6 +51,10 @@ int32_t AotCompilerInterfaceStub::CommandAOTCompiler(MessageParcel &data,
{
std::unordered_map<std::string, std::string> argsMap;
int32_t argsMapSize = data.ReadInt32();
if (argsMapSize > mapMaxSize) {
HiLog::Error(LABEL, "The map size exceeds ths security limit!");
return ERR_INVALID_DATA;
}
for (int32_t i = 0; i < argsMapSize; ++i) {
std::string key = Str16ToStr8(data.ReadString16());
std::string value = Str16ToStr8(data.ReadString16());

14
ecmascript/builtins/builtins_regexp.cpp
View File

@ -395,49 +395,49 @@ JSTaggedValue BuiltinsRegExp::GetAllFlagsInternal(JSThread *thread, JSHandle<JST
JSHandle<EcmaString> emptyString = factory->GetEmptyString();
JSHandle<JSTaggedValue> hasIndicesKey(factory->NewFromASCII("hasIndices"));
JSHandle<JSTaggedValue> hasIndicesResult = JSObject::GetProperty(thread, thisObj, hasIndicesKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (hasIndicesResult->ToBoolean()) {
flagsStr[flagsLen] = 'd';
flagsLen++;
}
JSHandle<JSTaggedValue> globalKey(globalConstants->GetHandledGlobalString());
JSHandle<JSTaggedValue> globalResult = JSObject::GetProperty(thread, thisObj, globalKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (globalResult->ToBoolean()) {
flagsStr[flagsLen] = 'g';
flagsLen++;
}
JSHandle<JSTaggedValue> ignoreCaseKey(factory->NewFromASCII("ignoreCase"));
JSHandle<JSTaggedValue> ignoreCaseResult = JSObject::GetProperty(thread, thisObj, ignoreCaseKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (ignoreCaseResult->ToBoolean()) {
flagsStr[flagsLen] = 'i';
flagsLen++;
}
JSHandle<JSTaggedValue> multilineKey(factory->NewFromASCII("multiline"));
JSHandle<JSTaggedValue> multilineResult = JSObject::GetProperty(thread, thisObj, multilineKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (multilineResult->ToBoolean()) {
flagsStr[flagsLen] = 'm';
flagsLen++;
}
JSHandle<JSTaggedValue> dotAllKey(factory->NewFromASCII("dotAll"));
JSHandle<JSTaggedValue> dotAllResult = JSObject::GetProperty(thread, thisObj, dotAllKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (dotAllResult->ToBoolean()) {
flagsStr[flagsLen] = 's';
flagsLen++;
}
JSHandle<JSTaggedValue> unicodeKey(globalConstants->GetHandledUnicodeString());
JSHandle<JSTaggedValue> unicodeResult = JSObject::GetProperty(thread, thisObj, unicodeKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (unicodeResult->ToBoolean()) {
flagsStr[flagsLen] = 'u';
flagsLen++;
}
JSHandle<JSTaggedValue> stickyKey(globalConstants->GetHandledStickyString());
JSHandle<JSTaggedValue> stickyResult = JSObject::GetProperty(thread, thisObj, stickyKey).GetValue();
RETURN_VALUE_IF_ABRUPT_COMPLETION(thread, emptyString.GetTaggedValue());
RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, emptyString.GetTaggedValue(), flagsStr);
if (stickyResult->ToBoolean()) {
flagsStr[flagsLen] = 'y';
flagsLen++;

8
ecmascript/containers/containers_bitvector.cpp
View File

@ -512,15 +512,13 @@ JSTaggedValue ContainersBitVector::GetIteratorObj(EcmaRuntimeCallInfo* argv)
return values;
}
void ContainersBitVector::FreeBitsetVectorPointer([[maybe_unused]] void *env, void *pointer, void *data)
void ContainersBitVector::FreeBitsetVectorPointer([[maybe_unused]] void *env, void *pointer,
[[maybe_unused]] void *data)
{
if (pointer == nullptr) {
return;
}
auto bitsetVector = reinterpret_cast<std::bitset<JSAPIBitVector::BIT_SET_LENGTH> *>(pointer);
auto bitsetVector = reinterpret_cast<std::vector<std::bitset<JSAPIBitVector::BIT_SET_LENGTH>> *>(pointer);
delete bitsetVector;
if (data != nullptr) {
reinterpret_cast<EcmaVM *>(data)->GetNativeAreaAllocator()->FreeBuffer(pointer);
}
}
} // namespace panda::ecmascript::containers

3
ecmascript/containers/containers_private.cpp
View File

@ -895,6 +895,7 @@ JSHandle<JSTaggedValue> ContainersPrivate::InitializeBitVector(JSThread* thread)
SetFrozenFunction(thread, prototype, "getLastIndexOf", ContainersBitVector::GetLastIndexOf, FuncLength::THREE);
SetFrozenFunction(thread, prototype, "flipBitByIndex", ContainersBitVector::FlipBitByIndex, FuncLength::ONE);
SetFrozenFunction(thread, prototype, "flipBitsByRange", ContainersBitVector::FlipBitsByRange, FuncLength::TWO);
SetFrozenFunction(thread, prototype, "values", ContainersBitVector::GetIteratorObj, FuncLength::ZERO);
JSHandle<GlobalEnv> env = thread->GetEcmaVM()->GetGlobalEnv();
SetStringTagSymbol(thread, env, prototype, "BitVector");
@ -904,8 +905,6 @@ JSHandle<JSTaggedValue> ContainersPrivate::InitializeBitVector(JSThread* thread)
JSHandle<JSTaggedValue> lengthKey(thread, globalConst->GetLengthString());
SetGetter(thread, prototype, lengthKey, lengthGetter);
SetFunctionAtSymbol(thread, env, prototype, env->GetIteratorSymbol(), "[Symbol.iterator]",
ContainersBitVector::GetIteratorObj, FuncLength::ONE);
ContainersPrivate::InitializeBitVectorIterator(thread, env, globalConst);
globalConst->SetConstant(ConstantIndex::BITVECTOR_FUNCTION_INDEX, bitVectorFunction.GetTaggedValue());

1
ecmascript/dfx/stackinfo/js_stackinfo.cpp
View File

@ -1173,6 +1173,7 @@ std::string ArkGetFileName(int pid, uintptr_t jsPandaFileAddr, std::string &hapP
for (size_t i = 0; i < size; i++) {
if (!ReadUintptrFromAddr(pid, jsPandaFileAddr, jsPandaFilePart[i], g_needCheck)) {
LOG_ECMA(ERROR) << "ArkGetFilePath failed, jsPandaFileAddr: " << jsPandaFileAddr;
delete []jsPandaFilePart;
return "";
}
jsPandaFileAddr += sizeof(long);

9
ecmascript/ecma_macros.h
View File

@ -225,6 +225,15 @@
} \
} while (false)
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RETURN_VALUE_IF_ABRUPT_COMPLETION_WITH_DATA_DELETE(thread, value, flagsStr) \
do { \
if ((thread)->HasPendingException()) { \
delete[] flagsStr; \
return (value); \
} \
} while (false)
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
#define RETURN_EXCEPTION_IF_ABRUPT_COMPLETION(thread) \
do { \

5
ecmascript/extractortool/src/source_map.cpp
View File

@ -39,7 +39,6 @@ static constexpr int32_t INDEX_THREE = 3;
static constexpr int32_t INDEX_FOUR = 4;
static constexpr int32_t ANS_MAP_SIZE = 5;
static constexpr int32_t DIGIT_NUM = 64;
[[maybe_unused]] static constexpr int32_t MILLION_TIME = 1000;
const std::string MEGER_SOURCE_MAP_PATH = "ets/sourceMaps.map";
static const CString FLAG_SOURCES = " \"sources\":";
@ -104,8 +103,8 @@ void SourceMap::Init(const std::string& hapPath)
SplitSourceMap(sourceMapData);
}
auto end = Clock::now();
auto duration = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
LOG_ECMA(DEBUG) << "Init sourcemap time: " << (float) (duration.count() / MILLION_TIME) << "ms";
auto duration = std::chrono::duration_cast<std::chrono::milliseconds>(end - start);
LOG_ECMA(DEBUG) << "Init sourcemap time: " << duration.count() << "ms";
}
#endif

2
ecmascript/extractortool/src/zip_file.cpp
View File

@ -686,6 +686,8 @@ bool ZipFile::UnzipWithInflatedFromMMap(const ZipEntry &zipEntry, [[maybe_unused
len = zipEntry.uncompressedSize;
dataPtr = std::make_unique<uint8_t[]>(len);
if (!dataPtr) {
delete[] bufOut;
delete[] bufIn;
return false;
}
uint8_t *dstDataPtr = static_cast<uint8_t *>(dataPtr.get());

5
ecmascript/mem/heap.cpp
View File

@ -1743,17 +1743,18 @@ void Heap::PostParallelGCTask(ParallelGCTaskPhase gcTask)
void Heap::ChangeGCParams(bool inBackground)
{
const double doubleOne = 1.0;
inBackground_ = inBackground;
if (inBackground) {
LOG_GC(INFO) << "app is inBackground";
if (GetHeapObjectSize() - heapAliveSizeAfterGC_ > BACKGROUND_GROW_LIMIT &&
GetCommittedSize() >= MIN_BACKGROUNG_GC_LIMIT &&
GetHeapObjectSize() / GetCommittedSize() <= MIN_OBJECT_SURVIVAL_RATE) {
doubleOne * GetHeapObjectSize() / GetCommittedSize() <= MIN_OBJECT_SURVIVAL_RATE) {
CollectGarbage(TriggerGCType::FULL_GC, GCReason::SWITCH_BACKGROUND);
}
if (sHeap_->GetHeapObjectSize() - sHeap_->GetHeapAliveSizeAfterGC() > BACKGROUND_GROW_LIMIT &&
sHeap_->GetCommittedSize() >= MIN_BACKGROUNG_GC_LIMIT &&
sHeap_->GetHeapObjectSize() / sHeap_->GetCommittedSize() <= MIN_OBJECT_SURVIVAL_RATE) {
doubleOne * sHeap_->GetHeapObjectSize() / sHeap_->GetCommittedSize() <= MIN_OBJECT_SURVIVAL_RATE) {
sHeap_->CollectGarbage<TriggerGCType::SHARED_GC, GCReason::SWITCH_BACKGROUND>(thread_);
}
if (GetMemGrowingType() != MemGrowingType::PRESSURE) {

28
ecmascript/napi/dfx_jsnapi.cpp
View File

@ -187,6 +187,15 @@ void DFXJSNApi::DumpHeapSnapshotWithVm([[maybe_unused]] const EcmaVM *vm, [[mayb
{
#if defined(ECMASCRIPT_SUPPORT_SNAPSHOT)
#if defined(ENABLE_DUMP_IN_FAULTLOG)
uv_loop_t *loop = reinterpret_cast<uv_loop_t *>(vm->GetLoop());
if (loop == nullptr) {
LOG_ECMA(ERROR) << "loop nullptr";
return;
}
if (uv_loop_alive(loop) == 0) {
LOG_ECMA(ERROR) << "uv_loop_alive dead";
return;
}
struct DumpForSnapShotStruct *dumpStruct = new DumpForSnapShotStruct();
dumpStruct->vm = vm;
dumpStruct->dumpFormat = dumpFormat;
@ -200,15 +209,6 @@ void DFXJSNApi::DumpHeapSnapshotWithVm([[maybe_unused]] const EcmaVM *vm, [[mayb
return;
}
work->data = static_cast<void *>(dumpStruct);
uv_loop_t *loop = reinterpret_cast<uv_loop_t *>(vm->GetLoop());
if (loop == nullptr) {
LOG_ECMA(ERROR) << "loop nullptr";
return;
}
if (uv_loop_alive(loop) == 0) {
LOG_ECMA(ERROR) << "uv_loop_alive dead";
return;
}
uint32_t curTid = vm->GetTid();
int ret = 0;
@ -279,11 +279,6 @@ void DFXJSNApi::TriggerGCWithVm([[maybe_unused]] const EcmaVM *vm)
{
#if defined(ECMASCRIPT_SUPPORT_SNAPSHOT)
#if defined(ENABLE_DUMP_IN_FAULTLOG)
uv_work_t *work = new uv_work_t;
if (work == nullptr) {
LOG_ECMA(FATAL) << "DFXJSNApi::TriggerGCWithVm:work is nullptr";
}
work->data = static_cast<void *>(const_cast<EcmaVM *>(vm));
uv_loop_t *loop = reinterpret_cast<uv_loop_t *>(vm->GetLoop());
if (loop == nullptr) {
LOG_ECMA(ERROR) << "loop nullptr";
@ -293,6 +288,11 @@ void DFXJSNApi::TriggerGCWithVm([[maybe_unused]] const EcmaVM *vm)
LOG_ECMA(ERROR) << "uv_loop_alive dead";
return;
}
uv_work_t *work = new uv_work_t;
if (work == nullptr) {
LOG_ECMA(FATAL) << "DFXJSNApi::TriggerGCWithVm:work is nullptr";
}
work->data = static_cast<void *>(const_cast<EcmaVM *>(vm));
int ret = uv_queue_work(loop, work, [](uv_work_t *) {}, [](uv_work_t *work, int32_t) {
EcmaVM *vm = static_cast<EcmaVM *>(work->data);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());

1
ecmascript/pgo_profiler/pgo_profiler_decoder.cpp
View File

@ -246,6 +246,7 @@ bool PGOProfilerDecoder::InitMergeData()
if (!header_) {
// For merge scene, we only care about the ap capability which is in the version field.
PGOProfilerHeader::Build(&header_, sizeof(PGOProfilerHeader));
ASSERT(header_ != nullptr);
memset_s(header_, sizeof(PGOProfilerHeader), 0, sizeof(PGOProfilerHeader));
}
if (!abcFilePool_) {