WIP smup #17143

fitzgen · 2017-06-02T18:39:41Z

So this compiles and stuff, but not yet passing tests.

Here are the results of the DOM wpt, which I haven't started digging into yet:

Ran 285 tests finished in 104.0 seconds.
  • 21 ran as expected. 15 tests skipped.
  • 31 tests crashed unexpectedly
  • 233 tests timed out unexpectedly

This change is

bors-servo · 2017-06-05T20:39:32Z

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

fitzgen · 2017-06-06T19:51:06Z

Fixed some issues in CodegenRust.py causing bad *const jsapi::JSJitInfo pointers; now seeing some MOZ_CRASHes inside spidermonkey.

fitzgen · 2017-06-08T00:23:26Z

Ok, fixed some more things to do with proxies, which upstream SpiderMonkey had changed where expandos and private objects are stored and I got subtly wrong when rebasing.

New dom WPT results are pretty close to passing:

Ran 285 tests finished in 81.0 seconds.
  • 248 ran as expected. 15 tests skipped.
  • 7 tests crashed unexpectedly
  • 30 tests timed out unexpectedly

fitzgen · 2017-06-16T17:10:11Z

No more crashes!

Ran 285 tests finished in 79.0 seconds.
  • 272 ran as expected. 15 tests skipped.
  • 13 tests timed out unexpectedly
  • 7 tests had unexpected subtest results

fitzgen · 2017-06-16T18:39:58Z

Seems like the timeouts and unexpected results were because I was using a debug + debugmozjs build \o/

Ran 285 tests finished in 26.0 seconds.
  • 285 ran as expected. 15 tests skipped.

KiChjang · 2017-06-23T00:46:24Z

Huh, autospider is requiring gcc 4.9 or newer, and travis CI uses 4.8.4...

jdm · 2017-06-23T01:45:43Z

https://gist.github.com/cotsog/3ce84675af0d74438d91 may help.

bors-servo · 2017-06-23T06:06:15Z

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

jdm

All pretty minor changes that I've suggested.

jdm · 2017-07-13T21:01:19Z

components/script/dom/bindings/utils.rs

+pub fn leak_as_static<T>(t: T) -> &'static T {
+    let boxed = Box::new(t);
+    let ptr = &*boxed as *const T;
+    mem::forget(boxed);


let ptr = Box::into_raw(Box::new(t));

