[pypy-svn] r35388 - pypy/branch/jit-real-world/pypy/rpython

[arigo at codespeak.net]

Author: arigo
Date: Wed Dec  6 13:40:49 2006
New Revision: 35388

Modified:
   pypy/branch/jit-real-world/pypy/rpython/rtyper.py
Log:
svn merge -r 35361:35387 http://codespeak.net/svn/pypy/dist/pypy/rpython/rtyper.py rpython/


Modified: pypy/branch/jit-real-world/pypy/rpython/rtyper.py
==============================================================================
--- pypy/branch/jit-real-world/pypy/rpython/rtyper.py	(original)
+++ pypy/branch/jit-real-world/pypy/rpython/rtyper.py	Wed Dec  6 13:40:49 2006
@@ -717,8 +717,6 @@
         return vars
 
     def genop(self, opname, args_v, resulttype=None):
-        assert args_v is not self.args_v, ("Wrong level! "
-            "You need to pass the result of hop.inputargs() to genop().")
         return self.llops.genop(opname, args_v, resulttype)
 
     def gendirectcall(self, ll_function, *args_v):
@@ -829,6 +827,13 @@
         return v
 
     def genop(self, opname, args_v, resulttype=None):
+        try:
+            for v in args_v:
+                v.concretetype
+        except AttributeError:
+            raise AssertionError("wrong level!  you must call hop.inputargs()"
+                                 " and pass its result to genop(),"
+                                 " never hop.args_v directly.")
         vresult = Variable()
         self.append(SpaceOperation(opname, args_v, vresult))
         if resulttype is None: