Bug 1118344 followup - Fix inbound red since nbp is not around. r=me
authorJan de Mooij <jdemooij@mozilla.com>
Mon, 26 Jan 2015 13:03:00 +0100
changeset 225779 1515b55fc761ea5983903af7f9ef6b0fbb96c680
parent 225778 68e641adcfb6b3a1f9f9a9936515c000713853c3
child 225780 c39414ca483aeb1454a8589005ee729c85fc2da5
push id28175
push userryanvm@gmail.com
push dateMon, 26 Jan 2015 21:33:41 +0000
treeherdermozilla-central@a6f037b538ed [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1118344
milestone38.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 1118344 followup - Fix inbound red since nbp is not around. r=me
js/src/jit/MCallOptimize.cpp
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -1610,17 +1610,17 @@ IonBuilder::inlineSubstringKernel(CallIn
 }
 
 IonBuilder::InliningStatus
 IonBuilder::inlineObjectCreate(CallInfo &callInfo)
 {
     if (callInfo.argc() != 1 || callInfo.constructing())
         return InliningStatus_NotInlined;
 
-    NativeObject *templateObject = inspector->getTemplateObjectForNative(pc, obj_create);
+    JSObject *templateObject = inspector->getTemplateObjectForNative(pc, obj_create);
     if (!templateObject)
         return InliningStatus_NotInlined;
 
     MOZ_ASSERT(templateObject->is<PlainObject>());
     MOZ_ASSERT(!templateObject->hasSingletonType());
 
     // Ensure the argument matches the template object's prototype.
     MDefinition *arg = callInfo.getArg(0);