pike.git / src / docode.c

version» Context lines:

pike.git/src/docode.c:922:    /* FIXME: Support inlining for the parent case.    *    * do_call_external(n->u.integer.a, f + inh->identifier_level,    * NULL);    */    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)) { +  (id->func.const_info.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.    */    struct svalue *s = &state->new_program-> -  constants[id->func.offset].sval; +  constants[id->func.const_info.offset].sval;    if (s->type == T_PROGRAM &&    s->u.program->flags & PROGRAM_USES_PARENT) {    /* An external reference is required. */    emit2(F_EXTERNAL, n->u.integer.b, level);    } else {    int tmp1 = store_constant(s, 1, NULL);    emit1(F_CONSTANT, tmp1);    }    } else {    emit2(F_EXTERNAL, n->u.integer.b, level);
pike.git/src/docode.c:952:    emit1(F_THIS_OBJECT, 0);    } else 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 if (IDENTIFIER_IS_CONSTANT(id->identifier_flags) &&    (ref->id_flags & ID_INLINE) && !ref->inherit_offset && -  (id->func.offset >= 0)) { +  (id->func.const_info.offset >= 0)) {    /* An inline, local or final constant identifier.    * No need for vtable traversal during runtime.    */    struct svalue *s = &state->new_program-> -  constants[id->func.offset].sval; +  constants[id->func.const_info.offset].sval;    if (s->type == T_PROGRAM &&    s->u.program->flags & PROGRAM_USES_PARENT) {    /* Program using parent. Convert to an LFUN. */    emit1(F_LFUN, n->u.integer.b);    } else { -  emit1(F_CONSTANT, id->func.offset); +  emit1(F_CONSTANT, id->func.const_info.offset);    }    }else{    emit1(F_GLOBAL, n->u.integer.b);    }    }    }    return 1;       case F_THIS:    {