pike.git/ src/ array.c

2015-03-23

2015-03-23 20:05:18 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 7d260b7099469778113d458fccd765b7e5218a80 (17 lines) (+12/-5) ^{[ Show | Annotate ]}
  Branch: 8.0

Runtime: Fixed over optimization in F_APPEND_ARRAY.

Setters expect to be called when the corresponding variable is modified...

This behaviour caused Roxen's test-suite to fail due to change triggers
not being called.

448:   {    struct svalue *lval = Pike_sp - args;    struct svalue *val = lval + 2; +  int lval_type;   #ifdef PIKE_DEBUG    if (args < 3) {    Pike_fatal("Too few arguments to o_append_array(): %d\n", args);
455:   #endif    args -= 3;    /* Note: val should always be a zero here! */ -  lvalue_to_svalue_no_free(val, lval); +  lval_type = lvalue_to_svalue_no_free(val, lval);       if (TYPEOF(*val) == T_ARRAY) {    struct svalue tmp;
464:    element and do not do the assign. This can be done because the    lvalue already has the array as it's value.    */ -  if( v->refs == 2 ) -  { -  if( v->real_item+v->malloced_size >= v->item+v->size+args ) -  { +  if( (v->refs == 2) && (lval_type != PIKE_T_GET_SET) ) { +  if ((TYPEOF(*lval) == T_OBJECT) && +  lval->u.object->prog && +  ((FIND_LFUN(lval->u.object->prog, LFUN_ASSIGN_INDEX) >= 0) || +  (FIND_LFUN(lval->u.object->prog, LFUN_ASSIGN_ARROW) >= 0))) { +  /* There's a function controlling assignments in this object, +  * so we can't alter the array in place. +  */ +  } else if( v->real_item+v->malloced_size >= v->item+v->size+args ) {    struct svalue *from = val+1;    int i;    for( i = 0; i<args; i++,from++ )