973130 - js::ActivationIterator::settle contains extraneous code

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Jim Blandy :jimb]

Attachment: Remove extraneous code from ActivationIterator::settle.

The 'if' condition in this function can never be true, because it's negated
in the immediately preceding 'while' condition.

Comment 1

[Hannes Verschore [:h4writer]]

Good catch! Now the patch itself is obvious r+, but I want to investigate this further. So I'll leave this review flag for myself. I want to convince myself the code (before and after this patch) is correct. I will try to do that on Wednesday.

Comment 2

[Hannes Verschore [:h4writer]]

Comment on attachment 8376632 [details] [diff] [review]
Remove extraneous code from ActivationIterator::settle.

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

Thanks! That is correct.

::: js/src/vm/Stack.cpp
@@ +1361,5 @@
>  }
>  
>  void
>  ActivationIterator::settle()
>  {

// Stop at the next active activation.
// No need to update jitTop_, since we don't iterate over an active jit activation.

Can you add the following comment?

Comment 3

[Jim Blandy :jimb]

(In reply to Hannes Verschore [:h4writer] from comment #2)
> Can you add the following comment?

Added.

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

Comment 4

[Carsten Book [:Tomcat]]

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