[pypy-commit] pypy default: Rare ordering issue

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: 
Changeset: r69127:ba1bf5e55066
Date: 2014-02-13 17:31 +0100
http://bitbucket.org/pypy/pypy/changeset/ba1bf5e55066/

Log:	Rare ordering issue

diff --git a/rpython/rlib/objectmodel.py b/rpython/rlib/objectmodel.py
--- a/rpython/rlib/objectmodel.py
+++ b/rpython/rlib/objectmodel.py
@@ -366,6 +366,9 @@
 
     def compute_result_annotation(self, s_l, s_sizehint):
         from rpython.annotator import model as annmodel
+        if annmodel.s_None.contains(s_l):
+            return   # first argument is only None so far, but we
+                     # expect a generalization later
         if not isinstance(s_l, annmodel.SomeList):
             raise annmodel.AnnotatorError("First argument must be a list")
         if not isinstance(s_sizehint, annmodel.SomeInteger):