Ticket #3708: Bug_1280648_Mod.diff

js/src/vm/TraceLogging.cpp

@@ -402 +402 @@
         filename = "<unknown>";
 
     // Only log scripts when enabled otherwise return the global Scripts textId,
     // which will get filtered out.
     MOZ_ASSERT(traceLoggerState);
     if (!traceLoggerState->isTextIdEnabled(type))
         return getOrCreateEventPayload(type);
 
-    PointerHashMap::AddPtr p = pointerMap.lookupForAdd(ptr);
-    if (p) {
-        MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check.
-        return p->value();
+    PointerHashMap::AddPtr p;
+    if (ptr) {
+        p = pointerMap.lookupForAdd(ptr);
+        if (p) {
+            MOZ_ASSERT(p->value()->textId() < nextTextId); // Sanity check.
+            return p->value();
+        }
     }
 
     // Compute the length of the string to create.
     size_t lenFilename = strlen(filename);
     size_t lenLineno = 1;
     for (size_t i = lineno; i /= 10; lenLineno++);
     size_t lenColno = 1;
     for (size_t i = colno; i /= 10; lenColno++);
@@ -444 +447 @@
         return nullptr;
     }
 
     if (graph.get())
         graph->addTextId(textId, str);
 
     nextTextId++;
 
-    if (!pointerMap.add(p, ptr, payload))
-        return nullptr;
+    if (ptr) {
+        if (!pointerMap.add(p, ptr, payload))
+            return nullptr;
+    }
 
     return payload;
 }
 
 TraceLoggerEventPayload*
 TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type, JSScript* script)
 {
     return getOrCreateEventPayload(type, script->filename(), script->lineno(), script->column(),
-                                   script);
+                                   nullptr);
 }
 
 TraceLoggerEventPayload*
 TraceLoggerThread::getOrCreateEventPayload(TraceLoggerTextId type,
                                            const JS::ReadOnlyCompileOptions& script)
 {
-    return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, &script);
+    return getOrCreateEventPayload(type, script.filename(), script.lineno, script.column, nullptr);
 }
 
 void
 TraceLoggerThread::startEvent(TraceLoggerTextId id) {
     startEvent(uint32_t(id));
 }
 
 void