Bug 1150714 - Fix streaming tracked optimizations for functions that …

…don't have a displayAtom. (r=djvj)
dothq · Apr 7, 2015 · fb729d0 · fb729d0
1 parent d004b16
commit fb729d0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/js/src/jit/OptimizationTracking.cpp b/js/src/jit/OptimizationTracking.cpp
@@ -1213,11 +1213,14 @@ IonTrackedOptimizationsTypeInfo::ForEachOpAdapter::readType(const IonTrackedType
             return;
         }
 
-        PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
+        if (fun->displayAtom())
+            PutEscapedString(buf, bufsize, fun->displayAtom(), 0);
         const char* filename;
         unsigned lineno;
         InterpretedFunctionFilenameAndLineNumber(fun, &filename, &lineno);
-        op_.readType(tracked.constructor ? "constructor" : "function", buf, filename, lineno);
+        op_.readType(tracked.constructor ? "constructor" : "function",
+                     fun->displayAtom() ? buf : nullptr,
+                     filename, lineno);
         return;
     }
 

diff --git a/tools/profiler/ProfileEntry.cpp b/tools/profiler/ProfileEntry.cpp
@@ -231,8 +231,8 @@ class StreamOptimizationTypeInfoOp : public JS::ForEachTrackedOptimizationTypeIn
     , mStartedTypeList(false)
   { }
 
-  void readType(const char *keyedBy, const char *name,
-                const char *location, unsigned lineno) override {
+  void readType(const char* keyedBy, const char* name,
+                const char* location, unsigned lineno) override {
     if (!mStartedTypeList) {
       mStartedTypeList = true;
       mWriter.BeginObject();
@@ -254,7 +254,7 @@ class StreamOptimizationTypeInfoOp : public JS::ForEachTrackedOptimizationTypeIn
     mWriter.EndObject();
   }
 
-  void operator()(JS::TrackedTypeSite site, const char *mirType) override {
+  void operator()(JS::TrackedTypeSite site, const char* mirType) override {
     if (mStartedTypeList) {
       mWriter.EndArray();
       mStartedTypeList = false;