[pypy-svn] r67439 - pypy/branch/adtmembers-fun/pypy/rpython/lltypesystem

[arigo at codespeak.net]

Author: arigo
Date: Thu Sep  3 11:32:17 2009
New Revision: 67439

Modified:
   pypy/branch/adtmembers-fun/pypy/rpython/lltypesystem/rdict.py
Log:
Now this should work.


Modified: pypy/branch/adtmembers-fun/pypy/rpython/lltypesystem/rdict.py
==============================================================================
--- pypy/branch/adtmembers-fun/pypy/rpython/lltypesystem/rdict.py	(original)
+++ pypy/branch/adtmembers-fun/pypy/rpython/lltypesystem/rdict.py	Thu Sep  3 11:32:17 2009
@@ -507,7 +507,6 @@
 PERTURB_SHIFT = 5
 
 def ll_dict_lookup(d, key, hash):
-    DICT = lltype.typeOf(d).TO
     entries = d.entries
     mask = len(entries) - 1
     i = hash & mask
@@ -520,7 +519,7 @@
             # correct hash, maybe the key is e.g. a different pointer to
             # an equal object
             found = d.keyeq(checkingkey, key)
-            if DICT.paranoia:
+            if d.paranoia:
                 if (entries != d.entries or
                     not entries.valid(i) or entries[i].key != checkingkey):
                     # the compare did major nasty stuff to the dict: start over
@@ -555,7 +554,7 @@
                 # correct hash, maybe the key is e.g. a different pointer to
                 # an equal object
                 found = d.keyeq(checkingkey, key)
-                if DICT.paranoia:
+                if d.paranoia:
                     if (entries != d.entries or
                         not entries.valid(i) or entries[i].key != checkingkey):
                         # the compare did major nasty stuff to the dict: