Commit 0971100d authored by Marius Wachtler's avatar Marius Wachtler

remove lazy scoping analysis option

parent 0814d218
...@@ -1160,8 +1160,7 @@ Value ASTInterpreter::createFunction(AST* node, AST_arguments* args) { ...@@ -1160,8 +1160,7 @@ Value ASTInterpreter::createFunction(AST* node, AST_arguments* args) {
u.d.s = defaults.size() - 1; u.d.s = defaults.size() - 1;
bool takes_closure; bool takes_closure;
if (!LAZY_SCOPING_ANALYSIS) source_info->scoping->getScopeInfoForNode(node);
source_info->scoping->getScopeInfoForNode(node);
// Optimization: when compiling a module, it's nice to not have to run analyses into the // Optimization: when compiling a module, it's nice to not have to run analyses into the
// entire module's source code. // entire module's source code.
......
...@@ -80,7 +80,6 @@ bool ENABLE_PYSTON_PASSES = 0 && _GLOBAL_ENABLE; ...@@ -80,7 +80,6 @@ bool ENABLE_PYSTON_PASSES = 0 && _GLOBAL_ENABLE;
bool ENABLE_TYPE_FEEDBACK = 1 && _GLOBAL_ENABLE; bool ENABLE_TYPE_FEEDBACK = 1 && _GLOBAL_ENABLE;
bool ENABLE_RUNTIME_ICS = 1 && _GLOBAL_ENABLE; bool ENABLE_RUNTIME_ICS = 1 && _GLOBAL_ENABLE;
bool ENABLE_JIT_OBJECT_CACHE = 1 && _GLOBAL_ENABLE; bool ENABLE_JIT_OBJECT_CACHE = 1 && _GLOBAL_ENABLE;
bool LAZY_SCOPING_ANALYSIS = 1;
bool ENABLE_FRAME_INTROSPECTION = 1; bool ENABLE_FRAME_INTROSPECTION = 1;
......
...@@ -44,8 +44,7 @@ extern bool LOG_IC_ASSEMBLY, LOG_BJIT_ASSEMBLY; ...@@ -44,8 +44,7 @@ extern bool LOG_IC_ASSEMBLY, LOG_BJIT_ASSEMBLY;
extern bool ENABLE_ICS, ENABLE_ICGENERICS, ENABLE_ICGETITEMS, ENABLE_ICSETITEMS, ENABLE_ICDELITEMS, ENABLE_ICBINEXPS, extern bool ENABLE_ICS, ENABLE_ICGENERICS, ENABLE_ICGETITEMS, ENABLE_ICSETITEMS, ENABLE_ICDELITEMS, ENABLE_ICBINEXPS,
ENABLE_ICNONZEROS, ENABLE_ICCALLSITES, ENABLE_ICSETATTRS, ENABLE_ICGETATTRS, ENALBE_ICDELATTRS, ENABLE_ICGETGLOBALS, ENABLE_ICNONZEROS, ENABLE_ICCALLSITES, ENABLE_ICSETATTRS, ENABLE_ICGETATTRS, ENALBE_ICDELATTRS, ENABLE_ICGETGLOBALS,
ENABLE_SPECULATION, ENABLE_OSR, ENABLE_LLVMOPTS, ENABLE_INLINING, ENABLE_REOPT, ENABLE_PYSTON_PASSES, ENABLE_SPECULATION, ENABLE_OSR, ENABLE_LLVMOPTS, ENABLE_INLINING, ENABLE_REOPT, ENABLE_PYSTON_PASSES,
ENABLE_TYPE_FEEDBACK, ENABLE_FRAME_INTROSPECTION, ENABLE_RUNTIME_ICS, ENABLE_JIT_OBJECT_CACHE, ENABLE_TYPE_FEEDBACK, ENABLE_FRAME_INTROSPECTION, ENABLE_RUNTIME_ICS, ENABLE_JIT_OBJECT_CACHE;
LAZY_SCOPING_ANALYSIS;
// Due to a temporary LLVM limitation, represent bools as i64's instead of i1's. // Due to a temporary LLVM limitation, represent bools as i64's instead of i1's.
#define BOOLS_AS_I64 1 #define BOOLS_AS_I64 1
......
...@@ -45,7 +45,6 @@ static Box* setOption(Box* option, Box* value) { ...@@ -45,7 +45,6 @@ static Box* setOption(Box* option, Box* value) {
else CHECK(SPECULATION_THRESHOLD); else CHECK(SPECULATION_THRESHOLD);
else CHECK(ENABLE_ICS); else CHECK(ENABLE_ICS);
else CHECK(ENABLE_ICGETATTRS); else CHECK(ENABLE_ICGETATTRS);
else CHECK(LAZY_SCOPING_ANALYSIS);
else raiseExcHelper(ValueError, "unknown option name '%s", option_string->data()); else raiseExcHelper(ValueError, "unknown option name '%s", option_string->data());
Py_RETURN_NONE; Py_RETURN_NONE;
......
try:
import __pyston__
__pyston__.setOption("LAZY_SCOPING_ANALYSIS", 0)
except ImportError:
pass
cases = [ cases = [
""" """
......
# I would have expected this to be valid, but cPython and pypy err out saying "name 'x' is local and global" # I would have expected this to be valid, but cPython and pypy err out saying "name 'x' is local and global"
try:
import __pyston__
__pyston__.setOption("LAZY_SCOPING_ANALYSIS", 0)
except ImportError:
pass
try: try:
exec """ exec """
x = 1 x = 1
......
...@@ -4,12 +4,6 @@ ...@@ -4,12 +4,6 @@
# The logic beyond this error message is oddly complicated. # The logic beyond this error message is oddly complicated.
try:
import __pyston__
__pyston__.setOption("LAZY_SCOPING_ANALYSIS", 0)
except ImportError:
pass
cases = [ cases = [
# protip: delete this first """ to get your editor to syntax-highlight the code # protip: delete this first """ to get your editor to syntax-highlight the code
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment