Update SpiderMonkey #25678

nox · 2020-02-03T16:23:38Z

Do not merge.

highfive · 2020-02-03T16:23:44Z

Heads up! This PR modifies the following files:

@asajeffrey: components/script/dom/bindings/utils.rs, components/script/dom/eventtarget.rs, components/script/dom/bindings/namespace.rs, components/script/dom/bindings/error.rs, components/script/dom/bindings/codegen/CodegenRust.py and 10 more
@KiChjang: components/script/dom/bindings/utils.rs, components/script/dom/eventtarget.rs, components/script/dom/bindings/namespace.rs, components/script/dom/bindings/error.rs, components/script/dom/bindings/codegen/CodegenRust.py and 10 more
@emilio: components/style/Cargo.toml

highfive · 2020-02-03T16:23:46Z

Warning

These commits modify unsafe code. Please review it carefully!
These commits modify style and script code, but no tests are modified. Please consider adding a test!


        Auto merge of #25678 - servo:smup, r=<try>

Update SpiderMonkey (the wipest of WIPs) Do not merge.


        Auto merge of #25678 - servo:smup, r=<try>

Update SpiderMonkey (the wipest of WIPs) Do not merge.


        Auto merge of #25678 - servo:smup, r=<try>

Update SpiderMonkey (the wipest of WIPs) Do not merge.

nox · 2020-02-27T15:13:54Z

@bors-servo try

bors-servo · 2020-02-27T16:15:01Z

⌛ Trying commit 379bdd3 with merge 7305335...


        Auto merge of #25678 - servo:smup, r=<try>

Update SpiderMonkey (the wipest of WIPs) Do not merge.

bors-servo · 2020-02-27T16:28:23Z

💔 Test failed - status-taskcluster

nox · 2020-03-02T10:21:15Z

@emilio I updated bindgen to 0.53, which means we may need .size_t_is_usize(true) on the Gecko side of Stylo.

bors-servo · 2020-03-05T16:10:36Z

