WIP smup by fitzgen · Pull Request #119 · servo/mozjs

fitzgen · 2017-06-02T18:35:30Z

This change is

This needs to make its way upstream

This needs to be ported over to the m-c patch queue.

…ue to Vec.

This fixes safe_extern_statics warnings; see <rust-lang/rust#36247>.

by changing it to use pointers instead. Fixes servo#311

We should be able to create a default value for any Heap<*mut T> where *mut T implements GCMethods<*mut T> and Copy, not just for Heap<*mut JSObject>.

Currently, to create a Heap<T>, one first has to create a Heap<T>::default, and then call Heap<T>::set. This is a common pattern and therefore should be abstracted behind a method.

We expose several JSAPI functions that are used for tracing. By abstracting these functions behind a trait we can overload them on the type to be traced.

This is what's required for catch_unwind; there's no need to be stricter.

The only remaining OOL calls are ToWindowIfWindowProxy and JS_WrapValue, like in the equivalent Gecko function.

Rust-mozjs currently does not define any methods to create instances of HandleValueArray. Consequently, consumers have to create these instances manually. This is unnecessary boilerplate, and therefore should be abstracted behind a function.

Fixes servo#256.

This should make it harder to use Rooted in an unsound way (when not using the rooted!() macro).

This ensures no unrooted values linger in the Rooted when it is no longer rooted. It should be impossible to access the value after that, but Handles currently lack the lifetime to prevent that (servo#153).

jdm

I totally ignored the first two commits. The rest of the changes all look pretty sensible.

jdm · 2017-07-10T18:20:29Z

mozjs/python/mozbuild/mozbuild/test/frontend/data/rust-library-name-mismatch/Cargo.toml

@@ -1,12 +0,0 @@
-[package]


Is this being upstreamed? Does it cause problems for us somehow?

Cargo will complain about malformed toml files and refuse to look any further.

I upstreamed this into the js/src/make-source-package.sh bundling script that creates the source release tarballs. If we ever want to point directly at a revision of m-c, rather than snapshots in this repo, then we will need another fix.

jdm · 2017-07-10T18:21:12Z

mozjs/python/mozbuild/mozbuild/test/backend/data/host-rust-library-features/Cargo.toml

@@ -1,15 +0,0 @@
-[package]


Same question - do we need to automate the removal of these each time we update SpiderMonkey?

jdm · 2017-07-10T18:23:15Z

mozjs/js/rust/build.rs

 /// Find the public include directory within our mozjs-sys crate dependency.
 fn get_mozjs_include_dir() -> path::PathBuf {
-    let entries = glob::glob("./target/*/build/mozjs_sys-*/out/dist/include")
+    let out_dir = env::var("OUT_DIR")


The commit message mentions the need for upstreaming. Has this happened? Is this still WIP?

The upstreaming is still theoretical because none of js/rust has actually landed in m-c yet. The m-c patches I had are fairly out of date now, and need to be recreated anyways, so this won't get lost.

jdm · 2017-07-10T18:27:06Z

mozjs/js/rust/build.rs

    "js::Class",
    "JS::CompartmentOptions",
    "JS::ContextOptions",
+    "js::DOMCallbacks",


Want to squash this with b778ac1 and 42e2f2b?

jdm · 2017-07-10T18:27:33Z

mozjs/js/rust/build.rs

    "JSType",
    "JSValueTag",
    "JSValueType",
+    "JSVersion",


Squash this with earlier whitelisting and subsequent similar commits?

jdm · 2017-07-10T18:32:51Z

mozjs/js/rust/src/sc.rs

+                callbacks: &jsapi::JSStructuredCloneCallbacks)
+                -> bool {
+        unsafe {
+            (*self.raw).read(Runtime::get(), vp, callbacks as *const _, ptr::null_mut())


The cast should not be necessary.

jdm · 2017-07-10T18:33:06Z

mozjs/js/rust/src/sc.rs

+                 callbacks: &jsapi::JSStructuredCloneCallbacks)
+                 -> bool {
+        unsafe {
+            (*self.raw).write(Runtime::get(), v, callbacks as *const _, ptr::null_mut())


Cast should not be necessary.

jdm · 2017-07-10T18:33:17Z

mozjs/js/rust/src/sc.rs

+    pub fn write(&mut self,
+                 v: jsapi::JS::HandleValue,
+                 callbacks: &jsapi::JSStructuredCloneCallbacks)
+                 -> bool {


Let's return Result<(), ()> instead.

jdm · 2017-07-10T18:34:36Z

mozjs/js/rust/src/sc.rs

+
+    /// Copy the given slice into this buffer. Returns false when an underlying
+    /// JSAPI call fails.
+    pub fn write_bytes(&mut self, bytes: &[u8]) -> bool {


Let's return Result<(), ()>.

jdm · 2017-07-10T18:38:24Z

mozjs/js/src/build.rs


 use std::env;
-use std::path;
+// use std::path;


Remove this?

fitzgen · 2017-07-10T20:19:05Z

@jdm thanks for the initial pass on review! I pushed some new commits that should address your feedback.

fitzgen · 2017-07-10T20:20:38Z

Regarding squashing: I can squash everything that isn't a rebase from servo/rust-mozjs into a single commit before landing. That's probably easiest.

jdm · 2017-07-10T23:20:19Z

Approval conditional on getting CI working again, of course.

fitzgen · 2017-09-20T20:07:21Z

@UK992, hello! I've been informed that you have helped out with Servo + windows build issues in the past before. If you have the cycles, I'd appreciate some help here (no worries if not!). I can build SpiderMonkey on Windows with MSVC just fine from mozjs/js/src/build.rs. However, when attempting to generate bindings with bindgen and libclang from mozjs/js/rust/build.rs, we trigger static_asserts inside SpiderMonkey. I suspect this has to do with differences between MSVC and libclang and interaction with some sort of build configuration. Note that bindgen and libclang work fine on both macOS and Linux, so there is something Windows specific going on here.

Thanks for your help!

c:\mozilla-central\js\rust\target\debug\build\js-ec9b7e18a60f19d9\out\..\..\mozjs_sys-d599741ab008ce05\out\dist\include\mozilla/Assertions.h:216:1: warning: function declared 'noreturn' should not return [-Winvalid-noreturn]
c:/mozbuild\clang\lib\clang\6.0.0\include\adxintrin.h:35:89: warning: ignoring unsupported 'adx' in the target attribute string [-Wignored-attributes]
c:/mozbuild\clang\lib\clang\6.0.0\include\adxintrin.h:43:89: warning: ignoring unsupported 'adx' in the target attribute string [-Wignored-attributes]
c:\mozilla-central\js\rust\target\debug\build\js-ec9b7e18a60f19d9\out\..\..\mozjs_sys-d599741ab008ce05\out\dist\include\js/Utility.h:270:12: warning: 'strdup' is deprecated: The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _strdup. See online help for details. [-Wdeprecated-declarations]
C:\Program Files (x86)\Windows Kits\10\Include\10.0.15063.0\ucrt\string.h:537:20: note: 'strdup' has been explicitly marked deprecated here
c:\mozilla-central\js\rust\target\debug\build\js-ec9b7e18a60f19d9\out\..\..\mozjs_sys-d599741ab008ce05\out\dist\include\js/RootingAPI.h:692:8: warning: 'dllimport' attribute ignored [-Wignored-attributes]
c:\mozilla-central\js\rust\target\debug\build\js-ec9b7e18a60f19d9\out\..\..\mozjs_sys-d599741ab008ce05\out\dist\include\js/Value.h:912:9: error: static_assert failed "JS_STATIC_ASSERT"
c:\mozilla-central\js\rust\target\debug\build\js-ec9b7e18a60f19d9\out\..\..\mozjs_sys-d599741ab008ce05\out\dist\include\js/Value.h:950:1: error: static_assert failed "Value size must leave three tag bits, be a binary power, and is ubiquitously depended upon everywhere"
thread 'main' panicked at 'Should generate JSAPI bindings OK: ()', src\libcore\result.rs:906:4
stack backtrace:
   0: std::sys_common::backtrace::_print
             at C:\projects\rust\src\libstd\sys_common\backtrace.rs:94
   1: std::panicking::default_hook::{{closure}}
             at C:\projects\rust\src\libstd\panicking.rs:380
   2: std::panicking::default_hook
             at C:\projects\rust\src\libstd\panicking.rs:397
   3: std::panicking::rust_panic_with_hook
             at C:\projects\rust\src\libstd\panicking.rs:611
   4: std::panicking::begin_panic<alloc::string::String>
             at C:\projects\rust\src\libstd\panicking.rs:572
   5: std::panicking::begin_panic_fmt
             at C:\projects\rust\src\libstd\panicking.rs:522
   6: std::panicking::rust_begin_panic
             at C:\projects\rust\src\libstd\panicking.rs:498
   7: core::panicking::panic_fmt
             at C:\projects\rust\src\libcore\panicking.rs:71
   8: core::result::unwrap_failed<()>
             at C:\projects\rust\src\libcore\macros.rs:41
   9: core::result::Result<bindgen::Bindings, ()>::expect<bindgen::Bindings,()>
             at C:\projects\rust\src\libcore\result.rs:799
  10: build_script_build::build_jsapi_bindings
             at .\build.rs:175
  11: build_script_build::main
             at .\build.rs:23
  12: panic_unwind::__rust_maybe_catch_panic
             at C:\projects\rust\src\libpanic_unwind\lib.rs:99
  13: std::rt::lang_start
             at C:\projects\rust\src\libstd\rt.rs:54
  14: main
  15: __scrt_common_main_seh
             at f:\dd\vctools\crt\vcstartup\src\startup\exe_common.inl:283
  16: BaseThreadInitThunk

bors-servo · 2017-09-21T18:21:06Z

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

atouchet · 2018-08-21T16:37:00Z

Can this be closed now?

fitzgen and others added 30 commits May 10, 2017 14:58

Remove old mozjs

b8978c6

Add new mozjs

77fa359

Remove bad Cargo.toml

bef886d

Remove testing Cargo.toml files

d66fb78

WIP Fix finding of the include dir for bindgen

e2d2d20

This needs to make its way upstream

Re-export root through jsapi

3a8cd13

This needs to be ported over to the m-c patch queue.

Add more APIs to work with AutoIdVector.

5b30592

Return a ConversionResult::Failure when converting a non-iterable val…

478305b

…ue to Vec.

Wrap uses of extern statics in unsafe blocks.

add34bd

This fixes safe_extern_statics warnings; see <rust-lang/rust#36247>.

Improve typed array support.

9434341

Add missing hooks to SIMPLE_GLOBAL_CLASS_OPS.

573b538

Add a test for typed array support.

816a319

Handle panics.

c8a9a4b

Fix travis build.

c906e06

Fix code involving empty type references

e8a424d

by changing it to use pointers instead. Fixes servo#311

Add an implementation of Default for Heap<*mut T>.

c528e97

We should be able to create a default value for any Heap<*mut T> where *mut T implements GCMethods<*mut T> and Copy, not just for Heap<*mut JSObject>.

Add a method to create a Heap<T>.

e8b78cf

Currently, to create a Heap<T>, one first has to create a Heap<T>::default, and then call Heap<T>::set. This is a common pattern and therefore should be abstracted behind a method.

Add an implementation of Clone for Heap<T>.

1e6962a

Add an implementation of PartialEq for Heap<T>.

085c184

Implement a Trace trait for types that can be traced.

fe79953

We expose several JSAPI functions that are used for tracing. By abstracting these functions behind a trait we can overload them on the type to be traced.

Use a less strict bound for wrap_panic.

30007d1

This is what's required for catch_unwind; there's no need to be stricter.

Implement maybe_wrap_object_value without OOL calls

e6d2e1a

The only remaining OOL calls are ToWindowIfWindowProxy and JS_WrapValue, like in the equivalent Gecko function.

Fix a typo in try_to_outerize

2e870a4

Add methods to create a HandleValueArray.

35bb0eb

Rust-mozjs currently does not define any methods to create instances of HandleValueArray. Consequently, consumers have to create these instances manually. This is unnecessary boilerplate, and therefore should be abstracted behind a function.

Store the JSContext in TLS for easy access.

9c99759

Add type for ArrayBufferView.

b4e38fb

Remove the type parameter from GCMethods.

90ec8f8

Fixes servo#256.

Disallow constructing an unrooted Rooted with a value.

b7924a3

This should make it harder to use Rooted in an unsound way (when not using the rooted!() macro).

Consistently apply the same bounds to RootedGuard's type parameter.

1f190c1

Clear the value of a Rooted when the RootedGuard goes out of scope.

c7d04f4

This ensures no unrooted values linger in the Rooted when it is no longer rooted. It should be impossible to access the value after that, but Handles currently lack the lifetime to prevent that (servo#153).

fitzgen added 2 commits July 10, 2017 09:38

TEMP don't source tooltool script on windows? sfink says it may work

f5599e4

TEMP Add logging for whats in C:\Python2.7

8c2bd30

fitzgen force-pushed the smup branch from b9ab0ea to 8c2bd30 Compare July 10, 2017 17:43

jdm requested changes Jul 10, 2017

View reviewed changes

fitzgen added 3 commits July 10, 2017 13:16

Remove unused import

09f2087

Remove unnecessary casts; return Result<(), ()> instead of bool

b2a1e3c

TEMP stop using a custom branch of bindgen for logging

752e334

jdm approved these changes Jul 10, 2017

View reviewed changes

Don't do more than 4 parallel jobs due to travis CI builders OOMing

a081cf2

fitzgen force-pushed the smup branch from c162f03 to a081cf2 Compare August 22, 2017 21:28

fitzgen added 10 commits August 22, 2017 15:00

Just do 1 make build to avoid OOMs in travis CI

59e6e7b

Ok try 4 parallel jobs because 1 is timing out

3c2a450

8 parallel jobs because 4 is still timing out

f5fde16

6 parallel jobs because 8 is OOMing again

3663619

Whitelist JS::Construct

8af818e

Whitelist JS_SameValue

182973d

Run autoconf/configure/make inside the mozilla build environment

f301616

Fix bad python 2.7 path on appveyor

f75eeaa

Use -j6 for appveyor builds as well

5cbac15

WIP building on windows

08f655a

fitzgen mentioned this pull request Sep 20, 2017

WIP smup servo/servo#17143

Closed

jdm mentioned this pull request Oct 1, 2017

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

Closed

jdm mentioned this pull request Dec 18, 2017

Update SpiderMonkey #130

Closed

jdm closed this Aug 21, 2018

Conversation

fitzgen commented Jun 2, 2017 • edited by larsbergstrom Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jdm left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

fitzgen commented Jul 10, 2017

Uh oh!

fitzgen commented Jul 10, 2017

Uh oh!

jdm commented Jul 10, 2017

Uh oh!

fitzgen commented Sep 20, 2017

Uh oh!

bors-servo commented Sep 21, 2017

Uh oh!

atouchet commented Aug 21, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

17 participants

fitzgen commented Jun 2, 2017 •

edited by larsbergstrom

Loading