aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuele Pedroni <pedronis@lucediurna.net>2007-03-20 13:56:05 +0000
committerSamuele Pedroni <pedronis@lucediurna.net>2007-03-20 13:56:05 +0000
commit1f0f5cd1c4b7841c871a54cc1f8dcad34c1deffa (patch)
treee1d13dd032922b7116ae5d47d071dd1df2a8bd41
parentfix rest (diff)
downloadpypy-1f0f5cd1c4b7841c871a54cc1f8dcad34c1deffa.tar.gz
pypy-1f0f5cd1c4b7841c871a54cc1f8dcad34c1deffa.tar.bz2
pypy-1f0f5cd1c4b7841c871a54cc1f8dcad34c1deffa.zip
(arre, pedronis) saner (?) and caching invariant way to skip geninterped graphs when timeshifting.
-rw-r--r--pypy/module/pypyjit/portal.py2
-rw-r--r--pypy/translator/geninterplevel.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/pypy/module/pypyjit/portal.py b/pypy/module/pypyjit/portal.py
index 8cee849111..159d59e620 100644
--- a/pypy/module/pypyjit/portal.py
+++ b/pypy/module/pypyjit/portal.py
@@ -20,7 +20,7 @@ class PyPyHintAnnotatorPolicy(HintAnnotatorPolicy):
mod = func.__module__ or '?'
if mod.startswith('pypy.objspace'):
return False
- if mod.startswith('pypy._cache'):
+ if '_geninterp_' in func.func_globals # skip all geninterped stuff
return False
if mod.startswith('pypy.interpreter.astcompiler'):
return False
diff --git a/pypy/translator/geninterplevel.py b/pypy/translator/geninterplevel.py
index e8348e1cd7..42668a327a 100644
--- a/pypy/translator/geninterplevel.py
+++ b/pypy/translator/geninterplevel.py
@@ -72,7 +72,7 @@ from pypy.tool.ansi_print import ansi_log
log = py.log.Producer("geninterp")
py.log.setconsumer("geninterp", ansi_log)
-GI_VERSION = '1.1.22' # bump this for substantial changes
+GI_VERSION = '1.1.23' # bump this for substantial changes
# ____________________________________________________________
try:
@@ -1399,6 +1399,8 @@ else:
RPY_SEP = "#*************************************************************"
RPY_INIT_HEADER = RPY_SEP + '''
+#__name__ = %(modname)r
+_geninterp_ = True
def init%(modname)s(space):
"""NOT_RPYTHON"""