Attachment #360206: JS_GetTrapOpcode for these. for bug #463239

View | Details | Raw Unified | Return to bug 463239
Collapse All | Expand All

(-)a/js/src/jsinterp.cpp (-2 / +2 lines)
Line     Link Here 
 Lines 189-195   js_FillPropertyCache(JSContext *cx, JSOb Link Here 
189
     * Optimize the cached vword based on our parameters and the current pc's
189
     * Optimize the cached vword based on our parameters and the current pc's
190
     * opcode format flags.
190
     * opcode format flags.
191
     */
191
     */
192
    op = (JSOp) *pc;
192
    op = JS_GetTrapOpcode(cx, cx->fp->script, pc);
193
    cs = &js_CodeSpec[op];
193
    cs = &js_CodeSpec[op];
194
194
195
    do {
195
    do {
 Lines 318-324   js_FullTestPropertyCache(JSContext *cx, Link Here 
318
    JS_ASSERT(uintN((cx->fp->imacpc ? cx->fp->imacpc : pc) - cx->fp->script->code)
318
    JS_ASSERT(uintN((cx->fp->imacpc ? cx->fp->imacpc : pc) - cx->fp->script->code)
319
              < cx->fp->script->length);
319
              < cx->fp->script->length);
320
320
321
    op = (JSOp) *pc;
321
    op = JS_GetTrapOpcode(cx, cx->fp->script, pc);
322
    cs = &js_CodeSpec[op];
322
    cs = &js_CodeSpec[op];
323
    if (op == JSOP_LENGTH) {
323
    if (op == JSOP_LENGTH) {
324
        atom = cx->runtime->atomState.lengthAtom;
324
        atom = cx->runtime->atomState.lengthAtom;

Return to bug 463239