[aarch64-port-dev ] Mixing of aarch64_c2 and default branch code

[Andrew Dinn]

As of revision 4769  (SHA1 Id: 08a289cd5e41) of the hotspot tree my C2
changes in the aarch64_c2 branch started being merged into the default
branch. Specifically, these are changes to file aarch64.ad and
sharedRuntime_aarch64.cpp which are the only files which contains
different code to default.

So, at revision 4768 file aarch64.ad contains the small set of dummy
rules which existed before the aarch64_c2 branch was created. At
revision 4769 it contains the fairly large set of rules I had developed
up to that point in the aarch64_c2 branch. Similarly, at revision 4768
sharedRuntime_aarch64.cpp contains empty definitions for the code which
generates several of the C2-specific handlers whereas at 4769 it
contains the definitions I added to aarch64_c2. I am not sure what
happened at the merge point but it looks as if the aarch64_c2 changes
were pulled into the default branch rather than the other way round.

This conflation of aarch64_c2 and default code appears to have continued
from that point on (again I am not sure exactly how) because the latest
revision for the default tree (4827) appears to include my latest copy
of aarch64.ad.

This doesn't actually matter as far as building the C1/C2 variants goes
because the C2 code (in aarch64.ad or generated from it) does not get
included in the build process unless you configure either a tiered or a
C2 build. However, it does make it a little easier for me to make
changes which break C1. I don't know whether it is worth continuing with
a separate aarch64_c2 branch given that the code bases are now
effectively merged. Anyone have any opinions on this?

regards,


Andrew Dinn
-----------