855807 - When a parallel bailout occurs, don't invalidate innermost inlined script but rather inliner

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Niko Matsakis [:nmatsakis]]

The current code registers the innermost inlined script as the "aborted" script on a bailout.  But when we go to invalidate the aborted script, we then encounter assertion failures because the inlined script does not have any parallel IonScript associated with.  We instead want to register the "inliner" as the aborted script.

Comment 1

[Niko Matsakis [:nmatsakis]]

Attachment: Take aborted script from entry block, not current

Comment 2

[Shu-yu Guo [:shu]]

Comment on attachment 730813 [details] [diff] [review]
Take aborted script from entry block, not current

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

::: js/src/ion/ParallelFunctions.cpp
@@ +208,5 @@
>      ForkJoinSlice *slice = ForkJoinSlice::Current();
>  
> +    Spew(SpewBailouts, "Parallel abort in %p:%s:%d (%d)",
> +         script, script->filename(), script->lineno,
> +         script->hasParallelIonScript());

It's just internal spew, but I'd prefer something more obvious than (%d) for a bool, because I'm probably going to forget what it means.

::: js/src/vm/ParallelDo.cpp
@@ +614,5 @@
>          JS_ASSERT(ok == !slice.abortedScript);
>          if (!ok) {
>              JSScript *script = slice.abortedScript;
> +            Spew(SpewBailouts, "Aborted script: %p (%d)",
> +                 script, script->hasParallelIonScript());

Ditto.

Comment 3

[Niko Matsakis [:nmatsakis]]

Attachment: Take aborted script from entry block, not current

Comment 4

[Niko Matsakis [:nmatsakis]]

I was not able to devise a good test for this failure other than manually clicking around the interactive mandelbrot, so I will simply commit the patch.

Comment 5

[Niko Matsakis [:nmatsakis]]

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

Comment 6

[[Back August 16] Ryan VanderMeulen]

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