875912 - Unnecessary or with 0 in IonMacroAssembler.cpp

Status: RESOLVED FIXED

(Core :: JavaScript Engine, enhancement)

Description

[Dan Gohman [:sunfish]]

MacroAssembler::performOsr bitwise-ors the value of CalleeToken_Function into the calleeToken register, however, the value is zero, so this is a no-op.

Comment 1

[Dan Gohman [:sunfish]]

Attachment: a proposed fix

Comment 2

[Nicolas B. Pierron [:nbp]]

Comment on attachment 753930 [details] [diff] [review]
a proposed fix

Review of attachment 753930 [details] [diff] [review]:
-----------------------------------------------------------------

I think you meant to type ":dvander" in the review field?

::: js/src/ion/IonMacroAssembler.cpp
@@ +691,5 @@
>      {
>          // Function - create the callee token, then get the script.
> +
> +        // Skip the or here since CalleeToken_Function is zero.
> +        JS_ASSERT(CalleeToken_Function == 0);

nit: You can get rid of the comment, the assertion is clear enough.

@@ +692,5 @@
>          // Function - create the callee token, then get the script.
> +
> +        // Skip the or here since CalleeToken_Function is zero.
> +        JS_ASSERT(CalleeToken_Function == 0);
> +        //orPtr(Imm32(CalleeToken_Function), calleeToken);

nit: add a space between // and orPtr.

Comment 3

[Dan Gohman [:sunfish]]

Attachment: an updated patch

Updated per nbp's comments.

Comment 4

[Dan Gohman [:sunfish]]

dvander, ping?

Comment 5

[David Anderson [:dvander] - inactive, e-mail if emergency]

Comment on attachment 753969 [details] [diff] [review]
an updated patch

Review of attachment 753969 [details] [diff] [review]:
-----------------------------------------------------------------

::: js/src/ion/IonMacroAssembler.cpp
@@ +692,5 @@
>          // Function - create the callee token, then get the script.
> +
> +        JS_ASSERT(CalleeToken_Function == 0);
> +        // orPtr(Imm32(CalleeToken_Function), calleeToken);
> +

nit: you can remove the line, no need to comment it out

Comment 6

[Dan Gohman [:sunfish]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/ef21d8d6f037

Comment 7

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/ef21d8d6f037