Skip to content

src: update RegExp type constant for V8 8.1 #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mmarchini wants to merge 2 commits into from
Closed

src: update RegExp type constant for V8 8.1 #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
895713e
src: update RegExp type constant for V8 8.1
mmarchini Apr 22, 2020
817914d
build: add v14 to the test matrix
mmarchini Apr 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,9 @@ jobs:
- version: 10.x
- version: 12.x
- version: 14.x
- version: 15.x
Copy link
Contributor Author

@mmarchini mmarchini Apr 22, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note this will fail for a few days until we bump the major version on core, but that's fine since those tests are allowed to fail anyway.

mirror: https://nodejs.org/download/nightly
- version: 14.x
- version: 15.x
mirror: https://nodejs.org/download/v8-canary
os: [ubuntu-latest, macos-latest]
steps:
Expand All @@ -40,19 +41,19 @@ jobs:
npm install --llnode_build_addon=true --llnode_coverage=true
- name: run tests
run: TEST_LLDB_BINARY=`which lldb-3.9` npm run nyc-test-all
if: matrix.node.version != '14.x'
if: matrix.node.version != '15.x'
- name: run tests (nightly)
run: TEST_LLDB_BINARY=`which lldb-3.9` npm run nyc-test-all
if: matrix.node.version == '14.x'
if: matrix.node.version == '15.x'
continue-on-error: true
- name: prepare coverage
if: matrix.os == 'ubuntu-latest' && matrix.node.version != '14.x'
if: matrix.os == 'ubuntu-latest' && matrix.node.version != '15.x'
run: |
npm run coverage
cat ./coverage-js.info > ./coverage.info
cat ./coverage-cc.info >> ./coverage.info
- name: coveralls
if: matrix.os == 'ubuntu-latest' && matrix.node.version != '14.x'
if: matrix.os == 'ubuntu-latest' && matrix.node.version != '15.x'
uses: coverallsapp/github-action@master
with:
path-to-lcov: ./coverage.info
Expand Down
3 changes: 2 additions & 1 deletion src/llv8-constants.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,8 @@ void Types::Load() {
kFixedArrayType = LoadConstant("type_FixedArray__FIXED_ARRAY_TYPE");
kJSArrayBufferType = LoadConstant("type_JSArrayBuffer__JS_ARRAY_BUFFER_TYPE");
kJSTypedArrayType = LoadConstant("type_JSTypedArray__JS_TYPED_ARRAY_TYPE");
kJSRegExpType = LoadConstant("type_JSRegExp__JS_REGEXP_TYPE");
kJSRegExpType = LoadConstant(
{"type_JSRegExp__JS_REG_EXP_TYPE", "type_JSRegExp__JS_REGEXP_TYPE"});
kJSDateType = LoadConstant("type_JSDate__JS_DATE_TYPE");
kSharedFunctionInfoType =
LoadConstant("type_SharedFunctionInfo__SHARED_FUNCTION_INFO_TYPE");
Expand Down
2 changes: 1 addition & 1 deletion src/llv8-constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ class Types : public Module {
int64_t kFixedArrayType;
int64_t kJSArrayBufferType;
int64_t kJSTypedArrayType;
int64_t kJSRegExpType;
Constant<int64_t> kJSRegExpType;
int64_t kJSDateType;
int64_t kSharedFunctionInfoType;
Constant<int64_t> kUncompiledDataWithoutPreParsedScopeType;
Expand Down
2 changes: 1 addition & 1 deletion src/llv8.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ std::string HeapObject::GetTypeName(Error& err) {
return "(Function)";
}

if (type == v8()->types()->kJSRegExpType) {
if (type == *v8()->types()->kJSRegExpType) {
return "(RegExp)";
}

Expand Down
2 changes: 1 addition & 1 deletion src/printer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ std::string Printer::Stringify(v8::HeapObject heap_object, Error& err) {
return pre + Stringify(fn, err);
}

if (type == llv8_->types()->kJSRegExpType) {
if (type == *llv8_->types()->kJSRegExpType) {
v8::JSRegExp re(heap_object);
return pre + Stringify(re, err);
}
Expand Down