From 59b0caa7a6721a537f846b3528505f3ab0c1d0a8 Mon Sep 17 00:00:00 2001 From: Nick Fitzgerald Date: Mon, 22 Aug 2016 16:36:08 -0700 Subject: [PATCH] SpiderMonkey upgrade --- src/jsapi_macos_64.rs | 98 ++++++++----- src/jsapi_macos_64_debug.rs | 268 ++++++++++-------------------------- 2 files changed, 133 insertions(+), 233 deletions(-) diff --git a/src/jsapi_macos_64.rs b/src/jsapi_macos_64.rs index 97499e1b5..b209d4ff8 100644 --- a/src/jsapi_macos_64.rs +++ b/src/jsapi_macos_64.rs @@ -863,10 +863,23 @@ pub struct _vftable_CallbackTracer { } #[repr(C)] #[derive(Debug, Copy)] -pub struct CallbackTracer_ContextFunctor; +pub struct CallbackTracer_ContextFunctor { + pub _vftable: *const _vftable_CallbackTracer_ContextFunctor, +} +#[repr(C)] +pub struct _vftable_CallbackTracer_ContextFunctor { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for CallbackTracer_ContextFunctor { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_CallbackTracer_ContextFunctor() { + assert_eq!(::std::mem::size_of::() , + 8usize); + assert_eq!(::std::mem::align_of::() , + 8usize); +} impl ::std::clone::Clone for CallbackTracer { fn clone(&self) -> Self { *self } } @@ -4430,6 +4443,10 @@ fn bindgen_test_layout_CompartmentFilter() { pub struct AllCompartments { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_AllCompartments { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for AllCompartments { fn clone(&self) -> Self { *self } } @@ -4438,6 +4455,10 @@ impl ::std::clone::Clone for AllCompartments { pub struct ContentCompartmentsOnly { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_ContentCompartmentsOnly { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for ContentCompartmentsOnly { fn clone(&self) -> Self { *self } } @@ -4446,6 +4467,10 @@ impl ::std::clone::Clone for ContentCompartmentsOnly { pub struct ChromeCompartmentsOnly { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_ChromeCompartmentsOnly { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for ChromeCompartmentsOnly { fn clone(&self) -> Self { *self } } @@ -4455,6 +4480,10 @@ pub struct SingleCompartment { pub _base: CompartmentFilter, pub ours: *mut JSCompartment, } +#[repr(C)] +pub struct _vftable_SingleCompartment { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for SingleCompartment { fn clone(&self) -> Self { *self } } @@ -4469,6 +4498,10 @@ pub struct CompartmentsWithPrincipals { pub _base: CompartmentFilter, pub principals: *mut JSPrincipals, } +#[repr(C)] +pub struct _vftable_CompartmentsWithPrincipals { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for CompartmentsWithPrincipals { fn clone(&self) -> Self { *self } } @@ -5251,10 +5284,23 @@ pub struct _vftable_ScriptEnvironmentPreparer { } #[repr(C)] #[derive(Debug, Copy)] -pub struct ScriptEnvironmentPreparer_Closure; +pub struct ScriptEnvironmentPreparer_Closure { + pub _vftable: *const _vftable_ScriptEnvironmentPreparer_Closure, +} +#[repr(C)] +pub struct _vftable_ScriptEnvironmentPreparer_Closure { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for ScriptEnvironmentPreparer_Closure { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_ScriptEnvironmentPreparer_Closure() { + assert_eq!(::std::mem::size_of::() , + 8usize); + assert_eq!(::std::mem::align_of::() , + 8usize); +} impl ::std::clone::Clone for ScriptEnvironmentPreparer { fn clone(&self) -> Self { *self } } @@ -5289,10 +5335,21 @@ fn bindgen_test_layout_AutoCTypesActivityCallback() { } #[repr(C)] #[derive(Debug, Copy)] -pub struct AllocationMetadataBuilder; +pub struct AllocationMetadataBuilder { + pub _vftable: *const _vftable_AllocationMetadataBuilder, +} +#[repr(C)] +pub struct _vftable_AllocationMetadataBuilder { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for AllocationMetadataBuilder { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_AllocationMetadataBuilder() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); +} #[repr(C)] #[unsafe_no_drop_flag] #[derive(Debug)] @@ -5346,41 +5403,6 @@ fn bindgen_test_layout_GCHeapProfiler() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } -#[repr(C)] -#[derive(Debug, Copy)] -pub struct MemProfiler { - pub mGCHeapProfiler: *mut GCHeapProfiler, - pub mRuntime: *mut JSRuntime, -} -impl ::std::clone::Clone for MemProfiler { - fn clone(&self) -> Self { *self } -} -#[test] -fn bindgen_test_layout_MemProfiler() { - assert_eq!(::std::mem::size_of::() , 16usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} -extern "C" { - fn _ZN11MemProfiler5startEP14GCHeapProfiler(this: *mut MemProfiler, - aGCHeapProfiler: - *mut GCHeapProfiler); - fn _ZN11MemProfiler4stopEv(this: *mut MemProfiler); - fn _ZN11MemProfiler14GetMemProfilerEP9JSRuntime(runtime: *mut JSRuntime) - -> *mut MemProfiler; -} -impl MemProfiler { - #[inline] - pub unsafe fn start(&mut self, aGCHeapProfiler: *mut GCHeapProfiler) { - _ZN11MemProfiler5startEP14GCHeapProfiler(&mut *self, aGCHeapProfiler) - } - #[inline] - pub unsafe fn stop(&mut self) { _ZN11MemProfiler4stopEv(&mut *self) } - #[inline] - pub unsafe fn GetMemProfiler(runtime: *mut JSRuntime) - -> *mut MemProfiler { - _ZN11MemProfiler14GetMemProfilerEP9JSRuntime(runtime) - } -} #[repr(i32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub enum InitState { Uninitialized = 0, Running = 1, ShutDown = 2, } diff --git a/src/jsapi_macos_64_debug.rs b/src/jsapi_macos_64_debug.rs index e9be43591..b209d4ff8 100644 --- a/src/jsapi_macos_64_debug.rs +++ b/src/jsapi_macos_64_debug.rs @@ -59,7 +59,6 @@ pub const JSREPORT_WARNING: ::std::os::raw::c_uint = 1; pub const JSREPORT_EXCEPTION: ::std::os::raw::c_uint = 2; pub const JSREPORT_STRICT: ::std::os::raw::c_uint = 4; pub const JSREPORT_STRICT_MODE_ERROR: ::std::os::raw::c_uint = 8; -pub const JS_DEFAULT_ZEAL_FREQ: ::std::os::raw::c_uint = 100; pub const JSITER_ENUMERATE: ::std::os::raw::c_uint = 1; pub const JSITER_FOREACH: ::std::os::raw::c_uint = 2; pub const JSITER_KEYVALUE: ::std::os::raw::c_uint = 4; @@ -481,7 +480,6 @@ pub struct PerThreadDataFriendFields_RuntimeDummy { pub struct PerThreadDataFriendFields_RuntimeDummy_PerThreadDummy { pub field1: *mut ::std::os::raw::c_void, pub field2: usize, - pub field3: u64, } impl ::std::clone::Clone for PerThreadDataFriendFields_RuntimeDummy_PerThreadDummy { @@ -490,7 +488,7 @@ impl ::std::clone::Clone for #[test] fn bindgen_test_layout_PerThreadDataFriendFields_RuntimeDummy_PerThreadDummy() { assert_eq!(::std::mem::size_of::() - , 24usize); + , 16usize); assert_eq!(::std::mem::align_of::() , 8usize); } @@ -500,7 +498,7 @@ impl ::std::clone::Clone for PerThreadDataFriendFields_RuntimeDummy { #[test] fn bindgen_test_layout_PerThreadDataFriendFields_RuntimeDummy() { assert_eq!(::std::mem::size_of::() - , 40usize); + , 32usize); assert_eq!(::std::mem::align_of::() , 8usize); } @@ -741,27 +739,10 @@ pub struct AutoAssertOnGC; * class does not disable the static rooting hazard analysis. */ #[repr(C)] -#[unsafe_no_drop_flag] -#[derive(Debug)] -pub struct AutoAssertNoAlloc { - pub gc: *mut GCRuntime, -} -#[test] -fn bindgen_test_layout_AutoAssertNoAlloc() { - assert_eq!(::std::mem::size_of::() , 8usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} -extern "C" { - fn _ZN2JS17AutoAssertNoAlloc13disallowAllocEP9JSRuntime(this: - *mut AutoAssertNoAlloc, - rt: - *mut JSRuntime); -} -impl AutoAssertNoAlloc { - #[inline] - pub unsafe fn disallowAlloc(&mut self, rt: *mut JSRuntime) { - _ZN2JS17AutoAssertNoAlloc13disallowAllocEP9JSRuntime(&mut *self, rt) - } +#[derive(Debug, Copy)] +pub struct AutoAssertNoAlloc; +impl ::std::clone::Clone for AutoAssertNoAlloc { + fn clone(&self) -> Self { *self } } /** * Disable the static rooting hazard analysis in the live region and assert if @@ -778,24 +759,21 @@ impl AutoAssertNoAlloc { * on this class. */ #[repr(C)] -#[unsafe_no_drop_flag] -#[derive(Debug)] +#[derive(Debug, Copy)] pub struct AutoSuppressGCAnalysis { pub _base: AutoAssertNoAlloc, } -#[test] -fn bindgen_test_layout_AutoSuppressGCAnalysis() { - assert_eq!(::std::mem::size_of::() , 8usize); - assert_eq!(::std::mem::align_of::() , 8usize); +impl ::std::clone::Clone for AutoSuppressGCAnalysis { + fn clone(&self) -> Self { *self } } #[repr(C)] pub struct AutoAssertGCCallback { - pub _bindgen_opaque_blob: u64, + pub _bindgen_opaque_blob: u8, } #[test] fn bindgen_test_layout_AutoAssertGCCallback() { - assert_eq!(::std::mem::size_of::() , 8usize); - assert_eq!(::std::mem::align_of::() , 8usize); + assert_eq!(::std::mem::size_of::() , 1usize); + assert_eq!(::std::mem::align_of::() , 1usize); } /** * Place AutoCheckCannotGC in scopes that you believe can never GC. These @@ -885,10 +863,23 @@ pub struct _vftable_CallbackTracer { } #[repr(C)] #[derive(Debug, Copy)] -pub struct CallbackTracer_ContextFunctor; +pub struct CallbackTracer_ContextFunctor { + pub _vftable: *const _vftable_CallbackTracer_ContextFunctor, +} +#[repr(C)] +pub struct _vftable_CallbackTracer_ContextFunctor { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for CallbackTracer_ContextFunctor { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_CallbackTracer_ContextFunctor() { + assert_eq!(::std::mem::size_of::() , + 8usize); + assert_eq!(::std::mem::align_of::() , + 8usize); +} impl ::std::clone::Clone for CallbackTracer { fn clone(&self) -> Self { *self } } @@ -1428,51 +1419,16 @@ pub struct VoidDefaultAdaptor { pub struct IdentityDefaultAdaptor { pub _phantom0: ::std::marker::PhantomData, } -#[repr(C)] -#[derive(Debug, Copy)] -pub struct ValueAlignmentTester { - pub c: ::std::os::raw::c_char, - pub v: Value, -} -impl ::std::clone::Clone for ValueAlignmentTester { - fn clone(&self) -> Self { *self } -} -#[test] -fn bindgen_test_layout_ValueAlignmentTester() { - assert_eq!(::std::mem::size_of::() , 16usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} -#[repr(C)] -#[derive(Debug, Copy)] -pub struct LayoutAlignmentTester { - pub c: ::std::os::raw::c_char, - pub l: jsval_layout, -} -impl ::std::clone::Clone for LayoutAlignmentTester { - fn clone(&self) -> Self { *self } -} -#[test] -fn bindgen_test_layout_LayoutAlignmentTester() { - assert_eq!(::std::mem::size_of::() , 16usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} pub type JSNative = ::std::option::Option bool>; #[repr(C)] #[derive(Debug, Copy)] -pub struct IncludeUsedRval { - pub usedRval_: bool, -} +pub struct IncludeUsedRval; impl ::std::clone::Clone for IncludeUsedRval { fn clone(&self) -> Self { *self } } -#[test] -fn bindgen_test_layout_IncludeUsedRval() { - assert_eq!(::std::mem::size_of::() , 1usize); - assert_eq!(::std::mem::align_of::() , 1usize); -} #[repr(C)] #[derive(Debug, Copy)] pub struct NoUsedRval; @@ -2535,7 +2491,6 @@ impl JSAutoStructuredCloneBuffer { pub struct JSPrincipals { pub _vftable: *const _vftable_JSPrincipals, pub refcount: u32, - pub debugToken: u32, } #[repr(C)] pub struct _vftable_JSPrincipals { @@ -2583,17 +2538,6 @@ pub enum TwoByteChars { } #[repr(C)] #[unsafe_no_drop_flag] #[derive(Debug)] -pub struct AutoCheckRequestDepth { - pub cx: *mut JSContext, -} -#[test] -fn bindgen_test_layout_AutoCheckRequestDepth() { - assert_eq!(::std::mem::size_of::() , 8usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} -#[repr(C)] -#[unsafe_no_drop_flag] -#[derive(Debug)] pub struct AutoVectorRooterBase { pub _base: AutoGCRooter, pub _phantom0: ::std::marker::PhantomData, @@ -4499,6 +4443,10 @@ fn bindgen_test_layout_CompartmentFilter() { pub struct AllCompartments { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_AllCompartments { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for AllCompartments { fn clone(&self) -> Self { *self } } @@ -4507,6 +4455,10 @@ impl ::std::clone::Clone for AllCompartments { pub struct ContentCompartmentsOnly { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_ContentCompartmentsOnly { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for ContentCompartmentsOnly { fn clone(&self) -> Self { *self } } @@ -4515,6 +4467,10 @@ impl ::std::clone::Clone for ContentCompartmentsOnly { pub struct ChromeCompartmentsOnly { pub _base: CompartmentFilter, } +#[repr(C)] +pub struct _vftable_ChromeCompartmentsOnly { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for ChromeCompartmentsOnly { fn clone(&self) -> Self { *self } } @@ -4524,6 +4480,10 @@ pub struct SingleCompartment { pub _base: CompartmentFilter, pub ours: *mut JSCompartment, } +#[repr(C)] +pub struct _vftable_SingleCompartment { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for SingleCompartment { fn clone(&self) -> Self { *self } } @@ -4538,6 +4498,10 @@ pub struct CompartmentsWithPrincipals { pub _base: CompartmentFilter, pub principals: *mut JSPrincipals, } +#[repr(C)] +pub struct _vftable_CompartmentsWithPrincipals { + pub _base: _vftable_CompartmentFilter, +} impl ::std::clone::Clone for CompartmentsWithPrincipals { fn clone(&self) -> Self { *self } } @@ -5320,10 +5284,23 @@ pub struct _vftable_ScriptEnvironmentPreparer { } #[repr(C)] #[derive(Debug, Copy)] -pub struct ScriptEnvironmentPreparer_Closure; +pub struct ScriptEnvironmentPreparer_Closure { + pub _vftable: *const _vftable_ScriptEnvironmentPreparer_Closure, +} +#[repr(C)] +pub struct _vftable_ScriptEnvironmentPreparer_Closure { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for ScriptEnvironmentPreparer_Closure { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_ScriptEnvironmentPreparer_Closure() { + assert_eq!(::std::mem::size_of::() , + 8usize); + assert_eq!(::std::mem::align_of::() , + 8usize); +} impl ::std::clone::Clone for ScriptEnvironmentPreparer { fn clone(&self) -> Self { *self } } @@ -5358,10 +5335,21 @@ fn bindgen_test_layout_AutoCTypesActivityCallback() { } #[repr(C)] #[derive(Debug, Copy)] -pub struct AllocationMetadataBuilder; +pub struct AllocationMetadataBuilder { + pub _vftable: *const _vftable_AllocationMetadataBuilder, +} +#[repr(C)] +pub struct _vftable_AllocationMetadataBuilder { + pub _bindgen_empty_ctype_warning_fix: u64, +} impl ::std::clone::Clone for AllocationMetadataBuilder { fn clone(&self) -> Self { *self } } +#[test] +fn bindgen_test_layout_AllocationMetadataBuilder() { + assert_eq!(::std::mem::size_of::() , 8usize); + assert_eq!(::std::mem::align_of::() , 8usize); +} #[repr(C)] #[unsafe_no_drop_flag] #[derive(Debug)] @@ -5415,41 +5403,6 @@ fn bindgen_test_layout_GCHeapProfiler() { assert_eq!(::std::mem::size_of::() , 8usize); assert_eq!(::std::mem::align_of::() , 8usize); } -#[repr(C)] -#[derive(Debug, Copy)] -pub struct MemProfiler { - pub mGCHeapProfiler: *mut GCHeapProfiler, - pub mRuntime: *mut JSRuntime, -} -impl ::std::clone::Clone for MemProfiler { - fn clone(&self) -> Self { *self } -} -#[test] -fn bindgen_test_layout_MemProfiler() { - assert_eq!(::std::mem::size_of::() , 16usize); - assert_eq!(::std::mem::align_of::() , 8usize); -} -extern "C" { - fn _ZN11MemProfiler5startEP14GCHeapProfiler(this: *mut MemProfiler, - aGCHeapProfiler: - *mut GCHeapProfiler); - fn _ZN11MemProfiler4stopEv(this: *mut MemProfiler); - fn _ZN11MemProfiler14GetMemProfilerEP9JSRuntime(runtime: *mut JSRuntime) - -> *mut MemProfiler; -} -impl MemProfiler { - #[inline] - pub unsafe fn start(&mut self, aGCHeapProfiler: *mut GCHeapProfiler) { - _ZN11MemProfiler5startEP14GCHeapProfiler(&mut *self, aGCHeapProfiler) - } - #[inline] - pub unsafe fn stop(&mut self) { _ZN11MemProfiler4stopEv(&mut *self) } - #[inline] - pub unsafe fn GetMemProfiler(runtime: *mut JSRuntime) - -> *mut MemProfiler { - _ZN11MemProfiler14GetMemProfilerEP9JSRuntime(runtime) - } -} #[repr(i32)] #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)] pub enum InitState { Uninitialized = 0, Running = 1, ShutDown = 2, } @@ -5966,9 +5919,6 @@ extern "C" { pub fn CurrentThreadCanAccessRuntime(rt: *mut JSRuntime) -> bool; #[link_name = "_ZN2js26CurrentThreadCanAccessZoneEPN2JS4ZoneE"] pub fn CurrentThreadCanAccessZone(zone: *mut Zone) -> bool; - #[link_name = - "_ZN2js2gc20AssertGCThingHasTypeEPNS0_4CellEN2JS9TraceKindE"] - pub fn AssertGCThingHasType(cell: *mut Cell, kind: TraceKind); #[link_name = "_ZN2JS13GetObjectZoneEP8JSObject"] pub fn GetObjectZone(obj: *mut JSObject) -> *mut Zone; #[link_name = "_ZN2JS16GCThingTraceKindEPv"] @@ -6177,21 +6127,11 @@ extern "C" { #[link_name = "_ZN2JS21HeapObjectPostBarrierEPP8JSObjectS1_S1_"] pub fn HeapObjectPostBarrier(objp: *mut *mut JSObject, prev: *mut JSObject, next: *mut JSObject); - /** - * For generational GC, assert that an object is in the tenured generation as - * opposed to being in the nursery. - */ - #[link_name = "_ZN2JS26AssertGCThingMustBeTenuredEP8JSObject"] - pub fn AssertGCThingMustBeTenured(obj: *mut JSObject); - #[link_name = "_ZN2JS34AssertGCThingIsNotAnObjectSubclassEPN2js2gc4CellE"] - pub fn AssertGCThingIsNotAnObjectSubclass(cell: *mut Cell); #[link_name = "_ZN2JS20HeapValuePostBarrierEPNS_5ValueERKS0_S3_"] pub fn HeapValuePostBarrier(valuep: *mut Value, prev: *const Value, next: *const Value); #[link_name = "_ZN2JS6detail11ComputeThisEP9JSContextPNS_5ValueE"] pub fn ComputeThis(cx: *mut JSContext, vp: *mut Value) -> Value; - #[link_name = "_ZN2JS6detail25CheckIsValidConstructibleENS_5ValueE"] - pub fn CheckIsValidConstructible(v: Value); /** * Only JSStrings that have been interned via the JSAPI can be turned into * jsids by API clients. @@ -9002,13 +8942,6 @@ extern "C" { pub fn JS_NewObjectForConstructor(cx: *mut JSContext, clasp: *const JSClass, args: *const CallArgs) -> *mut JSObject; - #[link_name = "_Z16JS_GetGCZealBitsP9JSContextPjS1_S1_"] - pub fn JS_GetGCZealBits(cx: *mut JSContext, zealBits: *mut u32, - frequency: *mut u32, nextScheduled: *mut u32); - #[link_name = "_Z12JS_SetGCZealP9JSRuntimehj"] - pub fn JS_SetGCZeal(rt: *mut JSRuntime, zeal: u8, frequency: u32); - #[link_name = "_Z13JS_ScheduleGCP9JSContextj"] - pub fn JS_ScheduleGC(cx: *mut JSContext, count: u32); #[link_name = "_Z28JS_SetParallelParsingEnabledP9JSRuntimeb"] pub fn JS_SetParallelParsingEnabled(rt: *mut JSRuntime, enabled: bool); #[link_name = "_Z36JS_SetOffthreadIonCompilationEnabledP9JSRuntimeb"] @@ -9425,48 +9358,6 @@ extern "C" { #[link_name = "_ZN2js21GetPropertyNameFromPCEP8JSScriptPh"] pub fn GetPropertyNameFromPC(script: *mut JSScript, pc: *mut jsbytecode) -> *mut JSAtom; - #[link_name = "_ZN2js10DumpStringEP8JSStringP7__sFILE"] - pub fn DumpString(str: *mut JSString, fp: *mut FILE); - #[link_name = "_ZN2js8DumpAtomEP6JSAtomP7__sFILE"] - pub fn DumpAtom(atom: *mut JSAtom, fp: *mut FILE); - #[link_name = "_ZN2js10DumpObjectEP8JSObjectP7__sFILE"] - pub fn DumpObject(obj: *mut JSObject, fp: *mut FILE); - #[link_name = "_ZN2js9DumpCharsEPKDsmP7__sFILE"] - pub fn DumpChars(s: *const ::std::os::raw::c_ushort, n: usize, - fp: *mut FILE); - #[link_name = "_ZN2js9DumpValueERKN2JS5ValueEP7__sFILE"] - pub fn DumpValue(val: *const Value, fp: *mut FILE); - #[link_name = "_ZN2js6DumpIdE4jsidP7__sFILE"] - pub fn DumpId(id: jsid, fp: *mut FILE); - #[link_name = - "_ZN2js20DumpInterpreterFrameEP9JSContextP7__sFILEPNS_16InterpreterFrameE"] - pub fn DumpInterpreterFrame(cx: *mut JSContext, fp: *mut FILE, - start: *mut InterpreterFrame); - #[link_name = "_ZN2js6DumpPCEP9JSContextP7__sFILE"] - pub fn DumpPC(cx: *mut JSContext, fp: *mut FILE) -> bool; - #[link_name = "_ZN2js10DumpScriptEP9JSContextP8JSScriptP7__sFILE"] - pub fn DumpScript(cx: *mut JSContext, scriptArg: *mut JSScript, - fp: *mut FILE) -> bool; - #[link_name = "_ZN2js10DumpStringEP8JSString"] - pub fn DumpString1(str: *mut JSString); - #[link_name = "_ZN2js8DumpAtomEP6JSAtom"] - pub fn DumpAtom1(atom: *mut JSAtom); - #[link_name = "_ZN2js10DumpObjectEP8JSObject"] - pub fn DumpObject1(obj: *mut JSObject); - #[link_name = "_ZN2js9DumpCharsEPKDsm"] - pub fn DumpChars1(s: *const ::std::os::raw::c_ushort, n: usize); - #[link_name = "_ZN2js9DumpValueERKN2JS5ValueE"] - pub fn DumpValue1(val: *const Value); - #[link_name = "_ZN2js6DumpIdE4jsid"] - pub fn DumpId1(id: jsid); - #[link_name = - "_ZN2js20DumpInterpreterFrameEP9JSContextPNS_16InterpreterFrameE"] - pub fn DumpInterpreterFrame1(cx: *mut JSContext, - start: *mut InterpreterFrame); - #[link_name = "_ZN2js6DumpPCEP9JSContext"] - pub fn DumpPC1(cx: *mut JSContext) -> bool; - #[link_name = "_ZN2js10DumpScriptEP9JSContextP8JSScript"] - pub fn DumpScript1(cx: *mut JSContext, scriptArg: *mut JSScript) -> bool; #[link_name = "_ZN2js13DumpBacktraceEP9JSContextP7__sFILE"] pub fn DumpBacktrace(cx: *mut JSContext, fp: *mut FILE); #[link_name = "_ZN2js13DumpBacktraceEP9JSContext"] @@ -9646,8 +9537,6 @@ extern "C" { pub fn GetPrototypeNoProxy(obj: *mut JSObject) -> *mut JSObject; #[link_name = "_ZN2js21AssertSameCompartmentEP9JSContextP8JSObject"] pub fn AssertSameCompartment(cx: *mut JSContext, obj: *mut JSObject); - #[link_name = "_ZN2js21AssertSameCompartmentEP8JSObjectS1_"] - pub fn AssertSameCompartment1(objA: *mut JSObject, objB: *mut JSObject); #[link_name = "_ZN2js23NotifyAnimationActivityEP8JSObject"] pub fn NotifyAnimationActivity(obj: *mut JSObject); /** @@ -9803,9 +9692,6 @@ extern "C" { #[link_name = "_ZN2js16GetErrorTypeNameEP9JSRuntimes"] pub fn GetErrorTypeName(rt: *mut JSRuntime, exnType: i16) -> *mut JSFlatString; - #[link_name = "_ZN2js24GetEnterCompartmentDepthEP9JSContext"] - pub fn GetEnterCompartmentDepth(cx: *mut JSContext) - -> ::std::os::raw::c_uint; #[link_name = "_ZN2js23RegExpToSharedNonInlineEP9JSContextN2JS6HandleIP8JSObjectEEPNS_11RegExpGuardE"] pub fn RegExpToSharedNonInline(cx: *mut JSContext, regexp: HandleObject, @@ -10547,14 +10433,6 @@ extern "C" { pub fn ToObjectSlow(cx: *mut JSContext, v: HandleValue, reportScanStack: bool) -> *mut JSObject; /** - * Assert that we're not doing GC on cx, that we're in a request as - * needed, and that the compartments for cx and v are correct. - * Also check that GC would be safe at this point. - */ - #[link_name = - "_ZN2JS6detail22AssertArgumentsAreSaneEP9JSContextNS_6HandleINS_5ValueEEE"] - pub fn AssertArgumentsAreSane(cx: *mut JSContext, v: HandleValue); - /** * ES6 draft 20141224, 7.1.1, second algorithm. * * Most users shouldn't call this -- use JS::ToBoolean, ToNumber, or ToString