the last HASH functions that are used are now guarded.

MoarVM · Apr 8, 2014 · 58a2806 · 58a2806
1 parent 846d59e
commit 58a2806
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/src/6model/reprs/MVMContext.c b/src/6model/reprs/MVMContext.c
@@ -43,11 +43,13 @@ static void at_key(MVMThreadContext *tc, MVMSTable *st, MVMObject *root, void *d
     MVMContextBody *body  = (MVMContextBody *)data;
     MVMFrame       *frame = body->context;
     MVMLexicalRegistry *lexical_names = frame->static_info->body.lexical_names, *entry;
+    int jen_hash_pad_to_32;
     if (!lexical_names) {
        MVM_exception_throw_adhoc(tc,
             "Lexical with name '%s' does not exist in this frame",
                 MVM_string_utf8_encode_C_string(tc, name));
     }
+    jen_hash_pad_to_32 = (name->body.flags & MVM_STRING_TYPE_MASK) == MVM_STRING_TYPE_UINT8;
     MVM_HASH_GET(tc, lexical_names, name, entry);
     if (!entry) {
        MVM_exception_throw_adhoc(tc,
@@ -67,11 +69,13 @@ static void bind_key(MVMThreadContext *tc, MVMSTable *st, MVMObject *root, void
     MVMContextBody *body  = (MVMContextBody *)data;
     MVMFrame       *frame = body->context;
     MVMLexicalRegistry *lexical_names = frame->static_info->body.lexical_names, *entry;
+    int jen_hash_pad_to_32;
     if (!lexical_names) {
        MVM_exception_throw_adhoc(tc,
             "Lexical with name '%s' does not exist in this frame",
                 MVM_string_utf8_encode_C_string(tc, name));
     }
+    jen_hash_pad_to_32 = (name->body.flags & MVM_STRING_TYPE_MASK) == MVM_STRING_TYPE_UINT8;
     MVM_HASH_GET(tc, lexical_names, name, entry);
     if (!entry) {
        MVM_exception_throw_adhoc(tc,
@@ -96,8 +100,10 @@ static MVMint64 exists_key(MVMThreadContext *tc, MVMSTable *st, MVMObject *root,
     MVMFrame *frame = body->context;
     MVMLexicalRegistry *lexical_names = frame->static_info->body.lexical_names, *entry;
     MVMString *name = (MVMString *)key;
+    int jen_hash_pad_to_32;
     if (!lexical_names)
         return 0;
+    jen_hash_pad_to_32 = (name->body.flags & MVM_STRING_TYPE_MASK) == MVM_STRING_TYPE_UINT8;
     MVM_HASH_GET(tc, lexical_names, name, entry);
     return entry ? 1 : 0;
 }

diff --git a/src/6model/sc.c b/src/6model/sc.c
@@ -6,6 +6,7 @@
 MVMObject * MVM_sc_create(MVMThreadContext *tc, MVMString *handle) {
     MVMSerializationContext     *sc;
     MVMSerializationContextBody *scb;
+    int jen_hash_pad_to_32;
 
     /* Allocate. */
     MVMROOT(tc, handle, {
@@ -14,6 +15,7 @@ MVMObject * MVM_sc_create(MVMThreadContext *tc, MVMString *handle) {
             /* Add to weak lookup hash. */
             uv_mutex_lock(&tc->instance->mutex_sc_weakhash);
             MVM_string_flatten(tc, handle);
+            jen_hash_pad_to_32 = (handle->body.flags & MVM_STRING_TYPE_MASK) == MVM_STRING_TYPE_UINT8;
             MVM_HASH_GET(tc, tc->instance->sc_weakhash, handle, scb);
             if (!scb) {
                 sc->body = scb = calloc(1, sizeof(MVMSerializationContextBody));
@@ -236,7 +238,9 @@ MVMObject * MVM_sc_get_code(MVMThreadContext *tc, MVMSerializationContext *sc, M
 /* Resolves an SC handle using the SC weakhash. */
 MVMSerializationContext * MVM_sc_find_by_handle(MVMThreadContext *tc, MVMString *handle) {
     MVMSerializationContextBody *scb;
+    int jen_hash_pad_to_32;
     MVM_string_flatten(tc, handle);
+    jen_hash_pad_to_32 = (handle->body.flags & MVM_STRING_TYPE_MASK) == MVM_STRING_TYPE_UINT8;
     uv_mutex_lock(&tc->instance->mutex_sc_weakhash);
     MVM_HASH_GET(tc, tc->instance->sc_weakhash, handle, scb);
     uv_mutex_unlock(&tc->instance->mutex_sc_weakhash);

diff --git a/src/mast/compiler.c b/src/mast/compiler.c
@@ -526,6 +526,7 @@ unsigned short get_callsite_id(VM, WriterState *ws, MASTNode *flags) {
     unsigned short i;
     CallsiteReuseEntry *entry = NULL;
     unsigned char *identifier = (unsigned char *)malloc(elems);
+    int jen_hash_pad_to_32 = 0;
 
     for (i = 0; i < elems; i++)
         identifier[i] = (unsigned char)ATPOS_I_C(vm, flags, i);

diff --git a/tools/ucd2c.pl b/tools/ucd2c.pl
@@ -868,6 +868,7 @@ sub emit_names_hash_builder {
             case $FATE_NORMAL: {
                 MVMint32 extent_span_index = 0;
                 codepoint_table_index = codepoint_extents[extent_index][2];
+                int jen_hash_pad_to_32 = 0;
                 for (; extent_span_index < length
                     && codepoint_table_index < MVMCODEPOINTNAMESCOUNT; extent_span_index++) {
                     const char *name = codepoint_names[codepoint_table_index];
@@ -887,6 +888,7 @@ sub emit_names_hash_builder {
                 break;
             case $FATE_SPAN: {
                 const char *name = codepoint_names[codepoint_table_index];
+                int jen_hash_pad_to_32 = 0;
                 if (name) {
                     MVMUnicodeNameRegistry *entry = malloc(sizeof(MVMUnicodeNameRegistry));
                     entry->name = (char *)name;