818231 - BaselineCompiler: Fix masking of ion compiler by baseline compiler.

Status: RESOLVED FIXED

(Core :: JavaScript Engine, defect)

Description

[Kannan Vijayan [:djvj]]

Currently the BaselineCompiler entrypoints are implemented by shortcutting ion::CanEnter and ion::Cannon with calls to ion::CanEnterBaselineJIT and ion::EnterBaselineMethod.

This prevents the ion compiler from executing, and should be fixed.

Comment 1

[Kannan Vijayan [:djvj]]

Attachment: Unmask ion compiler.

Segregates the check for baseline-compilation from the check for ion-compilation, and does the ion-compilation check first.

Baseline-compiled scripts won't yet recompile with Ion yet since we don't update script useCounts from inside baseline, and we don't check for ion compilation from the baseline jitcode, but this patch will allow for ion-compilation of functions called from the interpreter which the baseline compiler cannot compile.

Comment 2

[Jan de Mooij [:jandem]]

Comment on attachment 688408 [details] [diff] [review]
Unmask ion compiler.

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

::: js/src/jsinterp.cpp
@@ +1518,5 @@
>          else
>              Probes::exitScript(cx, script, script->function(), regs.fp());
>  
>          /* The JIT inlines the epilogue. */
> +#ifdef JS_METHODJIT || JS_ION

#if defined(JS_METHODJIT) || defined(JS_ION)

@@ +2392,5 @@
> +            // TODO: This may need to be removed when we want to add support for
> +            // OSR into Ion, which will be implemented by bailing out to the interpreter
> +            // from baseline.
> +            JS_ASSERT(exec != ion::IonExec_Bailout);
> +        

Nit: trailing whitespace

Comment 3

[Kannan Vijayan [:djvj]]

https://hg.mozilla.org/projects/ionmonkey/rev/1c0489e5a302