mozilla-central: changeset 225779:1515b55fc761ea5983903af7f9ef6b0fbb96c680

author	Jan de Mooij <jdemooij@mozilla.com>
	Mon, 26 Jan 2015 13:03:00 +0100
changeset 225779	1515b55fc761ea5983903af7f9ef6b0fbb96c680
parent 225778	68e641adcfb6b3a1f9f9a9936515c000713853c3
child 225780	c39414ca483aeb1454a8589005ee729c85fc2da5
push id	28175
push user	ryanvm@gmail.com
push date	Mon, 26 Jan 2015 21:33:41 +0000
treeherder	mozilla-central@a6f037b538ed [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
bugs	1118344
milestone	38.0a1
first release with	nightly linux32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly linux64 38e4719e71af / 38.0a1 / 20150127030230 / files nightly mac 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win32 38e4719e71af / 38.0a1 / 20150127030230 / files nightly win64 38e4719e71af / 38.0a1 / 20150127030230 / files
last release without	nightly linux32 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly linux64 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly mac fa91879c8428 / 38.0a1 / 20150126030202 / files nightly win32 fa91879c8428 / 38.0a1 / 20150126030202 / files nightly win64 fa91879c8428 / 38.0a1 / 20150126030202 / files

--- 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);