Add call protocol to script body and separate non-protocol metas. #4388

Merged
merged 2 commits into from Dec 15, 2016

Projects

None yet

1 participant

@headius
Member
headius commented Dec 15, 2016

This PR adds call protocol to script bodies. This fixes recent compiler regressions caused by ripping the non-protocol logic out of CompiledIRMethod (#4382).

It appears the only scopes which do not get call protocol now are eval scopes and singleton class scopes (IRMetaClassBody). The former is never jitted and never put into CompiledIRMethod or any other context where its protocol is not already handled. The latter had its own CompiledIRMetaClassBody whose sole difference was to do pre/post call protocol, so it is renamed to reflect that.

@headius headius added this to the JRuby 9.1.7.0 milestone Dec 15, 2016
@headius headius Additional fixes for top-level script protocol.
* Clear StaticScope's dynscope constructor when variable names are
  altered.
* Clean up jitted top-level script boot logic.
a3ad3fb
@headius headius merged commit a761edb into jruby:master Dec 15, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@headius headius deleted the headius:protocol-fixes branch Dec 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment