!8449 arkui-x update master OH to weekly_20240729 and OH fix build bug

Merge pull request !8449 from mufeng521/mufeng_master_oh_weekly_20240729
This commit is contained in:
oh_ci 2024-08-05 01:43:13 +00:00 committed by Gitee
commit 230c2c9105
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 5 additions and 4 deletions

View File

@ -171,7 +171,7 @@ JSTaggedValue JSAPIDeque::Get(const uint32_t index)
JSTaggedValue JSAPIDeque::Set(JSThread *thread, const uint32_t index, JSTaggedValue value)
{
int length = static_cast<int>(GetSize());
uint32_t length = static_cast<uint32_t>(GetSize());
if (index < 0 || index >= length) {
return JSTaggedValue::False();
}

View File

@ -88,7 +88,7 @@ JitFort::~JitFort()
void JitFort::InitRegions()
{
auto numRegions = JIT_FORT_REG_SPACE_MAX/DEFAULT_REGION_SIZE;
for (auto i = 0; i < numRegions; i++) {
for (size_t i = 0; i < numRegions; i++) {
uintptr_t mem = reinterpret_cast<uintptr_t>(jitFortMem_.GetMem()) + i*DEFAULT_REGION_SIZE;
uintptr_t end = mem + DEFAULT_REGION_SIZE;
JitFortRegion *region = new JitFortRegion(nullptr, mem, end, RegionSpaceFlag::IN_MACHINE_CODE_SPACE,
@ -277,7 +277,7 @@ void MemDescPool::Expand()
void *block = malloc(sizeof(MemDesc) * MEMDESCS_PER_BLOCK);
if (block) {
memDescBlocks_.push_back(block);
for (auto i = 0; i < MEMDESCS_PER_BLOCK; ++i) {
for (size_t i = 0; i < MEMDESCS_PER_BLOCK; ++i) {
Add(new (ToVoidPtr(reinterpret_cast<uintptr_t>(block) + i*sizeof(MemDesc))) MemDesc());
}
}

View File

@ -16,6 +16,7 @@
#ifndef ECMASCRIPT_MEM_JIT_FORT_H
#define ECMASCRIPT_MEM_JIT_FORT_H
#include <array>
#include "ecmascript/mem/mem_common.h"
namespace panda::ecmascript {

View File

@ -191,7 +191,7 @@ public:
return -1;
}
ssize_t res = offset;
if (bufferSize_ == offset) {
if (bufferSize_ == static_cast<size_t>(offset)) {
bufferSize_ += length;
}
return res;