From 3b0f76327e11630268a5bf72d714da7fc48d8047 Mon Sep 17 00:00:00 2001
From: Jan de Mooij <jdemooij@mozilla.com>
Date: Wed, 14 Jun 2017 13:04:23 +0200
Subject: [PATCH] Bug 1372851 - Disable TraceLogger by default in opt builds.
 r=bbouvier

---
 js/src/old-configure.in | 12 ++++++++----
 js/src/vm/Debugger.cpp  |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/js/src/old-configure.in b/js/src/old-configure.in
index 426a43e6efbb..cb7c864c4a93 100644
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1504,13 +1504,17 @@ AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
 AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
 
 dnl ========================================================
-dnl = Disable trace logging
+dnl = Trace logging. Enabled by default in DEBUG builds.
 dnl ========================================================
-ENABLE_TRACE_LOGGING=1
-MOZ_ARG_DISABLE_BOOL(trace-logging,
-[  --disable-trace-logging   Disable trace logging],
+MOZ_ARG_ENABLE_BOOL(trace-logging,
+[  --enable-trace-logging   Enable trace logging],
+    ENABLE_TRACE_LOGGING=1,
     ENABLE_TRACE_LOGGING= )
 
+if test -n "$MOZ_DEBUG"; then
+    ENABLE_TRACE_LOGGING=1
+fi
+
 AC_SUBST(ENABLE_TRACE_LOGGING)
 
 if test -n "$ENABLE_TRACE_LOGGING"; then
diff --git a/js/src/vm/Debugger.cpp b/js/src/vm/Debugger.cpp
index e780277e7d07..c41de9d8cb98 100644
--- a/js/src/vm/Debugger.cpp
+++ b/js/src/vm/Debugger.cpp
@@ -5031,6 +5031,7 @@ Debugger::makeGlobalObjectReference(JSContext* cx, unsigned argc, Value* vp)
     return dbg->wrapDebuggeeValue(cx, args.rval());
 }
 
+#ifdef JS_TRACE_LOGGING
 static bool
 DefineProperty(JSContext* cx, HandleObject obj, HandleId id, const char* value, size_t n)
 {
@@ -5042,7 +5043,6 @@ DefineProperty(JSContext* cx, HandleObject obj, HandleId id, const char* value,
     return JS_DefinePropertyById(cx, obj, id, str, JSPROP_ENUMERATE);
 }
 
-#ifdef JS_TRACE_LOGGING
 # ifdef NIGHTLY_BUILD
 bool
 Debugger::setupTraceLogger(JSContext* cx, unsigned argc, Value* vp)