No bug. JSScript::filename is now a function. r=woof!
authorSteve Fink <sfink@mozilla.com>
Wed, 13 Mar 2013 14:47:12 -0700
changeset 124767 8a34d1952fe80942e6dae0e86cc1f2bce3d8c0ad
parent 124766 df1c39f05b4623ce129b6158b64c61333acefd3a
child 124768 d1d5909f3d0224b8277166d6b18a13f7af4e4d00
push id24588
push usersfink@mozilla.com
push dateWed, 13 Mar 2013 21:55:27 +0000
treeherdermozilla-inbound@8a34d1952fe8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswoof
milestone22.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
No bug. JSScript::filename is now a function. r=woof!
js/src/jsprobes.cpp
js/src/jsprobes.h
--- a/js/src/jsprobes.cpp
+++ b/js/src/jsprobes.cpp
@@ -148,19 +148,19 @@ Probes::shutdown()
 }
 
 #ifdef INCLUDE_MOZILLA_DTRACE
 static const char *
 ScriptFilename(const RawScript script)
 {
     if (!script)
         return Probes::nullName;
-    if (!script->filename)
+    if (!script->filename())
         return Probes::anonymousName;
-    return script->filename;
+    return script->filename();
 }
 
 static const char *
 FunctionName(JSContext *cx, RawFunction fun, JSAutoByteString* bytes)
 {
     if (!fun)
         return Probes::nullName;
     if (!fun->displayAtom())
--- a/js/src/jsprobes.h
+++ b/js/src/jsprobes.h
@@ -682,17 +682,17 @@ Probes::CustomMark(int marker)
 
 inline bool
 Probes::startExecution(RawScript script)
 {
     bool ok = true;
 
 #ifdef INCLUDE_MOZILLA_DTRACE
     if (JAVASCRIPT_EXECUTE_START_ENABLED())
-        JAVASCRIPT_EXECUTE_START((script->filename ? (char *)script->filename : nullName),
+        JAVASCRIPT_EXECUTE_START((script->filename() ? (char *)script->filename() : nullName),
                                  script->lineno);
 #endif
 #ifdef MOZ_ETW
     if (ProfilingActive && !ETWStartExecution(script))
         ok = false;
 #endif
 
     return ok;
@@ -700,17 +700,17 @@ Probes::startExecution(RawScript script)
 
 inline bool
 Probes::stopExecution(RawScript script)
 {
     bool ok = true;
 
 #ifdef INCLUDE_MOZILLA_DTRACE
     if (JAVASCRIPT_EXECUTE_DONE_ENABLED())
-        JAVASCRIPT_EXECUTE_DONE((script->filename ? (char *)script->filename : nullName),
+        JAVASCRIPT_EXECUTE_DONE((script->filename() ? (char *)script->filename() : nullName),
                                 script->lineno);
 #endif
 #ifdef MOZ_ETW
     if (ProfilingActive && !ETWStopExecution(script))
         ok = false;
 #endif
 
     return ok;