Revert "[DO NOT MERGE] Revert "Work around broken Windows ABI issues for off thread compilation API.""

This reverts commit 6f3f382.

Author: jdm

mozjs/build.rs

@@ -387,6 +387,7 @@ const BLACKLIST_FUNCTIONS: &'static [&'static str] = &[
     "JS_GetPropertyDescriptor",
     "JS_GetUCPropertyDescriptor",
     "js::SetPropertyIgnoringNamedGetter",
+    "JS::FinishOffThreadStencil",
 ];
 
 /// Types that should be treated as an opaque blob of bytes whenever they show

rust-mozjs/src/glue.rs

@@ -1,4 +1,5 @@
 use jsapi::*;
+use jsapi::js::frontend::CompilationStencil;
 use std::os::raw::{c_char, c_void};
 use std::{mem, ptr};
 
@@ -609,4 +610,10 @@ extern "C" {
         value: HandleValue,
         attrs: u32,
     );
+    pub fn FinishOffThreadStencil(
+        cx: *mut JSContext,
+        token: *mut OffThreadToken,
+        storage: *mut InstantiationStorage,
+        out: *mut already_AddRefed<CompilationStencil>,
+    );
 }

rust-mozjs/src/glue_wrappers.in

@@ -19,4 +19,5 @@ wrap!(glue: pub fn JS_GetPromiseResult(promise: HandleObject, dest: MutableHandl
 wrap!(glue: pub fn JS_GetScriptPrivate(script: *mut JSScript, dest: MutableHandleValue));
 wrap!(glue: pub fn JS_GetModulePrivate(module: *mut JSObject, dest: MutableHandleValue));
 wrap!(glue: pub fn EncodeStringToUTF8(cx: *mut JSContext, str: HandleString, cb: fn(*const c_char)));
-wrap!(glue: pub fn SetDataPropertyDescriptor(desc: MutableHandle<PropertyDescriptor>, value: HandleValue, attrs: u32));
+wrap!(glue: pub fn SetDataPropertyDescriptor(desc: MutableHandle<PropertyDescriptor>, value: HandleValue, attrs: u32));
+wrap!(glue: pub fn FinishOffThreadStencil(cx: *mut JSContext, token: *mut OffThreadToken, storage: *mut InstantiationStorage, out: *mut already_AddRefed<CompilationStencil>));

rust-mozjs/src/jsglue.cpp

@@ -28,6 +28,7 @@
 #include "js/StructuredClone.h"
 #include "js/Wrapper.h"
 #include "js/experimental/JitInfo.h"
+#include "js/experimental/JSStencil.h"
 #include "js/experimental/TypedData.h"
 #include "js/friend/ErrorMessages.h"
 #include "jsapi.h"
@@ -1080,4 +1081,14 @@ void SetDataPropertyDescriptor(
   desc.set(JS::PropertyDescriptor::Data(value, attrs));
 }
 
+void FinishOffThreadStencil(
+  JSContext* cx,
+  JS::OffThreadToken* token,
+  JS::InstantiationStorage* storage,
+  already_AddRefed<JS::Stencil>* stencil
+) {
+  already_AddRefed<JS::Stencil> retval = JS::FinishOffThreadStencil(cx, token, storage);
+  *stencil = std::move(retval);
+}
+
 }  // extern "C"

rust-mozjs/src/rust.rs

@@ -976,7 +976,11 @@ pub unsafe fn FinishOffThreadStencil(
     token: *mut OffThreadToken,
     storage: *mut InstantiationStorage,
 ) -> Stencil {
-    let stencil = jsapi::FinishOffThreadStencil(cx, token, storage);
+    let mut stencil = already_AddRefed {
+        mRawPtr: std::ptr::null_mut(),
+        _phantom_0: PhantomData,
+    };
+    crate::glue::FinishOffThreadStencil(cx, token, storage, &mut stencil);
     return Stencil { inner: stencil };
 }