Followups to the SpiderMonkey upgrade.

src/error.rs

@@ -21,15 +21,15 @@ static ERROR_FORMAT_STRING_STRING: [libc::c_char; 4] = [
 
 /// Format string struct used to throw `TypeError`s.
 static mut TYPE_ERROR_FORMAT_STRING: JSErrorFormatString = JSErrorFormatString {
-    name: b"TYPE_ERROR" as *const _ as *const libc::c_char,
+    name: b"RUSTMSG_TYPE_ERROR\0" as *const _ as *const libc::c_char,
     format: &ERROR_FORMAT_STRING_STRING as *const libc::c_char,
     argCount: 1,
     exnType: JSExnType::JSEXN_TYPEERR as i16,
 };
 
 /// Format string struct used to throw `RangeError`s.
 static mut RANGE_ERROR_FORMAT_STRING: JSErrorFormatString = JSErrorFormatString {
-    name: b"RANGE_ERROR" as *const _ as *const libc::c_char,
+    name: b"RUSTMSG_RANGE_ERROR\0" as *const _ as *const libc::c_char,
     format: &ERROR_FORMAT_STRING_STRING as *const libc::c_char,
     argCount: 1,
     exnType: JSExnType::JSEXN_RANGEERR as i16,

src/rust.rs

@@ -511,9 +511,10 @@ impl GCMethods<Value> for Value {
 impl<T: GCMethods<T> + Copy> Heap<T> {
     pub fn set(&mut self, v: T) {
         unsafe {
-            let prev = *self.ptr.get();
-            *self.ptr.get() = v;
-            T::post_barrier(self.ptr.get(), prev, v);
+            let ptr = self.ptr.get();
+            let prev = *ptr;
+            *ptr = v;
+            T::post_barrier(ptr, prev, v);
         }
     }
 
@@ -551,8 +552,9 @@ impl Default for Heap<Value> {
 impl<T: GCMethods<T> + Copy> Drop for Heap<T> {
     fn drop(&mut self) {
         unsafe {
-            if !(*self.ptr.get()).is_dropped() {
-                T::post_barrier(self.ptr.get(), *self.ptr.get(), T::initial());
+            let ptr = self.ptr.get();
+            if !(*ptr).is_dropped() {
+                T::post_barrier(ptr, *ptr, T::initial());
             }
         }
     }