openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-27 04:00:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!9245 rectification of inconsistent code

Browse Source 
Merge pull request !9245 from yangxiaoshuai2022/master
This commit is contained in:
openharmony_ci 2024-09-29 12:21:32 +00:00 committed by Gitee
commit ebfb6afaeb
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/compiler/slowpath_lowering.cpp
View File

@ -3357,7 +3357,7 @@ void SlowPathLowering::LowerCallInternal(GateRef gate)
for (size_t i = 0; i < num; ++i) {
args[i] = acc_.GetValueIn(gate, i);
}
ASSERT(num >= 3); // 3:skip argc argv newtarget
ASSERT(num >= 3); // 3: skip argc argv newtarget
std::vector<GateRef> argsFastCall(num - 3); // 3:skip argc argv newtarget
size_t j = 0;
for (size_t i = 0; i < num; ++i) {

20
ecmascript/js_thread.h
View File

@ -1378,6 +1378,14 @@ public:
finalizeTaskCallback_ = callback;
}
uint64_t GetJobId()
{
if (jobId_ == UINT64_MAX) {
jobId_ = 0;
}
return ++jobId_;
}
void SetAsyncCleanTaskCallback(const NativePointerTaskCallback &callback)
{
asyncCleanTaskCb_ = callback;
@ -1431,14 +1439,6 @@ public:
return machineCodeLowMemory_;
}
uint64_t GetJobId()
{
if (jobId_ == UINT64_MAX) {
jobId_ = 0;
}
return ++jobId_;
}
void *GetEnv() const
{
return env_;
@ -1611,13 +1611,13 @@ private:
ConditionVariable suspendCondVar_;
SuspendBarrier *suspendBarrier_ {nullptr};
uint64_t jobId_ {0};
ThreadType threadType_ {ThreadType::JS_THREAD};
RecursiveMutex jitMutex_;
bool machineCodeLowMemory_ {false};
RecursiveMutex profileTypeAccessorLockMutex_;
uint64_t jobId_ {0};
#ifndef NDEBUG
MutatorLock::MutatorLockState mutatorLockState_ = MutatorLock::MutatorLockState::UNLOCKED;
std::atomic<bool> launchedSuspendAll_ {false};