Backed out changeset f7fee43555d8 (bug 822831) for bustage.

js/src/jsdbgapi.cpp

@@ -326,7 +326,7 @@ JS_ClearAllWatchPoints(JSContext *cx)
 /************************************************************************/
 
 JS_PUBLIC_API(unsigned)
-JS_PCToLineNumber(JSContext *cx, RawScript script, jsbytecode *pc)
+JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc)
 {
     return js::PCToLineNumber(script, pc);
 }

js/src/jsdbgapi.h

@@ -141,9 +141,8 @@ JS_ClearAllWatchPoints(JSContext *cx);
 
 /************************************************************************/
 
-// RawScript because this needs to be callable from a signal handler
 extern JS_PUBLIC_API(unsigned)
-JS_PCToLineNumber(JSContext *cx, RawScript script, jsbytecode *pc);
+JS_PCToLineNumber(JSContext *cx, JSScript *script, jsbytecode *pc);
 
 extern JS_PUBLIC_API(jsbytecode *)
 JS_LineNumberToPC(JSContext *cx, JSScript *script, unsigned lineno);

js/src/jsfriendapi.h

@@ -677,10 +677,8 @@ SetRuntimeProfilingStack(JSRuntime *rt, ProfileEntry *stack, uint32_t *size,
 JS_FRIEND_API(void)
 EnableRuntimeProfilingStack(JSRuntime *rt, bool enabled);
 
-// Use RawScript rather than UnrootedScript because it may be called from a
-// signal handler
 JS_FRIEND_API(jsbytecode*)
-ProfilingGetPC(JSRuntime *rt, RawScript script, void *ip);
+ProfilingGetPC(JSRuntime *rt, JSScript *script, void *ip);
 
 #ifdef JS_THREADSAFE
 JS_FRIEND_API(void *)

js/src/vm/SPSProfiler.cpp

@@ -223,10 +223,8 @@ JMChunkInfo::JMChunkInfo(mjit::JSActiveFrame *frame,
     chunk(chunk)
 {}
 
-// Use RawScript instead of UnrootedScript because this may be called from a
-// signal handler
 jsbytecode*
-SPSProfiler::ipToPC(RawScript script, size_t ip)
+SPSProfiler::ipToPC(UnrootedScript script, size_t ip)
 {
     if (!jminfo.initialized())
         return NULL;

js/src/vm/SPSProfiler.h

@@ -234,7 +234,7 @@ class SPSProfiler
                          mjit::JITChunk *chunk, void* address);
     bool registerICCode(mjit::JITChunk *chunk, UnrootedScript script, jsbytecode* pc,
                         void *start, size_t size);
-    jsbytecode *ipToPC(RawScript script, size_t ip);
+    jsbytecode *ipToPC(UnrootedScript script, size_t ip);
 
   private:
     JMChunkInfo *registerScript(mjit::JSActiveFrame *frame,
@@ -243,7 +243,7 @@ class SPSProfiler
     void unregisterScript(UnrootedScript script, mjit::JITChunk *chunk);
   public:
 #else
-    jsbytecode *ipToPC(RawScript script, size_t ip) { return NULL; }
+    jsbytecode *ipToPC(UnrootedScript script, size_t ip) { return NULL; }
 #endif
 
     void setProfilingStack(ProfileEntry *stack, uint32_t *size, uint32_t max);