summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
Diffstat (limited to 'js')
-rw-r--r--js/src/jit/JitOptions.cpp2
-rw-r--r--js/src/jsscript.h9
2 files changed, 2 insertions, 9 deletions
diff --git a/js/src/jit/JitOptions.cpp b/js/src/jit/JitOptions.cpp
index daae3d53b..7521a9fae 100644
--- a/js/src/jit/JitOptions.cpp
+++ b/js/src/jit/JitOptions.cpp
@@ -96,7 +96,7 @@ DefaultJitOptions::DefaultJitOptions()
SET_DEFAULT(disableGvn, false);
// Toggles whether inlining is globally disabled.
- SET_DEFAULT(disableInlining, false);
+ SET_DEFAULT(disableInlining, true);
// Toggles whether loop invariant code motion is globally disabled.
SET_DEFAULT(disableLicm, false);
diff --git a/js/src/jsscript.h b/js/src/jsscript.h
index dfe0e486e..d8d28ebeb 100644
--- a/js/src/jsscript.h
+++ b/js/src/jsscript.h
@@ -1443,14 +1443,7 @@ class JSScript : public js::gc::TenuredCell
return res;
}
bool canIonCompile() const {
- // Exclude function scopes from Ion compilation.
- // This is necessary to work around an issue with module scripts causing crashes
- // with the function stack in Ion if module code is declared in-line.
- // See Issue #1624
- // XXX: Perhaps we can further fine-grain select which types of function scope
- // we have to exclude?
- return (ion != ION_DISABLED_SCRIPT &&
- !bodyScope()->is<js::FunctionScope>());
+ return ion != ION_DISABLED_SCRIPT;
}
bool isIonCompilingOffThread() const {
return ion == ION_COMPILING_SCRIPT;