Auto merge of #10710 - Ms2ger:js, r=nox

Update js.

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10710)
<!-- Reviewable:end -->

components/script/dom/dedicatedworkerglobalscope.rs

@@ -240,7 +240,7 @@ impl DedicatedWorkerGlobalScope {
                 }
             };
 
-            let runtime = new_rt_and_cx();
+            let runtime = unsafe { new_rt_and_cx() };
             *main_thread_rt.lock().unwrap() = Some(SharedRt::new(&runtime));
 
             let (devtools_mpsc_chan, devtools_mpsc_port) = channel();

components/script/script_runtime.rs

@@ -95,37 +95,30 @@ impl<'a> Drop for StackRootTLS<'a> {
 }
 
 #[allow(unsafe_code)]
-pub fn new_rt_and_cx() -> Runtime {
+pub unsafe fn new_rt_and_cx() -> Runtime {
     LiveDOMReferences::initialize();
     let runtime = Runtime::new();
 
-    unsafe {
     JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_rust_roots), ptr::null_mut());
     JS_AddExtraGCRootsTracer(runtime.rt(), Some(trace_refcounted_objects), ptr::null_mut());
-    }
 
     // Needed for debug assertions about whether GC is running.
     if cfg!(debug_assertions) {
-        unsafe {
         JS_SetGCCallback(runtime.rt(), Some(debug_gc_callback), ptr::null_mut());
     }
-    }
+
     if opts::get().gc_profile {
-        unsafe {
         SetGCSliceCallback(runtime.rt(), Some(gc_slice_callback));
     }
-    }
 
-    unsafe {
     unsafe extern "C" fn empty_wrapper_callback(_: *mut JSContext, _: *mut JSObject) -> bool { true }
     SetDOMCallbacks(runtime.rt(), &DOM_CALLBACKS);
     SetPreserveWrapperCallback(runtime.rt(), Some(empty_wrapper_callback));
     // Pre barriers aren't working correctly at the moment
     DisableIncrementalGC(runtime.rt());
-    }
 
     // Enable or disable the JITs.
-    let rt_opts = unsafe { &mut *RuntimeOptionsRef(runtime.rt()) };
+    let rt_opts = &mut *RuntimeOptionsRef(runtime.rt());
     if let Some(val) = get_pref("js.baseline.enabled").as_boolean() {
         rt_opts.set_baseline_(val);
     }
@@ -144,10 +137,10 @@ pub fn new_rt_and_cx() -> Runtime {
         rt_opts.set_nativeRegExp_(val);
     }
     if let Some(val) = get_pref("js.parallel_parsing.enabled").as_boolean() {
-        unsafe { JS_SetParallelParsingEnabled(runtime.rt(), val); }
+        JS_SetParallelParsingEnabled(runtime.rt(), val);
     }
     if let Some(val) = get_pref("js.offthread_compilation_enabled").as_boolean() {
-        unsafe { JS_SetOffthreadIonCompilationEnabled(runtime.rt(), val); }
+        JS_SetOffthreadIonCompilationEnabled(runtime.rt(), val);
     }
     if let Some(val) = get_pref("js.baseline.unsafe_eager_compilation.enabled").as_boolean() {
         let trigger: i32 = if val {
@@ -155,24 +148,20 @@ pub fn new_rt_and_cx() -> Runtime {
         } else {
             -1
         };
-        unsafe {
         JS_SetGlobalJitCompilerOption(runtime.rt(),
                                       JSJitCompilerOption::JSJITCOMPILER_BASELINE_WARMUP_TRIGGER,
                                       trigger as u32);
     }
-    }
     if let Some(val) = get_pref("js.ion.unsafe_eager_compilation.enabled").as_boolean() {
         let trigger: i64 = if val {
             0
         } else {
             -1
         };
-        unsafe {
         JS_SetGlobalJitCompilerOption(runtime.rt(),
                                       JSJitCompilerOption::JSJITCOMPILER_ION_WARMUP_TRIGGER,
                                       trigger as u32);
     }
-    }
     // TODO: handle js.discard_system_source.enabled
     // TODO: handle js.asyncstack.enabled (needs new Spidermonkey)
     // TODO: handle js.throw_on_debugee_would_run (needs new Spidermonkey)
@@ -182,20 +171,16 @@ pub fn new_rt_and_cx() -> Runtime {
     }
     // TODO: handle js.shared_memory.enabled
     if let Some(val) = get_pref("js.mem.high_water_mark").as_i64() {
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_MAX_MALLOC_BYTES, val as u32 * 1024 * 1024);
     }
