Skip to content

Commit fc15f54

Browse files
hs0225hs0225
committed
chore: update Escargot
Signed-off-by: Hosung Kim [email protected]
1 parent 1d268f5 commit fc15f54

File tree

11 files changed

+152
-86
lines changed

11 files changed

+152
-86
lines changed

‎.github/workflows/actions.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
name: tizen_std_${{ matrix.profile }}
116116
path: /home/runner/GBS-ROOT/${{ matrix.profile }}/local/repos/${{ matrix.profile }}/armv7l/RPMS/
117117
lint:
118-
runs-on: ubuntu-latest
118+
runs-on: ubuntu-22.04
119119
timeout-minutes: 30
120120
strategy:
121121
fail-fast: false

‎deps/escargot‎

Submodule escargot updated 293 files

‎deps/node/test/skip_tests.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ test/parallel/test-worker-nexttick-terminate.js
193193
test/parallel/test-worker-process-cwd.js
194194
test/parallel/test-worker-process-env.js
195195
test/parallel/test-worker-sharedarraybuffer-from-worker-thread.js
196+
test/parallel/test-worker-stack-overflow.js # CI 테스트중 간헐적으로 timeout
196197
test/parallel/test-worker-stdio.js # CI 테스트중 간헐적으로 crash. 타이밍 이슈로 추정됨
197198
test/parallel/test-worker-syntax-error-file.js
198199
test/parallel/test-worker-syntax-error.js

