autoland: changeset 115883:0368b4c03c63bfe00246bc149aef886e4d0a4ff2

author	Robert O'Callahan <robert@ocallahan.org>
	Thu, 13 Dec 2012 16:06:34 +1300
changeset 115883	0368b4c03c63bfe00246bc149aef886e4d0a4ff2
parent 115881	bdee421b26c6b218ecc4ee29ab9a08ea3a099d9d (current diff)
parent 115882	ebfa6888f98e100a7ed695a19b1a9e75eb9c2b9f (diff)
child 115884	8435a5715fa7575697cc1a6fbe0144ab5f28b254
push id	24028
push user	emorley@mozilla.com
push date	Thu, 13 Dec 2012 15:56:02 +0000
treeherder	autoland@9db79b97abbb [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
bugs	815010
milestone	20.0a1
first release with	nightly linux32 b11065872128 / 20.0a1 / 20121214030827 / files nightly linux64 b11065872128 / 20.0a1 / 20121214030827 / files nightly mac b11065872128 / 20.0a1 / 20121214030827 / files nightly win32 b11065872128 / 20.0a1 / 20121214030827 / files nightly win64 b11065872128 / 20.0a1 / 20121214030827 / files
last release without	nightly linux32 634180132e68 / 20.0a1 / 20121212034329 / files nightly linux64 634180132e68 / 20.0a1 / 20121212034329 / files nightly mac 634180132e68 / 20.0a1 / 20121212034329 / files nightly win32 634180132e68 / 20.0a1 / 20121212034329 / files nightly win64 634180132e68 / 20.0a1 / 20121212034329 / files

--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -443,23 +443,17 @@ extern JS_PUBLIC_API(void)
 JS_ReleaseFunctionLocalNameArray(JSContext *cx, void *mark)
 {
     cx->tempLifoAlloc().release(mark);
 }
 
 JS_PUBLIC_API(JSScript *)
 JS_GetFunctionScript(JSContext *cx, JSFunction *fun)
 {
-    if (fun->isNative())
-        return NULL;
-    assertSameCompartment(cx, fun);
-    RawScript script = fun->getOrCreateScript(cx);
-    if (!script)
-        MOZ_CRASH();
-    return script;
+    return fun->maybeNonLazyScript();
 }
 
 JS_PUBLIC_API(JSNative)
 JS_GetFunctionNative(JSContext *cx, JSFunction *fun)
 {
     return fun->maybeNative();
 }