-    }
     if let Some(val) = get_pref("js.mem.max").as_i64() {
         let max = if val <= 0 || val >= 0x1000 {
             -1
         } else {
             val * 1024 * 1024
         };
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_MAX_BYTES, max as u32);
     }
-    }
     // NOTE: This is disabled above, so enabling it here will do nothing for now.
     if let Some(val) = get_pref("js.mem.gc.incremental.enabled").as_boolean() {
         let compartment = if let Some(val) = get_pref("js.mem.gc.per_compartment.enabled").as_boolean() {
@@ -210,103 +195,73 @@ pub fn new_rt_and_cx() -> Runtime {
         } else {
             JSGCMode::JSGC_MODE_GLOBAL
         };
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_MODE, mode as u32);
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.incremental.slice_ms").as_i64() {
         if val >= 0 && val < 100000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_SLICE_TIME_BUDGET, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.compacting.enabled").as_boolean() {
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_COMPACTING_ENABLED, val as u32);
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.high_frequency_time_limit_ms").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_HIGH_FREQUENCY_TIME_LIMIT, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.dynamic_mark_slice.enabled").as_boolean() {
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_DYNAMIC_MARK_SLICE, val as u32);
     }
-    }
     // TODO: handle js.mem.gc.refresh_frame_slices.enabled
     if let Some(val) = get_pref("js.mem.gc.dynamic_heap_growth.enabled").as_boolean() {
-        unsafe {
         JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_DYNAMIC_HEAP_GROWTH, val as u32);
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.low_frequency_heap_growth").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_LOW_FREQUENCY_HEAP_GROWTH, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.high_frequency_heap_growth_min").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_HIGH_FREQUENCY_HEAP_GROWTH_MIN, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.high_frequency_heap_growth_max").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_HIGH_FREQUENCY_HEAP_GROWTH_MAX, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.high_frequency_low_limit_mb").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_HIGH_FREQUENCY_LOW_LIMIT, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.high_frequency_high_limit_mb").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_HIGH_FREQUENCY_HIGH_LIMIT, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.allocation_threshold_mb").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_ALLOCATION_THRESHOLD, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.decommit_threshold_mb").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_DECOMMIT_THRESHOLD, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.empty_chunk_count_min").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_MIN_EMPTY_CHUNK_COUNT, val as u32);
         }
     }
-    }
     if let Some(val) = get_pref("js.mem.gc.empty_chunk_count_max").as_i64() {
         if val >= 0 && val < 10000 {
-            unsafe {
             JS_SetGCParameter(runtime.rt(), JSGCParamKey::JSGC_MAX_EMPTY_CHUNK_COUNT, val as u32);
         }
     }
-    }
 
     runtime
 }

components/script/script_thread.rs

@@ -521,7 +521,7 @@ impl ScriptThread {
                port: Receiver<MainThreadScriptMsg>,
                chan: Sender<MainThreadScriptMsg>)
                -> ScriptThread {
-        let runtime = new_rt_and_cx();
+        let runtime = unsafe { new_rt_and_cx() };
 
         unsafe {
             JS_SetWrapObjectCallbacks(runtime.rt(),

components/servo/Cargo.lock

@@ -983,7 +983,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#6f1eb4ea7a84714bfab2806440c9fc8a9a261409"
+source = "git+https://github.com/servo/rust-mozjs#efe805affa75d776316e9ea6113f85cdad1e82ed"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

ports/cef/Cargo.lock

@@ -903,7 +903,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#6f1eb4ea7a84714bfab2806440c9fc8a9a261409"
+source = "git+https://github.com/servo/rust-mozjs#efe805affa75d776316e9ea6113f85cdad1e82ed"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",

ports/gonk/Cargo.lock

@@ -885,7 +885,7 @@ dependencies = [
 [[package]]
 name = "js"
 version = "0.1.2"
-source = "git+https://github.com/servo/rust-mozjs#6f1eb4ea7a84714bfab2806440c9fc8a9a261409"
+source = "git+https://github.com/servo/rust-mozjs#efe805affa75d776316e9ea6113f85cdad1e82ed"
 dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",