pike.git/ src/ mapping.c

2016-10-25

2016-10-25 13:51:52 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 353ba1704789cfcccfaf570fa96a1e32411fa9f8 (7 lines) (+7/-0) ^{[ Show | Annotate ]}
  Branch: 8.1

Mappings: Update the type masks when emptying the mapping.

Fixes testsuite failure where two empty mappings weren't equal()
due to having non-overlapping type masks.

697:    add_ref(nmd); /* For DMALLOC... */    nmd->valrefs=0;    nmd->hardlinks=0; +  nmd->ind_types = md->ind_types; +  nmd->val_types = md->val_types;       /* FIXME: What about nmd->flags? */   
1190:    m->debug_size--;   #endif    +  if (UNLIKELY(!md->size)) { +  md->ind_types = md->val_types = 0; +  } +     if (!(md->flags & MAPPING_FLAG_NO_SHRINK)) {    if((md->size * MIN_LINK_LENGTH_DENOMINATOR <    md->hashsize * MIN_LINK_LENGTH_NUMERATOR) &&