[11] RFR(S) 8202552: [AOT][JVMCI] Incorrect usage of INCLUDE_JVMCI and INCLUDE_AOT

[Vladimir Kozlov]

Thank you, Magnus

On 5/3/18 1:40 AM, Magnus Ihse Bursie wrote:
> On 2018-05-03 00:13, Vladimir Kozlov wrote:
>> http://cr.openjdk.java.net/~kvn/8202552/webrev.00/
>> https://bugs.openjdk.java.net/browse/JDK-8202552
> 
> Looks good to me.
> 
> Just some thinking out loud... The way we handle the responsibility 
> split between the makefiles and the hotspot source files is actually a 
> bit corny. :-( It would make more sense for the makefiles to set 
> -DINCLUDE_features=1 when the feature is enabled, and 
> -DINCLUDE_feature=0 when it is not (or just leave it out), and skip all 
> the #ifndef INCLUDE_<feature> #define INCLUDE_<feature> 1 ...in macros.hpp.

Yes, I thought the same thing but it was too much change for this fix.

> 
> But that is the work of a future cleanup. This patch makes sure we use 
> the same pattern everywhere, which is good.

Thanks,
Vladimir K

> 
> /Magnus
> 
> 
>>
>> Stefan K. found several places where #ifdef instead of #if is used for 
>> INCLUDE_JVMCI.
>> I also found places where we can use COMPILER2_OR_JVMCI.
>>
>> An other problem surprised me that we don't set INCLUDE_AOT to 1. 
>> Makefile defines that variable without value. I changed code to match 
>> other variables setting - in makefile set it to 0 if it is not part of 
>> build and set it to 1 in macros.hpp if it is not defined.
>>
>> Tested with tier1, tier2 and tier2 with Graal as JIT compiler.
>