‎escargot.gyp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
'escargot_configs': [
4848
'-DESCARGOT_SMALL_CONFIG=1',
4949
'-DESCARGOT_USE_CUSTOM_LOGGING=ON',
50+
'-DESCARGOT_USE_EXTENDED_API=ON',
5051
'-DESCARGOT_ARCH=<(target_arch)',
5152
'-DESCARGOT_HOST=<(build_host)',
5253
'-DESCARGOT_MODE=<(escargot_build_mode)',
@@ -86,6 +87,7 @@
8687
'<(escargot_dir)/src/api',
8788
'<(escargot_dir)/third_party/GCutil',
8889
'<(escargot_dir)/third_party/GCutil/bdwgc/include',
90+
'<(escargot_dir)/third_party/GCutil/bdwgc/include/gc',
8991
],
9092
'conditions': [
9193
['escargot_threading==1', {

‎modules/packages/device-api/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ include_directories(
1515
${PROJECT_ROOT_PATH}/deps/escargot/src/api
1616
${PROJECT_ROOT_PATH}/deps/escargot/third_party/GCutil
1717
${PROJECT_ROOT_PATH}/deps/escargot/third_party/GCutil/bdwgc/include
18+
${PROJECT_ROOT_PATH}/deps/escargot/third_party/GCutil/bdwgc/include/gc
1819
${PROJECT_ROOT_PATH}/deps/node/deps/uv/include
1920
${PROJECT_ROOT_PATH}/src
2021
include

‎src/api-data.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2314,14 +2314,14 @@ void String::ExternalStringResourceBase::operator delete(void* ptr) {
23142314

23152315
Local<Value> Symbol::Description() const {
23162316
auto lwIsolate = IsolateWrap::GetCurrent();
2317-
auto esDescription = CVAL(this)->value()->asSymbol()->description();
2318-
return Utils::NewLocal<String>(lwIsolate->toV8(), esDescription.get());
2317+
auto esDescription = CVAL(this)->value()->asSymbol()->descriptionString();
2318+
return Utils::NewLocal<String>(lwIsolate->toV8(), esDescription);
23192319
}
23202320

23212321
Local<Value> Private::Name() const {
23222322
auto lwIsolate = IsolateWrap::GetCurrent();
2323-
auto esDescription = CVAL(this)->value()->asSymbol()->description();
2324-
return Utils::NewLocal<String>(lwIsolate->toV8(), esDescription.get());
2323+
auto esDescription = CVAL(this)->value()->asSymbol()->descriptionString();
2324+
return Utils::NewLocal<String>(lwIsolate->toV8(), esDescription);
23252325
}
23262326

23272327
template <typename T, typename F>

‎src/api-environment.cc‎

Lines changed: 92 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "api.h"
1919
#include "api/engine.h"
2020
#include "api/utils/cast.h"
21+
#include "api/utils/debug.h"
2122
#include "base.h"
2223
#include "init/v8.h"
2324

@@ -691,19 +692,73 @@ double v8::Date::ValueOf() const {
691692
return scope.self()->asDateObject()->primitiveValue();
692693
}
693694

695+
static RegExpObjectRef::RegExpObjectOption ToEsRegExpObjectOption(
696+
v8::RegExp::Flags flags) {
697+
int option = RegExpObjectRef::RegExpObjectOption::None;
698+
699+
if (flags & v8::RegExp::Flags::kGlobal) {
700+
option |= RegExpObjectRef::RegExpObjectOption::Global;
701+
}
702+
if (flags & v8::RegExp::Flags::kIgnoreCase) {
703+
option |= RegExpObjectRef::RegExpObjectOption::IgnoreCase;
704+
}
705+
if (flags & v8::RegExp::Flags::kMultiline) {
706+
option |= RegExpObjectRef::RegExpObjectOption::MultiLine;
707+
}
708+
if (flags & v8::RegExp::Flags::kSticky) {
709+
option |= RegExpObjectRef::RegExpObjectOption::Sticky;
710+
}
711+
if (flags & v8::RegExp::Flags::kUnicode) {
712+
option |= RegExpObjectRef::RegExpObjectOption::Unicode;
713+
}
714+
if (flags & v8::RegExp::Flags::kDotAll) {
715+
option |= RegExpObjectRef::RegExpObjectOption::DotAll;
716+
}
717+
718+
return static_cast<RegExpObjectRef::RegExpObjectOption>(option);
719+
}
720+
721+
static v8::RegExp::Flags ToV8RegExpFlags(
722+
RegExpObjectRef::RegExpObjectOption option) {
723+
int flags = v8::RegExp::Flags::kNone;
724+
725+
if (option & RegExpObjectRef::RegExpObjectOption::Global) {
726+
flags |= v8::RegExp::Flags::kGlobal;
727+
}
728+
if (option & RegExpObjectRef::RegExpObjectOption::IgnoreCase) {
729+
flags |= v8::RegExp::Flags::kIgnoreCase;
730+
}
731+
if (option & RegExpObjectRef::RegExpObjectOption::MultiLine) {
732+
flags |= v8::RegExp::Flags::kMultiline;
733+
}
734+
if (option & RegExpObjectRef::RegExpObjectOption::Sticky) {
735+
flags |= v8::RegExp::Flags::kSticky;
736+
}
737+
if (option & RegExpObjectRef::RegExpObjectOption::Unicode) {
738+
flags |= v8::RegExp::Flags::kUnicode;
739+
}
740+
if (option & RegExpObjectRef::RegExpObjectOption::DotAll) {
741+
flags |= v8::RegExp::Flags::kDotAll;
742+
}
743+
744+
return static_cast<v8::RegExp::Flags>(flags);
745+
}
746+
694747
MaybeLocal<v8::RegExp> v8::RegExp::New(Local<Context> context,
695748
Local<String> pattern,
696749
Flags flags) {
697750
API_ENTER_WITH_CONTEXT(context, MaybeLocal<RegExp>());
698751
auto lwContext = lwIsolate->GetCurrentContext();
699752
auto lwPattern = CVAL(*pattern)->value();
700-
int flagsValue = (int)flags;
753+
RegExpObjectRef::RegExpObjectOption flagsValue =
754+
ToEsRegExpObjectOption(flags);
701755

702756
auto r = Evaluator::execute(
703757
lwContext->get(),
704-
[](ExecutionStateRef* esState, ValueRef* source, int flags) -> ValueRef* {
705-
return RegExpObjectRef::create(
706-
esState, source, (RegExpObjectRef::RegExpObjectOption)flags);
758+
[](ExecutionStateRef* esState,
759+
ValueRef* source,
760+
RegExpObjectRef::RegExpObjectOption flags) -> ValueRef* {
761+
return RegExpObjectRef::create(esState, source, flags);
707762
},
708763
lwPattern,
709764
flagsValue);
@@ -747,7 +802,7 @@ v8::RegExp::Flags v8::RegExp::GetFlags() const {
747802
[](ExecutionStateRef* esState,
748803
RegExpObjectRef* self,
749804
int* flags) -> ValueRef* {
750-
*flags = self->option();
805+
*flags = ToV8RegExpFlags(self->option());
751806
return ValueRef::createNull();
752807
},
753808
self->asRegExpObject(),
@@ -936,34 +991,38 @@ Maybe<bool> Map::Delete(Local<Context> context, Local<Value> key) {
936991
Local<Array> Map::AsArray() const {
937992
API_ENTER_NO_TERMINATION_CHECK(EsScope, nullptr);
938993

939-
EvalResult r = Evaluator::execute(
940-
scope.context(),
941-
[](ExecutionStateRef* esState, MapObjectRef* esSelf) -> ValueRef* {
942-
auto done = StringRef::createFromASCII("done");
943-
auto value = StringRef::createFromASCII("value");
944-
auto zero = ValueRef::create(0);
945-
auto one = ValueRef::create(1);
946-
auto vector = ValueVectorRef::create();
947-
948-
auto itr = esSelf->entries(esState);
949-
for (auto entry = itr->next(esState);
950-
entry->asObject()->get(esState, done)->isFalse();
951-
entry = itr->next(esState)) {
952-
auto keyValueArray =
953-
entry->asObject()->get(esState, value)->asObject();
954-
auto key = keyValueArray->getIndexedProperty(esState, zero);
955-
auto value = keyValueArray->getIndexedProperty(esState, one);
956-
957-
vector->pushBack(key);
958-
vector->pushBack(value);
959-
}
960-
961-
return ArrayObjectRef::create(esState, vector);
962-
},
963-
scope.self()->asMapObject());
964-
LWNODE_CHECK(r.isSuccessful());
965-
966-
return Utils::NewLocal<Array>(scope.v8Isolate(), r.result);
994+
LWNODE_UNIMPLEMENT;
995+
return Utils::NewLocal<Array>(
996+
scope.v8Isolate(), ArrayObjectRefHelper::create(scope.context(), 1));
997+
998+
// EvalResult r = Evaluator::execute(
999+
// scope.context(),
1000+
// [](ExecutionStateRef* esState, MapObjectRef* esSelf) -> ValueRef* {
1001+
// auto done = StringRef::createFromASCII("done");
1002+
// auto value = StringRef::createFromASCII("value");
1003+
// auto zero = ValueRef::create(0);
1004+
// auto one = ValueRef::create(1);
1005+
// auto vector = ValueVectorRef::create();
1006+
1007+
// auto itr = esSelf->entries(esState);
1008+
// for (auto entry = itr->next(esState);
1009+
// entry->asObject()->get(esState, done)->isFalse();
1010+
// entry = itr->next(esState)) {
1011+
// auto keyValueArray =
1012+
// entry->asObject()->get(esState, value)->asObject();
1013+
// auto key = keyValueArray->getIndexedProperty(esState, zero);
1014+
// auto value = keyValueArray->getIndexedProperty(esState, one);
1015+
1016+
// vector->pushBack(key);
1017+
// vector->pushBack(value);
1018+
// }
1019+
1020+
// return ArrayObjectRef::create(esState, vector);
1021+
// },
1022+
// scope.self()->asMapObject());
1023+
// LWNODE_CHECK(r.isSuccessful());
1024+
1025+
// return Utils::NewLocal<Array>(scope.v8Isolate(), r.result);
9671026
}
9681027

9691028
Local<v8::Set> v8::Set::New(Isolate* isolate) {

‎src/api/es-helper.cc‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,10 @@ EvalResult ObjectRefHelper::setPrototype(ContextRef* context,
345345
[](ExecutionStateRef* state,
346346
ObjectRef* object,
347347
ValueRef* prototype) -> ValueRef* {
348-
return ValueRef::create(object->setPrototype(state, prototype));
348+
// call ObjectRef::setObjectPrototype instead of ObjectRef::setPrototype
349+
// here because ImmutablePrototypeObject blocks __proto__ property
350+
// setting
351+
return ValueRef::create(object->setObjectPrototype(state, prototype));
349352
},
350353
object,
351354
prototype);

‎src/api/isolate.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ SymbolRef* IsolateWrap::createApiSymbol(StringRef* name) {
576576
auto newSymbol = SymbolRef::create(name);
577577
bool found = false;
578578
for (size_t i = 0; i < apiSymbols_.size(); i++) {
579-
if (apiSymbols_[i]->description()->equals(name)) {
579+
if (apiSymbols_[i]->descriptionString()->equals(name)) {
580580
apiSymbols_[i] = newSymbol;
581581
found = true;
582582
break;
@@ -596,7 +596,7 @@ SymbolRef* IsolateWrap::getApiSymbol(StringRef* name) {
596596
LWNODE_CALL_TRACE_ID(ISOWRAP);
597597

598598
for (auto apiSymbols : apiSymbols_) {
599-
if (apiSymbols->description()->equals(name)) {
599+
if (apiSymbols->descriptionString()->equals(name)) {
600600
return apiSymbols;
601601
}
602602
}
@@ -609,7 +609,7 @@ SymbolRef* IsolateWrap::createApiPrivateSymbol(StringRef* name) {
609609
auto newSymbol = SymbolRef::create(name);
610610
bool found = false;
611611
for (size_t i = 0; i < apiPrivateSymbols_.size(); i++) {
612-
if (apiPrivateSymbols_[i]->description()->equals(name)) {
612+
if (apiPrivateSymbols_[i]->descriptionString()->equals(name)) {
613613
apiPrivateSymbols_[i] = newSymbol;
614614
found = true;
615615
break;
@@ -630,7 +630,7 @@ SymbolRef* IsolateWrap::getApiPrivateSymbol(StringRef* name) {
630630
LWNODE_CALL_TRACE_ID(ISOWRAP);
631631

632632
for (auto apiPrivateSymbol : apiPrivateSymbols_) {
633-
if (apiPrivateSymbol->description()->equals(name)) {
633+
if (apiPrivateSymbol->descriptionString()->equals(name)) {
634634
return apiPrivateSymbol;
635635
}
636636
}

‎src/api/utils/gc-util.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ void MemoryUtil::gcSetWarningListener(OnGCWarnEventListener callback) {
164164
if (g_gcWarnEventListener == nullptr) {
165165
g_gcWarnEventListener = callback;
166166

167-
GC_set_warn_proc([](char* format, GC_word arg) {
167+
GC_set_warn_proc([](const char* format, GC_uintptr_t arg) {
168168
/*
169169
GC Warning: ...May lead to memory leak and poor performance
170170
GC Warning: ...Failed to expand heap

0 commit comments

Comments
 (0)