pike.git/ src/ docode.c

2010-07-01

2010-07-01 17:23:51 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 83128f06233c851f8796a850eb5cf6e9a9ca237d (27 lines) (+24/-3) ^{[ Show | Annotate ]}
  Branch: 7.9

Implemented optimization suggested by Per.
Constants declared inline are now actually inlined in the basic case.

Rev: src/docode.c:1.207

2:   || This file is part of Pike. For copyright information see COPYRIGHT.   || Pike is distributed under GPL, LGPL and MPL. See the file COPYING   || for more information. - || $Id: docode.c,v 1.206 2009/11/20 10:58:09 grubba Exp $ + || $Id: docode.c,v 1.207 2010/07/01 17:23:51 grubba Exp $   */      #include "global.h"
921:    emit2(F_EXTERNAL, n->u.integer.b, level);    }    } else if (level) { +  if (IDENTIFIER_IS_CONSTANT(id->identifier_flags) && +  (ref->id_flags & ID_INLINE) && !ref->inherit_offset && +  (id->func.offset >= 0)) { +  /* An inline, local or final constant identifier in +  * a lexically surrounding (aka parent) class. +  * Avoid vtable traversal during runtime by moving +  * the constant to this class. +  */ +  int tmp1 = store_constant(&state->new_program-> +  constants[id->func.offset].sval, +  1, NULL); +  emit1(F_CONSTANT, tmp1); +  } else {    emit2(F_EXTERNAL, n->u.integer.b, level); -  +  }    } else if (n->u.integer.b == IDREF_MAGIC_THIS) {    emit1(F_THIS_OBJECT, 0);    } else if(IDENTIFIER_IS_FUNCTION(id->identifier_flags) &&
931:    * can't zero, i.e. when we know the function isn't just a    * prototype. */    emit1(F_LFUN, n->u.integer.b); +  } else if (IDENTIFIER_IS_CONSTANT(id->identifier_flags) && +  (ref->id_flags & ID_INLINE) && !ref->inherit_offset && +  (id->func.offset >= 0)) { +  /* An inline, local or final constant identifier. +  * No need for vtable traversal during runtime. +  */ +  emit1(F_CONSTANT, id->func.offset);    }else{    emit1(F_GLOBAL, n->u.integer.b);    }
998:    int adroppings , bdroppings;    current_switch.jumptable=0;    -  +     if(!CDDR(n))    {    tmp1=alloc_label();