pike.git/ src/ program.c

2013-12-12

2013-12-12 16:49:47 by Henrik Grubbström (Grubba) <grubba@grubba.org>

• 2ad81fd7e8f9e9e66f65bf9138aeab87206b0e00 (5 lines) (+5/-0) ^{[ Show | Annotate ]}
  Branch: 8.0

Compiler: Migrate OPT_* flags to the variant dispatcher.

Variant dispatchers need to have the same set of OPT_* flags
as the functions they dispatch to, to avoid over optimization.

Fixes [Pike Mailinglist 13786]/[LysLysKOM 20594561].

3930:    struct pike_string *name;    struct pike_type *type;    int id_flags; +  int opt_flags;    int j;    if (prog->identifier_references[e].inherit_offset) continue;    if (!is_variant_dispatcher(prog, e)) continue;
3939:    name = id->name;    type = NULL;    id_flags = 0; +  opt_flags = 0;       CDFPRINTF((stderr, "Collecting variants of \"%s\"...\n", name->str));   
3949:    struct reference *ref = prog->identifier_references + j;    id = ID_FROM_INT(prog, j);    id_flags |= ref->id_flags; +  opt_flags |= id->opt_flags;    /* NB: The dispatcher needs the variant references to    * not get overloaded for the ::-operator to work.    */
3973:    id = ID_FROM_INT(prog, e);    free_type(id->type);    id->type = type; +  id->opt_flags = opt_flags;    prog->identifier_references->id_flags |= id_flags & ~(ID_VARIANT|ID_LOCAL);    next_ref:    ;