pike.git/ src/ docode.c

2003-02-24

2003-02-24 21:00:45 by Martin Stjernholm <mast@lysator.liu.se>

• 98cf2aeeddf3d35f12e7cd7cb6795f565154f640 (29 lines) (+22/-7) ^{[ Show | Annotate ]}
  Branch: 7.9

Produce real zeroes and not false function pointers when a local function
with only a prototype is referenced. This was a compatibility problem;
there's code that assumes that false values can't be function references.

Rev: src/docode.c:1.163
Rev: src/las.c:1.325
Rev: src/program.c:1.483
Rev: src/program.h:1.178

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.162 2003/01/26 22:10:00 mirar Exp $ + || $Id: docode.c,v 1.163 2003/02/24 21:00:44 mast Exp $   */      #include "global.h" - RCSID("$Id: docode.c,v 1.162 2003/01/26 22:10:00 mirar Exp $"); + RCSID("$Id: docode.c,v 1.163 2003/02/24 21:00:44 mast Exp $");   #include "las.h"   #include "program.h"   #include "pike_types.h"
694:    emit1(F_GLOBAL_LVALUE, n->u.integer.b);    return 2;    }else{ -  if(IDENTIFIER_IS_FUNCTION(ID_FROM_INT(state->new_program,n->u.integer.b)->identifier_flags)) +  struct identifier *id = ID_FROM_INT(state->new_program,n->u.integer.b); +  if(IDENTIFIER_IS_FUNCTION(id->identifier_flags) && +  id->identifier_flags & IDENTIFIER_HAS_BODY)    { -  +  /* Only use this opcode when it's certain that the result +  * can't zero, i.e. when we know the function isn't just a +  * prototype. */    emit1(F_LFUN, n->u.integer.b);    }else{    emit1(F_GLOBAL, n->u.integer.b);
2069:    {    if(n->u.sval.u.object == Pike_compiler->fake_object)    { -  emit1(F_LFUN,n->u.sval.subtype); +  /* When does this occur? /mast */ +  emit1(F_GLOBAL,n->u.sval.subtype);    return 1;    }   
2190:    return 1;    }    -  case F_IDENTIFIER: -  if(IDENTIFIER_IS_FUNCTION(ID_FROM_INT(Pike_compiler->new_program, n->u.id.number)->identifier_flags)) +  case F_IDENTIFIER: { +  struct identifier *id = ID_FROM_INT(Pike_compiler->new_program, n->u.id.number); +  if(IDENTIFIER_IS_FUNCTION(id->identifier_flags))    {    if(flags & WANT_LVALUE)    {    yyerror("Cannot assign functions.\n");    }else{ -  +  if (id->identifier_flags & IDENTIFIER_HAS_BODY) +  /* Only use this opcode when it's certain that the result +  * can't zero, i.e. when we know the function isn't just a +  * prototype. */    emit1(F_LFUN,n->u.id.number); -  +  else +  emit1(F_GLOBAL,n->u.id.number);    }    }else{    if(flags & WANT_LVALUE)
2209:    }    }    return 1; +  }       case F_VAL_LVAL:    return do_docode(CAR(n),flags) +