Auto merge of #279 - servo:smup-201607, r=nox

Update SpiderMonkey to m-c bcf4ff0c3eef.

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

Author: bors-servo

makefile.cargo

@@ -13,7 +13,8 @@ endif
 CFLAGS += -std=c++11 -DJS_NO_JSVAL_JSID_STRUCT_TYPES
 
 ifneq ("$(MSYSTEM)","")
-OUT_DIR := $(shell cygpath "$(OUT_DIR)")
+OUT_DIR := $(shell cygpath -m "$(OUT_DIR)")
+DEP_MOZJS_OUTDIR := $(shell cygpath -m "$(DEP_MOZJS_OUTDIR)")
 else # not msys/mingw64
 CFLAGS += -fPIC
 endif

src/consts.rs

@@ -7,7 +7,6 @@ use jsapi::{JSCLASS_RESERVED_SLOTS_WIDTH, JSProtoKey};
 use libc::c_uint;
 
 pub const default_heapsize: u32 = 32_u32 * 1024_u32 * 1024_u32;
-pub const default_stacksize: usize = 8192;
 
 pub const JSCLASS_IS_DOMJSCLASS: c_uint = 1 << 4;
 pub const JSCLASS_USERBIT1: c_uint = 1 << 7;

src/glue.rs

@@ -44,6 +44,12 @@ pub struct ProxyTraps {
                                               proxy: HandleObject,
                                               objp: MutableHandleObject)
                                              -> bool>,
+    pub getPrototypeIfOrdinary: ::std::option::Option<unsafe extern "C" fn
+                                                          (cx: *mut JSContext,
+                                                           proxy: HandleObject,
+                                                           isOrdinary: *mut bool,
+                                                           protop: MutableHandleObject)
+                                                          -> bool>,
     pub preventExtensions: ::std::option::Option<unsafe extern "C" fn
                                                      (cx: *mut JSContext,
                                                       proxy: HandleObject,
@@ -108,7 +114,7 @@ pub struct ProxyTraps {
                                                 bp: *mut bool) -> bool>,
     pub objectClassIs: ::std::option::Option<unsafe extern "C" fn
                                                  (obj: HandleObject,
-                                                  classValue: ESClassValue,
+                                                  classValue: ESClass,
                                                   cx: *mut JSContext) -> bool>,
     pub className: ::std::option::Option<unsafe extern "C" fn
                                              (cx: *mut JSContext,