Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: NonConstant
Changeset: r69041:d1fc613a6520
Date: 2014-02-01 17:27 +0000
http://bitbucket.org/pypy/pypy/changeset/d1fc613a6520/

Log:    Simply use not_const() to annotate NonConstant

diff --git a/rpython/rlib/nonconst.py b/rpython/rlib/nonconst.py
--- a/rpython/rlib/nonconst.py
+++ b/rpython/rlib/nonconst.py
@@ -4,6 +4,7 @@
 
 from rpython.rtyper.extregistry import ExtRegistryEntry
 from rpython.flowspace.model import Constant
+from rpython.annotator.model import not_const
 
 class NonConstant(object):
     def __init__(self, _constant):
@@ -33,11 +34,8 @@
 class EntryNonConstant(ExtRegistryEntry):
     _about_ = NonConstant
 
-    def compute_result_annotation(self, arg):
-        if hasattr(arg, 'const'):
-            return self.bookkeeper.immutablevalue(arg.const, False)
-        else:
-            return arg
+    def compute_result_annotation(self, s_arg):
+        return not_const(s_arg)
 
     def specialize_call(self, hop):
         hop.exception_cannot_occur()
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to