src: fixes for V8 6.9 and 7.0 by mmarchini · Pull Request #247 · nodejs/llnode · GitHub
Skip to content

src: fixes for V8 6.9 and 7.0 #247

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: fixes for V8 6.9 and 7.0 #247

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
529b35a
src: fixes for V8 6.9 and 7.0
mmarchini Nov 6, 2018
e708c92
travis: add tests for Node.js v11
mmarchini Jan 25, 2019
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
21 changes: 21 additions & 0 deletions .travis.yml
View file
Open in desktop
20 changes: 11 additions & 9 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ https://asciinema.org/a/29589

## Build Status

| Version | v6.x | v8.x | v10.x | master | v8-canary |
|---------|-------------------------|-------------------------|---------------------------|-------------------------------|----------------------------------|
| **Trusty** | [![v6.x badge][v6-trusty-badge]][travis] | [![v8.x badge][v8-trusty-badge]][travis] | [![v10.x badge][v10-trusty-badge]][travis] | [![master badge][master-trusty-badge]][travis] | [![v8-canary badge][canary-trusty-badge]][travis] |
| **OS X** | [![v6.x badge][v6-osx-badge]][travis] | [![v8.x badge][v8-osx-badge]][travis] | [![v10.x badge][v10-osx-badge]][travis] | - | - |
| Version | v6.x | v8.x | v10.x | v11.x | master | v8-canary |
|---------|-------------------------|-------------------------|---------------------------|---------------------------|-------------------------------|----------------------------------|
| **Trusty** | [![v6.x badge][v6-trusty-badge]][travis] | [![v8.x badge][v8-trusty-badge]][travis] | [![v10.x badge][v10-trusty-badge]][travis] | [![v11.x badge][v11-trusty-badge]][travis] | [![master badge][master-trusty-badge]][travis] | [![v8-canary badge][canary-trusty-badge]][travis] |
| **OS X** | [![v6.x badge][v6-osx-badge]][travis] | [![v8.x badge][v8-osx-badge]][travis] | [![v10.x badge][v10-osx-badge]][travis] | [![v11.x badge][v11-osx-badge]][travis] | - | - |

We have nightly test runs against all Node.js active release lines. We also test
against Node.js master and Node.js v8-canary nightly builds to help us identify
Expand Down Expand Up @@ -388,10 +388,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
[v6-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/1?use_travis_com=true
[v8-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/2?use_travis_com=true
[v10-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/3?use_travis_com=true
[v11-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/4?use_travis_com=true

[v6-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/4?use_travis_com=true
[v8-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/5?use_travis_com=true
[v10-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/6?use_travis_com=true
[v6-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/5?use_travis_com=true
[v8-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/6?use_travis_com=true
[v10-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/7?use_travis_com=true
[v11-osx-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/8?use_travis_com=true

[master-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/7?use_travis_com=true
[canary-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/8?use_travis_com=true
[master-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/10?use_travis_com=true
[canary-trusty-badge]: https://travisci-matrix-badges.herokuapp.com/repos/nodejs/llnode/branches/master/11?use_travis_com=true
28 changes: 25 additions & 3 deletions src/llv8-constants.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@ void JSDate::Load() {


void SharedInfo::Load() {
kFunctionDataOffset =
LoadConstant("class_SharedFunctionInfo__function_data__Object");
kNameOrScopeInfoOffset =
LoadConstant("class_SharedFunctionInfo__name_or_scope_info__Object");
kNameOffset = LoadConstant("class_SharedFunctionInfo__raw_name__Object",
Expand All @@ -193,6 +195,8 @@ void SharedInfo::Load() {
LoadConstant("class_SharedFunctionInfo__inferred_name__String",
"class_SharedFunctionInfo__function_identifier__Object");
kScriptOffset = LoadConstant("class_SharedFunctionInfo__script__Object");
kScriptOrDebugInfoOffset =
LoadConstant("class_SharedFunctionInfo__script_or_debug_info__Object");
kStartPositionOffset =
LoadConstant("class_SharedFunctionInfo__start_position_and_type__int",
"class_SharedFunctionInfo__start_position_and_type__SMI");
Expand All @@ -201,11 +205,12 @@ void SharedInfo::Load() {
"class_SharedFunctionInfo__end_position__SMI");
kParameterCountOffset = LoadConstant(
"class_SharedFunctionInfo__internal_formal_parameter_count__int",
"class_SharedFunctionInfo__internal_formal_parameter_count__SMI");
"class_SharedFunctionInfo__internal_formal_parameter_count__uint16_t");

if (kParameterCountOffset == -1) {
kParameterCountOffset =
LoadConstant("class_SharedFunctionInfo__formal_parameter_count__SMI");
kParameterCountOffset = LoadConstant(
"class_SharedFunctionInfo__internal_formal_parameter_count__SMI",
"class_SharedFunctionInfo__formal_parameter_count__SMI");
}

// NOTE: Could potentially be -1 on v4 and v5 node, should check in llv8
Expand All @@ -229,6 +234,16 @@ void SharedInfo::Load() {
}


void UncompiledData::Load() {
kInferredNameOffset =
LoadConstant("class_UncompiledData__inferred_name__String");
kStartPositionOffset =
LoadConstant("class_UncompiledData__start_position__int32_t");
kEndPositionOffset =
LoadConstant("class_UncompiledData__end_position__int32_t");
}


void Code::Load() {
kStartOffset = LoadConstant("class_Code__instruction_start__uintptr_t");
kSizeOffset = LoadConstant("class_Code__instruction_size__int");
Expand All @@ -238,6 +253,7 @@ void Code::Load() {
void ScopeInfo::Load() {
kParameterCountOffset = LoadConstant("scopeinfo_idx_nparams");
kStackLocalCountOffset = LoadConstant("scopeinfo_idx_nstacklocals");
kEmbeddedParamAndStackLocals = kStackLocalCountOffset != -1;
kContextLocalCountOffset = LoadConstant("scopeinfo_idx_ncontextlocals");
kVariablePartIndex = LoadConstant("scopeinfo_idx_first_vars");
}
Expand Down Expand Up @@ -516,6 +532,12 @@ void Types::Load() {
kJSDateType = LoadConstant("type_JSDate__JS_DATE_TYPE");
kSharedFunctionInfoType =
LoadConstant("type_SharedFunctionInfo__SHARED_FUNCTION_INFO_TYPE");
kUncompiledDataWithoutPreParsedScopeType = LoadConstant(
"type_UncompiledDataWithoutPreParsedScope__UNCOMPILED_DATA_WITHOUT_PRE_"
"PARSED_SCOPE_TYPE");
kUncompiledDataWithPreParsedScopeType = LoadConstant(
"type_UncompiledDataWithPreParsedScope__UNCOMPILED_DATA_WITH_PRE_PARSED_"
"SCOPE_TYPE");
kScriptType = LoadConstant("type_Script__SCRIPT_TYPE");
kScopeInfoType = LoadConstant("type_ScopeInfo__SCOPE_INFO_TYPE");
kSymbolType = LoadConstant("type_Symbol__SYMBOL_TYPE");
Expand Down
17 changes: 17 additions & 0 deletions src/llv8-constants.h
View file
Open in desktop
Loading