Temporarily switch to deteministic interning keys

shiquanwang · Apr 15, 2013 · 898cb05 · 898cb05
1 parent 1134e56
commit 898cb05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/deps/pyextensibletype/extensibletype/methodtable.pyx b/deps/pyextensibletype/extensibletype/methodtable.pyx
@@ -142,6 +142,7 @@ cdef class PerfectHashMethodTable(object):
         """
         cdef uint64_t prehash = intern.global_intern(make_bytes(signature))
 
+        assert 0 <= self.displacements[prehash & self.table.m_g] < self.table.b
         cdef uint64_t idx = (((prehash >> self.table.r) & self.table.m_f) ^
                              self.displacements[prehash & self.table.m_g])
 

diff --git a/deps/pyextensibletype/include/interning.h b/deps/pyextensibletype/include/interning.h
@@ -75,6 +75,11 @@ intern_create_table(intern_table_t *table)
         table->secrets[i + 0] = ((char *) &randval)[0];
         table->secrets[i + 1] = ((char *) &randval)[1];
     }
+    /* Amend this! */
+    memset(&table->secrets[16*0], 0, 16);
+    memset(&table->secrets[16*1], 1, 16);
+    memset(&table->secrets[16*2], 2, 16);
+    memset(&table->secrets[16*3], 3, 16);
 
     /* _print_secrets(table); */
 

diff --git a/numba/exttypes/virtual.py b/numba/exttypes/virtual.py
@@ -121,7 +121,7 @@ def wrap_vtable(self, vtable):
     ('r', uint8),
     ('reserved', uint8),
     # actually: uint16[b], 'b' trailing displacements
-    ('d', minitypes.CArrayType(uint16, 0)), #0xffff)),
+    # ('d', minitypes.CArrayType(uint16, 0)), #0xffff)),
     # ('entries_mem', PyCustomSlot_Entry[n]), # 'n' trailing customslot entries
 ])