From 43fe90d06563e91adf23e6c44a30b41583d1a7cd Mon Sep 17 00:00:00 2001
From: "Carsten \"Tomcat\" Book" <cbook@mozilla.com>
Date: Fri, 21 Nov 2014 08:04:01 +0100
Subject: [PATCH] Backed out changeset aa78b751e325 (bug 1083694)

---
 js/src/vm/TraceLogging.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/js/src/vm/TraceLogging.cpp b/js/src/vm/TraceLogging.cpp
index e163453cc7b4..97b6108b1749 100644
--- a/js/src/vm/TraceLogging.cpp
+++ b/js/src/vm/TraceLogging.cpp
@@ -423,12 +423,10 @@ TraceLoggerThread::logTimestamp(uint32_t id)
         return;
 
     if (!events.ensureSpaceBeforeAdd()) {
-        uint64_t start = 0;
+        uint64_t start = rdtsc() - traceLoggers.startupTime;
 
-        if (graph.get()) {
-            start = rdtsc() - traceLoggers.startupTime;
+        if (graph.get())
             graph->log(events);
-        }
 
         iteration_++;
         events.clear();
@@ -447,7 +445,7 @@ TraceLoggerThread::logTimestamp(uint32_t id)
         }
     }
 
-    uint64_t time = graph.get() ? rdtsc() - traceLoggers.startupTime : 0;
+    uint64_t time = rdtsc() - traceLoggers.startupTime;
 
     EventEntry &entry = events.pushUninitialized();
     entry.time = time;