[pypy-commit] pypy NonConstant: kill bk.immutableconstant()

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: NonConstant
Changeset: r69147:7c11617bfff3
Date: 2014-02-15 14:20 +0000
http://bitbucket.org/pypy/pypy/changeset/7c11617bfff3/

Log:	kill bk.immutableconstant()

diff --git a/rpython/annotator/annrpython.py b/rpython/annotator/annrpython.py
--- a/rpython/annotator/annrpython.py
+++ b/rpython/annotator/annrpython.py
@@ -236,9 +236,7 @@
                 else:
                     raise
         elif isinstance(arg, Constant):
-            #if arg.value is undefined_value:   # undefined local variables
-            #    return annmodel.s_ImpossibleValue
-            return self.bookkeeper.immutableconstant(arg)
+            return self.bookkeeper.immutablevalue(arg.value)
         else:
             raise TypeError('Variable or Constant expected, got %r' % (arg,))
 
diff --git a/rpython/annotator/bookkeeper.py b/rpython/annotator/bookkeeper.py
--- a/rpython/annotator/bookkeeper.py
+++ b/rpython/annotator/bookkeeper.py
@@ -202,9 +202,6 @@
         position."""
         return SomeDict(self.getdictdef())
 
-    def immutableconstant(self, const):
-        return self.immutablevalue(const.value)
-
     def immutablevalue(self, x):
         """The most precise SomeValue instance that contains the
         immutable value x."""