[pypy-commit] pypy unroll-if-alt: merged upstream.

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: unroll-if-alt
Changeset: r46173:9aa08c348faa
Date: 2011-08-01 15:00 -0700
http://bitbucket.org/pypy/pypy/changeset/9aa08c348faa/

Log:	merged upstream.

diff --git a/pypy/annotation/specialize.py b/pypy/annotation/specialize.py
--- a/pypy/annotation/specialize.py
+++ b/pypy/annotation/specialize.py
@@ -372,4 +372,5 @@
     return maybe_star_args(funcdesc, key, args_s)
 
 def specialize_call_location(funcdesc, args_s, op):
+    assert op is not None
     return maybe_star_args(funcdesc, op, args_s)