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

!9326 Fix code diff

Browse Source 
Merge pull request !9326 from Gymee/fix_code_diff
This commit is contained in:
openharmony_ci 2024-09-16 01:36:28 +00:00 committed by Gitee
commit 2a056dce3c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/napi/jsnapi_expo.cpp
View File

@ -2176,6 +2176,8 @@ int StringRef::WriteLatin1(const EcmaVM *vm, char *buffer, int length)
Local<StringRef> StringRef::GetNapiWrapperString(const EcmaVM *vm) Local<StringRef> StringRef::GetNapiWrapperString(const EcmaVM *vm)
{ {
// Omit exception check because ark calls here may not
// cause side effect even pending exception exists.
CROSS_THREAD_CHECK(vm); CROSS_THREAD_CHECK(vm);
ecmascript::ThreadManagedScope managedScope(vm->GetJSThread()); ecmascript::ThreadManagedScope managedScope(vm->GetJSThread());
JSHandle<JSTaggedValue> napiWapperString = thread->GlobalConstants()->GetHandledNapiWrapperString(); JSHandle<JSTaggedValue> napiWapperString = thread->GlobalConstants()->GetHandledNapiWrapperString();

10
ecmascript/serializer/tests/serializer_test.cpp
View File

@ -2414,15 +2414,15 @@ HWTEST_F_L0(JSSerializerTest, SerializeMultiThreadJSSharedSet)
for (int i = 0; i < INITIALIZE_SIZE; i++) { for (int i = 0; i < INITIALIZE_SIZE; i++) {
JSSharedSet::Add(thread, jsSet, JSHandle<JSTaggedValue>(thread, JSTaggedValue(i))); JSSharedSet::Add(thread, jsSet, JSHandle<JSTaggedValue>(thread, JSTaggedValue(i)));
} }
constexpr uint32_t MAX_NUM_DESERIALZIERS = 10; constexpr uint32_t maxNumDeserializers = 10;
JSDeserializerTest jsDeserializerTests[MAX_NUM_DESERIALZIERS]; JSDeserializerTest jsDeserializerTests[maxNumDeserializers];
std::thread threads[MAX_NUM_DESERIALZIERS]; std::thread threads[maxNumDeserializers];
for (int32_t i = 0; i < MAX_NUM_DESERIALZIERS; i++) { for (int32_t i = 0; i < maxNumDeserializers; i++) {
threads[i] = std::thread(&JSDeserializerTest::JSSharedSetMultiThreadTest1, threads[i] = std::thread(&JSDeserializerTest::JSSharedSetMultiThreadTest1,
jsDeserializerTests[i], data.get()); jsDeserializerTests[i], data.get());
} }
ThreadSuspensionScope scope(thread); ThreadSuspensionScope scope(thread);
for (int i = 0; i < MAX_NUM_DESERIALZIERS; i++) { for (int i = 0; i < maxNumDeserializers; i++) {
threads[i].join(); threads[i].join();
} }
EXPECT_TRUE(jsSet->GetModRecord() == 0); EXPECT_TRUE(jsSet->GetModRecord() == 0);