Mark the simulate before EnterInlined with BailoutId::None(), and set ReturnId on EnterInlined. Whe…

Mark the simulate before EnterInlined with BailoutId::None(), and set ReturnId on EnterInlined. When merging simulates into the simulate before enter-inlined, adopt the last AST id that gets merged into it.

BUG=v8:3282
LOG=n
R=titzer@chromium.org

Committed: https://code.google.com/p/v8/source/detail?r=20949

[Toon Verwaest, 2014-04-24 13:51:00]

PTAL

[titzer, 2014-04-24 14:34:11]

https://codereview.chromium.org/257583004/diff/40001/src/hydrogen-instruction...
File src/hydrogen-instructions.cc (right):

https://codereview.chromium.org/257583004/diff/40001/src/hydrogen-instruction...
src/hydrogen-instructions.cc:2598: if (!list->is_empty() && !HasAstId()) {
Do we still need the !HasAstId() check now?

https://codereview.chromium.org/257583004/diff/40001/src/hydrogen-instruction...
src/hydrogen-instructions.cc:4510: ASSERT(HasAstId() ||
next()->IsEnterInlined());
Yay

[Toon Verwaest, 2014-04-24 15:06:35]

https://codereview.chromium.org/257583004/diff/40001/src/hydrogen-instruction...
File src/hydrogen-instructions.cc (right):

https://codereview.chromium.org/257583004/diff/40001/src/hydrogen-instruction...
src/hydrogen-instructions.cc:2598: if (!list->is_empty() && !HasAstId()) {
Yes, this is used to merge the simulate of the last argument evaluation (or
method loading I suppose) into the simulate before EnterInlined that now has
BailoutId::None(). If this happens, we replace BailoutId::None() with the ast_id
of the last simulate. 

On 2014/04/24 14:34:11, titzer wrote:
> Do we still need the !HasAstId() check now?

[titzer, 2014-04-24 15:08:37]

lgtm

[Toon Verwaest, 2014-04-24 15:21:04]

Committed patchset #4 manually as r20949 (presubmit successful).