Bug 987807 (reland with correct bug number so DONTBUILD) - Fix ggc-only typos. r=i-am-so-smrt
authorJeff Walden <jwalden@mit.edu>
Thu, 27 Mar 2014 01:20:27 -0400
changeset 175628 8a42016d8daa19a656add5a3cef6a848f8aec08e
parent 175627 f431f72252e2ae3b01877be446b4240fef8b2ce3
child 175629 e1f47e027885502b0593a90a4b01f211e2f7025c
push id26496
push userkwierso@gmail.com
push dateFri, 28 Mar 2014 02:28:34 +0000
treeherdermozilla-central@3c09159e01da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersi-am-so-smrt
bugs987807
milestone31.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 987807 (reland with correct bug number so DONTBUILD) - Fix ggc-only typos. r=i-am-so-smrt
js/src/jit/CodeGenerator.cpp
--- a/js/src/jit/CodeGenerator.cpp
+++ b/js/src/jit/CodeGenerator.cpp
@@ -3562,17 +3562,17 @@ CodeGenerator::visitNewCallObject(LNewCa
                                     ImmGCPtr(templateObj->type()),
                                     ImmPtr(nullptr)),
                         StoreRegisterTo(objReg));
     }
     if (!ool)
         return false;
 
 #ifdef JSGC_GENERATIONAL
-    if (ins->templateObject()->hasDynamicSlots()) {
+    if (templateObj->hasDynamicSlots()) {
         // Slot initialization is unbarriered in this case, so we must either
         // allocate in the nursery or bail if that is not possible.
         masm.jump(ool->entry());
     } else
 #endif
     {
         // Inline call object creation, using the OOL path only for tricky cases.
         masm.newGCThing(objReg, tempReg, templateObj, ool->entry(), gc::DefaultHeap);