jdm · 2017-07-13T21:01:19Z

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

    if descriptor.weakReferenceable:
        create += """
-JS_SetReservedSlot(obj.get(), DOM_WEAK_SLOT, PrivateValue(ptr::null()));"""
+jsapi::JS_SetReservedSlot(obj.get(), DOM_WEAK_SLOT, &PrivateValue(ptr::null()) as *const _);"""


This cast would not be necessary.

jdm · 2017-07-13T21:01:19Z

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

-JS_SetReservedSlot(prototype.get(), DOM_PROTO_UNFORGEABLE_HOLDER_SLOT,
-                   ObjectValue(unforgeable_holder.get()))"""))
+jsapi::JS_SetReservedSlot(prototype.get(), DOM_PROTO_UNFORGEABLE_HOLDER_SLOT,
+                   &ObjectValue(unforgeable_holder.get()) as *const _)"""))


Unnecessary cast.

jdm · 2017-07-13T21:01:19Z

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

+                                unsafe extern "C" fn(*mut jsapi::JSContext,
+                                                     jsapi::JS::HandleObject,
+                                                     _,
+                                                     _) -> bool) },


Why is this transmute required?

It's there to change the *const ActualType parameter into a *const std::os::raw::c_void. Upon reflection this is better done with as.

hmmm nevermind, as doesn't work here:

error[E0605]: non-primitive cast: `unsafe extern "C" fn(*mut js::jsapi::JSContext, js::jsapi::JS::Handle<*mut js::jsapi::JSObject>, *const dom::xmlhttprequesteventtarget::XMLHttpRequestEventTarget, js::jsapi::JSJitSetterCallArgs) -> bool {dom::bindings::codegen::Bindings::XMLHttpRequestEventTargetBinding::XMLHttpRequestEventTargetBinding::set_onloadend}` as `unsafe extern "C" fn(*mut js::jsapi::JSContext, js::jsapi::JS::Handle<*mut js::jsapi::JSObject>, *mut std::os::raw::c_void, *const js::jsapi::JSJitMethodCallArgs) -> bool` --> /home/fitzgen/servo/target/debug/build/script-11a815433a47bb39/out/Bindings/XMLHttpRequestEventTargetBinding.rs:885:22 | 885 | method: Some(set_onloadend as | ______________________^ 886 | | unsafe extern "C" fn(*mut jsapi::JSContext, 887 | | jsapi::JS::Handle<*mut jsapi::JSObject>, 888 | | _, 889 | | _) -> bool), | |___________________________________________^ | = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait

jdm · 2017-07-13T21:01:19Z

components/script/dom/bindings/conversions.rs

@@ -23,7 +23,7 @@
 //! | DOMString               | `DOMString`                      |
 //! | USVString               | `USVString`                      |
 //! | ByteString              | `ByteString`                     |
-//! | object                  | `*mut JSObject`                  |
+//! | object                  | `*mut jsapi::JSObject`                  |


nit: the alignment in this table is now off.

jdm · 2017-07-13T21:01:19Z

components/script/dom/bindings/interface.rs

+    let proto_array = PrivateValue(Box::into_raw(proto_array) as *const libc::c_void);
+    jsapi::JS_SetReservedSlot(rval.get(),
+                              DOM_PROTOTYPE_SLOT,
+                              &proto_array as *const _);


Unnecessary cast.

jdm · 2017-07-13T21:01:19Z

components/script/dom/bindings/weakref.rs

@@ -60,7 +60,8 @@ pub trait WeakReferenceable: DomObject + Sized {
                    count: Cell::new(1),
                    value: Cell::new(Some(NonZero::new(self))),
                });
-                JS_SetReservedSlot(object, DOM_WEAK_SLOT, PrivateValue(ptr as *const c_void));
+                let ptr = PrivateValue(ptr as *const c_void);
+                jsapi::JS_SetReservedSlot(object, DOM_WEAK_SLOT, &ptr as *const _);


Unnecessary cast.

jdm · 2017-07-13T21:01:19Z

components/script/dom/windowproxy.rs

@@ -123,10 +114,11 @@ impl WindowProxy {

            // The window proxy owns the browsing context.
            // When we finalize the window proxy, it drops the browsing context it owns.
-            SetProxyExtra(js_proxy.get(), 0, &PrivateValue((&*window_proxy).as_void_ptr()));
+            let private = js::jsval::PrivateValue((&*window_proxy).as_void_ptr());
+            SetProxyReservedSlot(js_proxy.get(), 0, &private as *const _);


Unnecessary cast.

jdm · 2017-07-13T21:01:19Z

components/script/dom/windowproxy.rs

@@ -159,19 +151,19 @@ impl WindowProxy {
            let window = DissimilarOriginWindow::new(global_to_clone_from, &*window_proxy);
            let window_jsobject = window.reflector().get_jsobject();
            assert!(!window_jsobject.get().is_null());
-            assert!(((*get_object_class(window_jsobject.get())).flags & JSCLASS_IS_GLOBAL) != 0);
-            let _ac = JSAutoCompartment::new(cx, window_jsobject.get());
+            assert!(((*js::rust::get_object_class(window_jsobject.get())).flags & jsapi::JSCLASS_IS_GLOBAL) != 0);


Perhaps we should use the new helper that was added for this.

jdm · 2017-07-13T21:01:19Z

components/script/script_runtime.rs

@@ -233,89 +229,84 @@ pub unsafe fn new_rt_and_cx() -> Runtime {
            false
        };
        let mode = if val {
-            JSGCMode::JSGC_MODE_INCREMENTAL
+            jsapi::JSGCMode::JSGC_MODE_INCREMENTAL
        } else if compartment {


Perhaps rename this now.

bors-servo · 2017-09-03T22:42:51Z

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


        WIP update SpiderMonkey

fitzgen · 2017-09-20T22:49:35Z

Feedback addressed. Need to rebase again. Still blocked on windows stuff in servo/mozjs#119.

nox · 2017-10-03T12:44:37Z

Could you please revert all the qualified paths to jsapi items you introduced?

fabricedesre · 2018-03-18T19:21:04Z

Is anyone still working on that?

jdm · 2018-03-18T20:09:53Z

@fabricedesre @asajeffrey is going to be resuming this work.

asajeffrey · 2018-03-19T04:07:47Z

I'm going to talk to @nox in Berlin about how to move forward; I'm happy to look at smup, but the problem is that I have approximately zero windows experience.

nox · 2018-03-19T12:39:34Z

@asajeffrey For Windows support I haven't much to say but "good luck".

asajeffrey · 2018-03-19T15:34:47Z

Er, thanks.

asajeffrey · 2018-04-07T12:19:07Z

#20585

jdm · 2018-06-19T20:51:28Z

Superseded.

highfive added the S-needs-rebase label Jun 5, 2017

jdm self-assigned this Jun 5, 2017

jdm added the S-awaiting-review label Jun 5, 2017

fitzgen force-pushed the fitzgen:smup branch 2 times, most recently from f4aefda to ecde05f Jun 22, 2017

highfive added the S-needs-rebase label Jun 23, 2017

jdm requested changes Jul 13, 2017

View changes

jdm added S-needs-code-changes and removed S-awaiting-review labels Jul 13, 2017

fitzgen force-pushed the fitzgen:smup branch from a2c1b59 to 7e31662 Aug 28, 2017

highfive added S-awaiting-review and removed S-needs-code-changes labels Aug 28, 2017

highfive added the S-needs-rebase label Sep 3, 2017

jdm removed the S-awaiting-review label Sep 7, 2017

WIP update SpiderMonkey

Loading status checks…

9ce7c16

fitzgen force-pushed the fitzgen:smup branch from 7e31662 to 9ce7c16 Sep 20, 2017

highfive added the S-awaiting-review label Sep 20, 2017

jdm mentioned this pull request Oct 1, 2017

asm.js type error: Disabled by javascript.options.asmjs in about:config #10401

Closed

jdm added S-blocked-on-external and removed S-awaiting-review labels Oct 2, 2017

jdm approved these changes Oct 2, 2017

View changes

jdm closed this Jun 19, 2018

servo / servo

WIP smup #17143

WIP smup #17143

fitzgen commented Jun 2, 2017 •

edited by larsbergstrom

bors-servo commented Jun 5, 2017

fitzgen commented Jun 6, 2017

fitzgen commented Jun 8, 2017

fitzgen commented Jun 16, 2017

fitzgen commented Jun 16, 2017

KiChjang commented Jun 23, 2017

jdm commented Jun 23, 2017

bors-servo commented Jun 23, 2017

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Sep 3, 2017

fitzgen commented Sep 20, 2017

nox commented Oct 3, 2017

fabricedesre commented Mar 18, 2018

jdm commented Mar 18, 2018

asajeffrey commented Mar 19, 2018

nox commented Mar 19, 2018

asajeffrey commented Mar 19, 2018

asajeffrey commented Apr 7, 2018

jdm commented Jun 19, 2018

servo / servo

Join GitHub today

WIP smup #17143

WIP smup #17143

Conversation

fitzgen commented Jun 2, 2017 • edited by larsbergstrom

bors-servo commented Jun 5, 2017

fitzgen commented Jun 6, 2017

fitzgen commented Jun 8, 2017

fitzgen commented Jun 16, 2017

fitzgen commented Jun 16, 2017

KiChjang commented Jun 23, 2017

jdm commented Jun 23, 2017

bors-servo commented Jun 23, 2017

jdm left a comment

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors-servo commented Sep 3, 2017

fitzgen commented Sep 20, 2017

nox commented Oct 3, 2017

fabricedesre commented Mar 18, 2018

jdm commented Mar 18, 2018

asajeffrey commented Mar 19, 2018

nox commented Mar 19, 2018

asajeffrey commented Mar 19, 2018

asajeffrey commented Apr 7, 2018

jdm commented Jun 19, 2018

fitzgen commented Jun 2, 2017 •

edited by larsbergstrom