From e133b9c29aaf06393ee4d86e75aa245c4c2f7b3a Mon Sep 17 00:00:00 2001
From: Ryan VanderMeulen <ryanvm@gmail.com>
Date: Thu, 17 Oct 2013 14:50:47 -0400
Subject: [PATCH] Backed out changeset 79a1f60d83df (bug 909997) for bustage.
 CLOSED TREE

---
 js/src/jit-test/tests/ion/bug909997.js | 28 --------------------------
 js/src/jsapi.cpp                       | 27 +------------------------
 js/src/jsapi.h                         |  4 +---
 3 files changed, 2 insertions(+), 57 deletions(-)
 delete mode 100644 js/src/jit-test/tests/ion/bug909997.js

diff --git a/js/src/jit-test/tests/ion/bug909997.js b/js/src/jit-test/tests/ion/bug909997.js
deleted file mode 100644
index 6d9f5c1f1021..000000000000
--- a/js/src/jit-test/tests/ion/bug909997.js
+++ /dev/null
@@ -1,28 +0,0 @@
-var wait = 100;
-
-var method_A = function() {
-    for (var t = 0; t < wait; ++t) {}
-}
-
-var method_B = function() {
-    for (var t = 0; t < wait; ++t) {}
-}
-
-var method_C = function() {
-    for (var t = 0; t < wait; ++t) {}
-}
-
-var method_D = function() {
-    for (var t = 0; t < wait; ++t) {}
-}
-
-var func = [method_A, method_B, method_C, method_D]
-var opts = ["baseline.enable", "ion.enable"];
-
-for (var n = 0; n < opts.length; ++n) {
-    for (var m = 0; m < 2; ++m) {
-        setJitCompilerOption(opts[n], m & 1);
-        for (var i = 0; i < 1001; ++i)
-            func[n*2+m]();
-    }
-}
\ No newline at end of file
diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp
index 57d72f3217c8..8599b9698130 100644
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -1023,14 +1023,6 @@ JS_SetOptions(JSContext *cx, uint32_t options)
     return SetOptionsCommon(cx, options);
 }
 
-JS_PUBLIC_API(uint32_t)
-JS_ResetOptions(JSContext *cx, uint32_t options)
-{
-    unsigned oldopts = cx->options();
-    unsigned newopts = oldopts & ~options;
-    return SetOptionsCommon(cx, newopts);
-}
-
 JS_PUBLIC_API(uint32_t)
 JS_ToggleOptions(JSContext *cx, uint32_t options)
 {
@@ -6093,24 +6085,7 @@ JS_SetGlobalJitCompilerOption(JSContext *cx, JSJitCompilerOption opt, uint32_t v
         if (value == 0)
             jit::js_IonOptions.setEagerCompilation();
         break;
-      case JSJITCOMPILER_ION_ENABLE:
-        if (value == 1) {
-            JS_SetOptions(cx, JSOPTION_BASELINE | JSOPTION_ION);
-            IonSpew(js::jit::IonSpew_Scripts, "Enable ion");
-        } else if (value == 0) {
-            JS_ResetOptions(cx, JSOPTION_BASELINE | JSOPTION_ION);
-            IonSpew(js::jit::IonSpew_Scripts, "Disable ion");
-        }
-        break;
-      case JSJITCOMPILER_BASELINE_ENABLE:
-        if (value == 1) {
-            JS_SetOptions(cx, JSOPTION_BASELINE);
-            IonSpew(js::jit::IonSpew_BaselineScripts, "Enable baseline");
-        } else if (value == 0) {
-            JS_ResetOptions(cx, JSOPTION_BASELINE);
-            IonSpew(js::jit::IonSpew_BaselineScripts, "Disable baseline");
-        }
-        break;
+
       default:
         break;
     }
diff --git a/js/src/jsapi.h b/js/src/jsapi.h
index 69096e2d5bdf..849a16645665 100644
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -4426,9 +4426,7 @@ JS_SetParallelIonCompilationEnabled(JSContext *cx, bool enabled);
 
 #define JIT_COMPILER_OPTIONS(Register)                             \
   Register(BASELINE_USECOUNT_TRIGGER, "baseline.usecount.trigger") \
-  Register(ION_USECOUNT_TRIGGER, "ion.usecount.trigger")           \
-  Register(ION_ENABLE, "ion.enable")                               \
-  Register(BASELINE_ENABLE, "baseline.enable")
+  Register(ION_USECOUNT_TRIGGER, "ion.usecount.trigger")
 
 typedef enum JSJitCompilerOption {
 #define JIT_COMPILER_DECLARE(key, str) \