Backing out bug 815010 due to test failures
authorRobert 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 id24028
push useremorley@mozilla.com
push dateThu, 13 Dec 2012 15:56:02 +0000
treeherderautoland@9db79b97abbb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs815010
milestone20.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
Backing out bug 815010 due to test failures
--- 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();
 }