Backed out changeset cf1d774f7f73
authorDavid Anderson <danderson@mozilla.com>
Fri, 15 Oct 2010 15:21:20 -0700
changeset 56030 3e3a6040e97c4c2aea68764c74e054d3c18c69f0
parent 56029 cf1d774f7f73a3d361f4ce0c76f6debc408e3a54
child 56032 11ddd5d7c3570836a0d019fb2a258915b4549a06
push id16371
push userrsayre@mozilla.com
push dateMon, 18 Oct 2010 17:04:27 +0000
treeherderautoland@eae6bdacf6d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone2.0b8pre
backs outcf1d774f7f73a3d361f4ce0c76f6debc408e3a54
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
Backed out changeset cf1d774f7f73
js/src/jsdbgapi.cpp
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -1010,16 +1010,25 @@ JS_PCToLineNumber(JSContext *cx, JSScrip
 }
 
 JS_PUBLIC_API(jsbytecode *)
 JS_LineNumberToPC(JSContext *cx, JSScript *script, uintN lineno)
 {
     return js_LineNumberToPC(script, lineno);
 }
 
+<<<<<<< local
+JS_PUBLIC_API(jsbytecode *)
+JS_EndPC(JSContext *cx, JSScript *script)
+{
+    return script->code + script->length;
+}
+
+=======
+>>>>>>> other
 JS_PUBLIC_API(uintN)
 JS_GetFunctionArgumentCount(JSContext *cx, JSFunction *fun)
 {
     return fun->nargs;
 }
 
 JS_PUBLIC_API(JSBool)
 JS_FunctionHasLocalNames(JSContext *cx, JSFunction *fun)