Author: Maciej Fijalkowski <[email protected]>
Branch: array-overallocation-in-nursery
Changeset: r67507:e3e1ca30e322
Date: 2013-10-22 13:25 +0200
http://bitbucket.org/pypy/pypy/changeset/e3e1ca30e322/

Log:    fix the array_type_match

diff --git a/rpython/rtyper/lltypesystem/llmemory.py 
b/rpython/rtyper/lltypesystem/llmemory.py
--- a/rpython/rtyper/lltypesystem/llmemory.py
+++ b/rpython/rtyper/lltypesystem/llmemory.py
@@ -593,7 +593,8 @@
     return A1 == A2 or (A2 == GCARRAY_OF_PTR and
                         isinstance(A1, lltype.GcArray) and
                         isinstance(A1.OF, lltype.Ptr) and
-                        not A1._hints.get('nolength'))
+                        not A1._hints.get('nolength') and
+        not A1._hints.get('overallocated'))
 def array_item_type_match(T1, T2):
     return T1 == T2 or (T2 == GCREF and isinstance(T1, lltype.Ptr))
 
@@ -911,7 +912,7 @@
         assert isinstance(s_from, SomeAddress)
         assert isinstance(s_to, SomeAddress)
         assert isinstance(s_size, SomeInteger)
-    
+
     def specialize_call(self, hop):
         hop.exception_cannot_occur()
         v_list = hop.inputargs(Address, Address, lltype.Signed)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to