☔ The latest upstream changes (presumably #25863) made this pull request unmergeable. Please resolve the merge conflicts.

asajeffrey

LGTM. You can r=me once the other changes land.

asajeffrey · 2020-03-05T20:52:23Z

Cargo.toml

+rust-webvr-api = { git = "https://github.com/servo/rust-webvr.git", branch = "bindgen" }
+[patch."https://github.com/servo/webxr"]
+webxr = { git = "https://github.com/servo/webxr.git?lol", branch = "bindgen" }
+webxr-api = { git = "https://github.com/servo/webxr.git?lol", branch = "bindgen" }


Why do we need to update webvr/xr?

For bindgen.

asajeffrey · 2020-03-05T20:52:23Z

components/script/dom/bindings/codegen/CodegenRust.py

+        'js::jsapi::JSPropertySpec_Accessor',
+        'js::jsapi::JSPropertySpec_AccessorsOrValue',
+        'js::jsapi::JSPropertySpec_AccessorsOrValue_Accessors',
+        'js::jsapi::JSPropertySpec_Name',


More yay for bindgenup!


        Update SpiderMonkey

nox · 2020-03-06T10:15:03Z

@bors-servo r=asajeffrey p=1

bors-servo · 2020-03-06T10:15:04Z

📌 Commit 5a4f8cf has been approved by asajeffrey

bors-servo · 2020-03-06T10:20:28Z

⌛ Testing commit 5a4f8cf with merge 356c4e0...

CYBAI · 2020-03-06T10:22:03Z

components/script/dom/globalscope.rs

-                        code.as_ptr() as *const _,
-                        code.len() as libc::size_t,
+                        &mut SourceText {
+                            units_: code.as_ptr() as *const _,


This makes me notice I forgot to file an issue to expose this function from rust-mozjs 👀 Let me file one!

servo/components/script/script_module.rs

Lines 78 to 85 in ca25e18

pub fn get_source_text(source: &[u16]) -> SourceText<u16> {

SourceText {

units_: source.as_ptr() as *const _,

length_: source.len() as u32,

ownsUnits_: false,

_phantom_0: PhantomData,

}

}

Ah, nah, I did file one at servo/rust-mozjs#490. Will send a PR to fix it and update here and script_module.

bors-servo · 2020-03-06T11:35:20Z

☀️ Test successful - status-taskcluster
Approved by: asajeffrey
Pushing 356c4e0 to master...

highfive assigned paulrouget Feb 3, 2020

highfive added the S-awaiting-review label Feb 3, 2020

This comment was marked as outdated.

Sign in to view

highfive added the S-tests-failed label Feb 3, 2020

This comment was marked as resolved.

Sign in to view

nox force-pushed the smup branch from 43e811c to 6e18c21 Feb 4, 2020

highfive removed the S-tests-failed label Feb 4, 2020

This comment was marked as outdated.

Sign in to view

highfive added the S-tests-failed label Feb 4, 2020

This comment was marked as resolved.

Sign in to view

nox force-pushed the smup branch from 6e18c21 to eca6c35 Feb 4, 2020

highfive removed the S-tests-failed label Feb 4, 2020

This comment was marked as outdated.

Sign in to view

highfive added the S-tests-failed label Feb 4, 2020

nox force-pushed the smup branch from eca6c35 to 315e8a1 Feb 5, 2020

highfive removed the S-tests-failed label Feb 5, 2020

This comment was marked as outdated.

Sign in to view

nox force-pushed the smup branch from a4440dc to 379bdd3 Feb 27, 2020

nox force-pushed the smup branch from 379bdd3 to f8e9ac5 Mar 2, 2020

highfive removed the S-tests-failed label Mar 2, 2020

nox force-pushed the smup branch from f8e9ac5 to a738442 Mar 2, 2020

jdm mentioned this pull request Mar 3, 2020

Immersive mode doesn't reach 60fps #25425

Closed

nox changed the title ~~Update SpiderMonkey (the wipest of WIPs)~~ Update SpiderMonkey Mar 5, 2020

asajeffrey reviewed Mar 5, 2020

View changes

Update SpiderMonkey

Loading status checks…

5a4f8cf

nox force-pushed the smup branch from a738442 to 5a4f8cf Mar 6, 2020

highfive assigned asajeffrey and unassigned jdm Mar 6, 2020

highfive added S-awaiting-merge and removed S-awaiting-review S-needs-rebase labels Mar 6, 2020

CYBAI reviewed Mar 6, 2020

View changes

bors-servo merged commit 356c4e0 into master Mar 6, 2020
2 checks passed

2 checks passed

Community-TC (pull_request) TaskGroup: success
Details

homu Test successful
Details

bors-servo deleted the smup branch Mar 6, 2020

highfive removed the S-awaiting-merge label Mar 6, 2020

jdm mentioned this pull request Mar 6, 2020

Download usable macOS SDK during bootstrap #25920

Closed

4 of 4 tasks complete

servo / servo

Update SpiderMonkey #25678

Update SpiderMonkey #25678

nox commented Feb 3, 2020

highfive commented Feb 3, 2020

highfive commented Feb 3, 2020

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

nox commented Feb 27, 2020

bors-servo commented Feb 27, 2020

bors-servo commented Feb 27, 2020

nox commented Mar 2, 2020

bors-servo commented Mar 5, 2020

asajeffrey left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

nox commented Mar 6, 2020

bors-servo commented Mar 6, 2020

bors-servo commented Mar 6, 2020

This comment has been minimized.

This comment has been minimized.

bors-servo commented Mar 6, 2020

	pub fn get_source_text(source: &[u16]) -> SourceText<u16> {
	SourceText {
	units_: source.as_ptr() as *const _,
	length_: source.len() as u32,
	ownsUnits_: false,
	_phantom_0: PhantomData,
	}
	}

servo / servo

Join GitHub today

Update SpiderMonkey #25678

Update SpiderMonkey #25678

Conversation

nox commented Feb 3, 2020

highfive commented Feb 3, 2020

highfive commented Feb 3, 2020

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as resolved.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

nox commented Feb 27, 2020

bors-servo commented Feb 27, 2020

bors-servo commented Feb 27, 2020

nox commented Mar 2, 2020

bors-servo commented Mar 5, 2020

asajeffrey left a comment

This comment has been minimized.

asajeffrey Mar 5, 2020

This comment has been minimized.

nox Mar 5, 2020

This comment has been minimized.

asajeffrey Mar 5, 2020

nox commented Mar 6, 2020

bors-servo commented Mar 6, 2020

bors-servo commented Mar 6, 2020

This comment has been minimized.

CYBAI Mar 6, 2020

This comment has been minimized.

CYBAI Mar 6, 2020

bors-servo commented Mar 6, 2020