Bug 909389 - Remove --ion-compile-try-catch shell flag. r=djvj

This commit is contained in:
Jan de Mooij 2014-09-29 20:52:57 +02:00
parent 3f4c3e3d5e
commit 06a9724510
4 changed files with 0 additions and 11 deletions

View File

@ -3846,9 +3846,6 @@ IonBuilder::jsop_try()
{ {
JS_ASSERT(JSOp(*pc) == JSOP_TRY); JS_ASSERT(JSOp(*pc) == JSOP_TRY);
if (!js_JitOptions.compileTryCatch)
return abort("Try-catch support disabled");
// Try-finally is not yet supported. // Try-finally is not yet supported.
if (analysis().hasTryFinally()) if (analysis().hasTryFinally())
return abort("Has try-finally"); return abort("Has try-finally");

View File

@ -63,9 +63,6 @@ JitOptions::JitOptions()
// RangeAnalysis results. // RangeAnalysis results.
SET_DEFAULT(checkRangeAnalysis, false); SET_DEFAULT(checkRangeAnalysis, false);
// Whether Ion should compile try-catch statements.
SET_DEFAULT(compileTryCatch, true);
// Toggle whether eager scalar replacement is globally disabled. // Toggle whether eager scalar replacement is globally disabled.
SET_DEFAULT(disableScalarReplacement, true); // experimental SET_DEFAULT(disableScalarReplacement, true); // experimental

View File

@ -32,7 +32,6 @@ struct JitOptions
bool checkOsiPointRegisters; bool checkOsiPointRegisters;
#endif #endif
bool checkRangeAnalysis; bool checkRangeAnalysis;
bool compileTryCatch;
bool disableScalarReplacement; bool disableScalarReplacement;
bool disableGvn; bool disableGvn;
bool disableLicm; bool disableLicm;

View File

@ -5729,9 +5729,6 @@ SetRuntimeOptions(JSRuntime *rt, const OptionParser &op)
if (op.getBoolOption("ion-eager")) if (op.getBoolOption("ion-eager"))
jit::js_JitOptions.setEagerCompilation(); jit::js_JitOptions.setEagerCompilation();
if (op.getBoolOption("ion-compile-try-catch"))
jit::js_JitOptions.compileTryCatch = true;
bool offthreadCompilation = true; bool offthreadCompilation = true;
if (const char *str = op.getStringOption("ion-offthread-compile")) { if (const char *str = op.getStringOption("ion-offthread-compile")) {
if (strcmp(str, "off") == 0) if (strcmp(str, "off") == 0)
@ -5974,7 +5971,6 @@ main(int argc, char **argv, char **envp)
" backtracking: Priority based backtracking register allocation\n" " backtracking: Priority based backtracking register allocation\n"
" stupid: Simple block local register allocation") " stupid: Simple block local register allocation")
|| !op.addBoolOption('\0', "ion-eager", "Always ion-compile methods (implies --baseline-eager)") || !op.addBoolOption('\0', "ion-eager", "Always ion-compile methods (implies --baseline-eager)")
|| !op.addBoolOption('\0', "ion-compile-try-catch", "Ion-compile try-catch statements")
|| !op.addStringOption('\0', "ion-offthread-compile", "on/off", || !op.addStringOption('\0', "ion-offthread-compile", "on/off",
"Compile scripts off thread (default: on)") "Compile scripts off thread (default: on)")
|| !op.addStringOption('\0', "ion-parallel-compile", "on/off", || !op.addStringOption('\0', "ion-parallel-compile", "on/off",