pike.git/ src/ mapping.c

2014-12-04

2014-12-04 19:23:02 by 0

• e2891ac6040a10bdcddffb15e7117ac36a1be992 (3 lines) (+2/-1) ^{[ Show | Annotate ]}
  Branch: bill/master_archive_support

Fix overoptimization introduced in a2bcc741ff6 where two empty mappings could
be considered different in some cases (observed in the JSON testsuite).

122:   }      static INLINE int check_type_overlaps(TYPE_FIELD t1, TYPE_FIELD t2) { -  return t1 & t2 || (t1|t2) & BIT_OBJECT; +  return (!t1 && !t2) || t1 & t2 || (t1|t2) & BIT_OBJECT;   }      #ifdef PIKE_DEBUG