Bug 987379 - Fix enableSPSProfilingAssertions api to be cleaner. r=h4writer

js/src/builtin/TestingFunctions.cpp

@@ -1002,24 +1002,51 @@ Terminate(JSContext *cx, unsigned arg, jsval *vp)
     return false;
 }
 
+#define SPS_PROFILING_STACK_MAX_SIZE 1000
+static ProfileEntry SPS_PROFILING_STACK[SPS_PROFILING_STACK_MAX_SIZE];
+static uint32_t SPS_PROFILING_STACK_SIZE = 0;
+
 static bool
-EnableSPSProfilingAssertions(JSContext *cx, unsigned argc, jsval *vp)
+EnableSPSProfiling(JSContext *cx, unsigned argc, jsval *vp)
 {
     CallArgs args = CallArgsFromVp(argc, vp);
-    if (!args.get(0).isBoolean()) {
-        RootedObject arg(cx, &args.callee());
-        ReportUsageError(cx, arg, "Must have one boolean argument");
-        return false;
-    }
-
-    static ProfileEntry stack[1000];
-    static uint32_t stack_size = 0;
 
     // Disable before re-enabling; see the assertion in |SPSProfiler::setProfilingStack|.
     if (cx->runtime()->spsProfiler.installed())
         cx->runtime()->spsProfiler.enable(false);
-    SetRuntimeProfilingStack(cx->runtime(), stack, &stack_size, 1000);
-    cx->runtime()->spsProfiler.enableSlowAssertions(args[0].toBoolean());
+
+    SetRuntimeProfilingStack(cx->runtime(), SPS_PROFILING_STACK, &SPS_PROFILING_STACK_SIZE,
+                             SPS_PROFILING_STACK_MAX_SIZE);
+    cx->runtime()->spsProfiler.enableSlowAssertions(false);
+    cx->runtime()->spsProfiler.enable(true);
+
+    args.rval().setUndefined();
+    return true;
+}
+
+static bool
+EnableSPSProfilingWithSlowAssertions(JSContext *cx, unsigned argc, jsval *vp)
+{
+    CallArgs args = CallArgsFromVp(argc, vp);
+
+    if (cx->runtime()->spsProfiler.enabled()) {
+        // If profiling already enabled with slow assertions disabled,
+        // this is a no-op.
+        if (cx->runtime()->spsProfiler.slowAssertionsEnabled())
+            return true;
+
+        // Slow assertions are off.  Disable profiling before re-enabling
+        // with slow assertions on.
+        cx->runtime()->spsProfiler.enable(false);
+    }
+
+    // Disable before re-enabling; see the assertion in |SPSProfiler::setProfilingStack|.
+    if (cx->runtime()->spsProfiler.installed())
+        cx->runtime()->spsProfiler.enable(false);
+
+    SetRuntimeProfilingStack(cx->runtime(), SPS_PROFILING_STACK, &SPS_PROFILING_STACK_SIZE,
+                             SPS_PROFILING_STACK_MAX_SIZE);
+    cx->runtime()->spsProfiler.enableSlowAssertions(true);
     cx->runtime()->spsProfiler.enable(true);
 
     args.rval().setUndefined();
@@ -1703,14 +1730,17 @@ static const JSFunctionSpecWithHelp TestingFunctions[] = {
 "  Terminate JavaScript execution, as if we had run out of\n"
 "  memory or been terminated by the slow script dialog."),
 
-    JS_FN_HELP("enableSPSProfilingAssertions", EnableSPSProfilingAssertions, 1, 0,
-"enableSPSProfilingAssertions(slow)",
-"  Enables SPS instrumentation and corresponding assertions. If 'slow' is\n"
-"  true, then even slower assertions are enabled for all generated JIT code.\n"
-"  When 'slow' is false, then instrumentation is enabled, but the slow\n"
-"  assertions are disabled."),
+    JS_FN_HELP("enableSPSProfiling", EnableSPSProfiling, 0, 0,
+"enableSPSProfiling()",
+"  Enables SPS instrumentation and corresponding assertions, with slow\n"
+"  assertions disabled.\n"),
 
-    JS_FN_HELP("disableSPSProfiling", DisableSPSProfiling, 1, 0,
+    JS_FN_HELP("enableSPSProfilingWithSlowAssertions", EnableSPSProfilingWithSlowAssertions, 0, 0,
+"enableSPSProfilingWithSlowAssertions()",
+"  Enables SPS instrumentation and corresponding assertions, with slow\n"
+"  assertions enabled.\n"),
+
+    JS_FN_HELP("disableSPSProfiling", DisableSPSProfiling, 0, 0,
 "disableSPSProfiling()",
 "  Disables SPS instrumentation"),
 

js/src/jit-test/tests/ion/bug875656.js

@@ -1,2 +1,2 @@
-enableSPSProfilingAssertions(false);
+enableSPSProfiling();
 Object.getOwnPropertyNames(this);

js/src/jit-test/tests/ion/bug901086.js

@@ -1,4 +1,4 @@
-enableSPSProfilingAssertions(false);
+enableSPSProfiling();
 function foo(obj,x,y,z) {
     if (!y)
 	assertEq(0, 1);

js/src/jit-test/tests/ion/bug925308.js

@@ -2,7 +2,7 @@
 
 var lfcode = new Array();
 lfcode.push("3");
-lfcode.push("enableSPSProfilingAssertions(false);foo();");
+lfcode.push("enableSPSProfiling();foo();");
 while (true) {
   var file = lfcode.shift(); if (file == undefined) { break; }
   loadFile(file)

js/src/jit-test/tests/profiler/bug925309.js

@@ -1,2 +1,2 @@
 
-for(var i = 0; i < 100; enableSPSProfilingAssertions(false), i++) {}
+for(var i = 0; i < 100; enableSPSProfiling(), i++) {}

js/src/jit-test/tests/profiler/enterjit-osr-disabling-earlyret.js

@@ -1,13 +1,13 @@
 setJitCompilerOption("baseline.usecount.trigger", 10);
 setJitCompilerOption("ion.usecount.trigger", 20);
 
-enableSPSProfilingAssertions(true);
+enableSPSProfilingWithSlowAssertions();
 (function() {
    var n = 50;
    while (n--) {
        disableSPSProfiling();
        if (!n)
 	   return;
-       enableSPSProfilingAssertions(true);
+       enableSPSProfilingWithSlowAssertions();
    }
 })();

js/src/jit-test/tests/profiler/enterjit-osr-disabling.js

@@ -1,7 +1,7 @@
 setJitCompilerOption("baseline.usecount.trigger", 10);
 setJitCompilerOption("ion.usecount.trigger", 20);
 
-enableSPSProfilingAssertions(true);
+enableSPSProfilingWithSlowAssertions();
 (function() {
    disableSPSProfiling();
    var n = 50;

js/src/jit-test/tests/profiler/enterjit-osr-enabling-earlyret.js

@@ -4,7 +4,7 @@ setJitCompilerOption("ion.usecount.trigger", 20);
 (function() {
    var n = 50;
    while (n--) {
-       enableSPSProfilingAssertions(true);
+       enableSPSProfilingWithSlowAssertions();
        if (!n)
 	   return;
        disableSPSProfiling();

js/src/jit-test/tests/profiler/enterjit-osr-enabling.js

@@ -2,7 +2,7 @@ setJitCompilerOption("baseline.usecount.trigger", 10);
 setJitCompilerOption("ion.usecount.trigger", 20);
 
 (function() {
-   enableSPSProfilingAssertions(true);
+   enableSPSProfilingWithSlowAssertions();
    var n = 50;
    while (n--);
 })();

js/src/jit-test/tests/profiler/enterjit-osr.js

@@ -1,7 +1,7 @@
 setJitCompilerOption("baseline.usecount.trigger", 10);
 setJitCompilerOption("ion.usecount.trigger", 20);
 
-enableSPSProfilingAssertions(true);
+enableSPSProfilingWithSlowAssertions();
 (function() {
    var n = 50;
    while (n--);