Skip to content

/ rust-mozjs

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.

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

Update to SpiderMonkey 66. #458

Merged
merged 2 commits into from May 7, 2019
Merged

Update to SpiderMonkey 66. #458

merged 2 commits into from May 7, 2019

Conversation

@jdm
Copy link
Member

jdm commented Apr 4, 2019 •
edited by larsbergstrom

This change is Reviewable
@jdm
Copy link
Member Author

jdm commented Apr 4, 2019

Depends on servo/mozjs#172.
@jdm jdm force-pushed the jdm:smup66 branch 2 times, most recently from f2d8a6b to ead7541 Apr 4, 2019
@jdm jdm mentioned this pull request Apr 9, 2019
Merged
@jdm jdm force-pushed the jdm:smup66 branch 2 times, most recently from cc773a3 to 2239c6e Apr 29, 2019
@bors-servo
Copy link
Contributor

bors-servo commented Apr 30, 2019

☔ The latest upstream changes (presumably #461) made this pull request unmergeable. Please resolve the merge conflicts.
@jdm jdm force-pushed the jdm:smup66 branch from 2239c6e to 9022653 Apr 30, 2019
@jdm
Copy link
Member Author

jdm commented Apr 30, 2019

Windows error:

  = note: lld-link: error: undefined symbol: JSID_VOID
          >>> referenced by C:\Users\appveyor\.cargo\git\checkouts\mozjs-fa11ffc7d4f1cc2d\233235a\src\jsimpls.rs:55
          >>>               libmozjs_sys-82ed1c8753c8895b.rlib(mozjs_sys-82ed1c8753c8895b.mozjs_sys.c31j43od-cgu.1.rcgu.o):(_ZN9mozjs_sys7jsimpls96_$LT$impl$u20$core..default..Default$u20$for$u20$mozjs_sys..generated..root..JS..PropertyKey$GT$7default17h69604fc21c10c03eE)
          
error: aborting due to previous error
@jdm jdm force-pushed the jdm:smup66 branch from 0e644ae to 78aba96 Apr 30, 2019
@jdm
Copy link
Member Author

jdm commented Apr 30, 2019

Linux/macOS debug and non-debugmozjs builds are succeeding. Windows builds are succeeding.
@jdm jdm force-pushed the jdm:smup66 branch from e448c65 to 2455123 May 3, 2019
@jdm
Copy link
Member Author

jdm commented May 3, 2019

This is ready for review.
@jdm jdm force-pushed the jdm:smup66 branch from 2455123 to e5ecfbe May 3, 2019
@asajeffrey
asajeffrey approved these changes May 6, 2019
View changes
Copy link
Member

asajeffrey left a comment

LGTM, r=me when the patch in Cargo.toml is gone.
.travis.yml
homebrew:
packages:
- python
- python@2

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey May 6, 2019

Member

Oh joy, two versions of python. :/
Cargo.toml Outdated
mozjs_sys = "0.66.0"

[patch.crates-io]
mozjs_sys = { git = "https://github.com/servo/mozjs", branch = "smup66" }

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey May 6, 2019

Member

Must remember to unpatch this before merging!
src/rust.rs
let options = CompileOptionsWrapper::new(self.cx(), filename_cstr.as_ptr(), line_num);

unsafe {
if !Evaluate2(self.cx(), options.ptr, ptr as *const u16, len as size_t, rval.into()) {
if !EvaluateUtf8(self.cx(), options.ptr, ptr as *const _, len as size_t, rval.into()) {

This comment has been minimized.

Sign in to view
@asajeffrey

asajeffrey May 6, 2019

Member

Hoorah! Evaluating a UTF-8 string without going via UTF-16!
jdm added 2 commits Apr 4, 2019
@jdm
Update to SpiderMonkey 66.
e9067ee
@jdm
Update CI for SpiderMonkey 66.
Loading status checks…
4087d09
@jdm jdm force-pushed the jdm:smup66 branch from e5ecfbe to 4087d09 May 7, 2019
@jdm
Copy link
Member Author

jdm commented May 7, 2019

@bors-servo r=asajeffrey
@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

📌 Commit 4087d09 has been approved by asajeffrey
bors-servo added a commit that referenced this pull request May 7, 2019
@bors-servo
Auto merge of #458 - jdm:smup66, r=asajeffrey
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
357d1db 
Update to SpiderMonkey 66.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/458)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

⌛ Testing commit 4087d09 with merge 357d1db...
@bors-servo
Copy link
Contributor

bors-servo commented May 7, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: asajeffrey
Pushing 357d1db to master...
@bors-servo bors-servo merged commit 4087d09 into servo:master May 7, 2019
2 of 3 checks passed
2 of 3 checks passed
Travis CI - Pull Request Build Failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@asajeffrey asajeffrey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@jdm @bors-servo @asajeffrey
You can’t perform that action at this time.