Merge backout of bug 474500 (API to flush the JIT code cache) because of build bustage. CLOSED TREE checkin.

js/src/jsapi.cpp

@@ -2604,14 +2604,6 @@ JS_GetGCParameterForThread(JSContext *cx, JSGCParamKey key)
 #endif
 }
 
-JS_PUBLIC_API(void)
-JS_FlushCaches(JSContext *cx)
-{
-#ifdef JS_TRACER
-    js_FlushJITCache(cx);
-#endif
-}
-
 JS_PUBLIC_API(intN)
 JS_AddExternalStringFinalizer(JSStringFinalizeOp finalizer)
 {

js/src/jsapi.h

@@ -1324,15 +1324,6 @@ JS_SetGCParameterForThread(JSContext *cx, JSGCParamKey key, uint32 value);
 extern JS_PUBLIC_API(uint32)
 JS_GetGCParameterForThread(JSContext *cx, JSGCParamKey key);
 
-/*
- * Flush the code cache for the current thread. The operation might be
- * delayed if the cache cannot be flushed currently because native
- * code is currently executing.
- */
-
-extern JS_PUBLIC_API(void)
-JS_FlushCaches(JSContext *cx);
-
 /*
  * Add a finalizer for external strings created by JS_NewExternalString (see
  * below) using a type-code returned from this function, and that understands

js/src/jsregexp.cpp

@@ -3267,7 +3267,7 @@ class RegExpNativeCompiler {
                     js_FragProfiling_FragFinalizer(frag, tm);
                 }
             )
-            js_FlushJITCache(cx);
+            js_ResetJIT(cx);
         } else {
             if (!guard) insertGuard(loopLabel, re_chars, re_length);
             re->flags |= JSREG_NOCOMPILE;

js/src/jstracer.cpp

@@ -2293,12 +2293,6 @@ ResetJIT(JSContext* cx, TraceVisFlushReason r)
 #define ResetJIT(cx, r) ResetJITImpl(cx)
 #endif
 
-void
-js_FlushJITCache(JSContext *cx)
-{
-    ResetJIT(cx, FR_OOM);
-}
-
 static void
 TrashTree(JSContext* cx, TreeFragment* f);
 

js/src/jstracer.h

@@ -1479,7 +1479,7 @@ extern bool
 js_OverfullJITCache(JSTraceMonitor* tm);
 
 extern void
-js_FlushJITCache(JSContext* cx);
+js_ResetJIT(JSContext* cx);
 
 extern void
 js_PurgeJITOracle();