457789 - TM: add a resume point to JSOP_CALL

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Comment 1

[Andreas Gal :gal]

Attachment: patch

Comment 2

[Andreas Gal :gal]

Attachment: v2

Comment 3

[Blake Kaplan (:mrbkap) (inactive)]

Comment on attachment 341034 [details] [diff] [review]
v2

Andreas argues (correctly I think) that this won't affect interpreter performance in the slightest.

Comment 4

[Brendan Eich [:brendan]]

Comment on attachment 341034 [details] [diff] [review]
v2

>diff --git a/js/src/jsemit.cpp b/js/src/jsemit.cpp
>--- a/js/src/jsemit.cpp
>+++ b/js/src/jsemit.cpp
>@@ -5891,18 +5891,28 @@ js_EmitTree(JSContext *cx, JSCodeGenerat
>         }
>         cg->treeContext.flags |= oldflags & TCF_IN_FOR_INIT;
>         if (js_NewSrcNote2(cx, cg, SRC_PCBASE, CG_OFFSET(cg) - off) < 0)
>             return JS_FALSE;
> 
>         argc = pn->pn_count - 1;
>         if (js_Emit3(cx, cg, PN_OP(pn), ARGC_HI(argc), ARGC_LO(argc)) < 0)
>             return JS_FALSE;
>-        if (PN_OP(pn) == JSOP_EVAL)
>+        switch (PN_OP(pn)) {
>+          case JSOP_EVAL:
>+              if (js_Emit1(cx, cg, JSOP_RESUME) < 0)
>+                  return JS_FALSE;

Indentation is off here, and below.

>             EMIT_UINT16_IMM_OP(JSOP_LINENO, pn->pn_pos.begin.lineno);
>+            break;
>+          case JSOP_CALL:
>+              if (js_Emit1(cx, cg, JSOP_RESUME) < 0)
>+                  return JS_FALSE;
>+            break;
>+          default:;

Use an if (PN_OP(pn) == JSOP_EVAL) {...} else {...} instead of switch, and JS_ASSERT(PN_OP(pn) == JSOP_CALL); first thing in the else clause.

Please fix before committing.

/be

Comment 5

[Andreas Gal :gal]

Attachment: follow up work, emit JSOP_RESUME after JSOP_NEW

Comment 6

[Andreas Gal :gal]

Attachment: v2

Comment 7

[Andreas Gal :gal]

http://hg.mozilla.org/tracemonkey/rev/3c899d350d7f

http://hg.mozilla.org/tracemonkey/rev/ac2826ba4ddb

http://hg.mozilla.org/tracemonkey/rev/a6174009247f