Bug 885607 - Make AsmJSModule's Global and ExportedFunction use RelocatablePtr; r=luke
authorTerrence Cole <terrence@mozilla.com>
Fri, 21 Jun 2013 19:27:16 -0700
changeset 147555 0211a7e4bec6471fdaa6046b5db569cfa0567212
parent 147554 3df4624381b76cb5fc8254e0604f42d8702a2c33
child 147556 7c8506b0729d23129ed4154823f2f2c4e2bc6614
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersluke
bugs885607
milestone24.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 885607 - Make AsmJSModule's Global and ExportedFunction use RelocatablePtr; r=luke
js/src/ion/AsmJSModule.h
--- a/js/src/ion/AsmJSModule.h
+++ b/js/src/ion/AsmJSModule.h
@@ -66,17 +66,17 @@ class AsmJSModule
                     AsmJSCoercion coercion_;
                 } init;
             } var;
             uint32_t ffiIndex_;
             ArrayBufferView::ViewType viewType_;
             AsmJSMathBuiltin mathBuiltin_;
             double constantValue_;
         } u;
-        HeapPtrPropertyName name_;
+        RelocatablePtr<PropertyName> name_;
 
         friend class AsmJSModule;
         Global(Which which) : which_(which) {}
 
         void trace(JSTracer *trc) {
             if (name_)
                 MarkString(trc, &name_, "asm.js global name");
             JS_ASSERT_IF(which_ == Variable && u.var.initKind_ == InitConstant,
@@ -198,18 +198,18 @@ class AsmJSModule
     enum ReturnType { Return_Int32, Return_Double, Return_Void };
 
     class ExportedFunction
     {
       public:
 
       private:
 
-        HeapPtrFunction fun_;
-        HeapPtrPropertyName maybeFieldName_;
+        RelocatablePtr<JSFunction> fun_;
+        RelocatablePtr<PropertyName> maybeFieldName_;
         ArgCoercionVector argCoercions_;
         ReturnType returnType_;
         bool hasCodePtr_;
         union {
             unsigned codeOffset_;
             CodePtr code_;
         } u;