RFR (tedious) 8216022: Use #pragma once

Per Liden per.liden at oracle.com
Tue Jan 8 15:25:20 UTC 2019


Hi Coleen,

On 1/7/19 5:16 PM, coleen.phillimore at oracle.com wrote:
> 
> 
> On 1/7/19 3:40 AM, Per Liden wrote:
>> Hi Coleen,
>>
>> On 1/3/19 3:31 AM, coleen.phillimore at oracle.com wrote:
>>>
>>> Here is the webrev and bug link.
>>>
>>> open webrev at http://cr.openjdk.java.net/~coleenp/8216022.01/webrev
>>
>> Looks like your script is now leaving an extra empty line at the end 
>> of all files, which wasn't there before. Fox example:
>>
>> --- old/src/hotspot/share/gc/z/zAddress.hpp    2019-01-02 
>> 16:41:04.209075410 -0500
>> +++ new/src/hotspot/share/gc/z/zAddress.hpp    2019-01-02 
>> 16:41:03.957075419 -0500
>> @@ -64,4 +63,3 @@
>>    static void flip_to_remapped();
>>  };
>>
>> -#endif // SHARE_GC_Z_ZADDRESS_HPP
>>
>> Should be:
>>
>> --- old/src/hotspot/share/gc/z/zAddress.hpp    2019-01-02 
>> 16:41:04.209075410 -0500
>> +++ new/src/hotspot/share/gc/z/zAddress.hpp    2019-01-02 
>> 16:41:03.957075419 -0500
>> @@ -64,4 +63,3 @@
>>    static void flip_to_remapped();
>>  };
>> -
>> -#endif // SHARE_GC_Z_ZADDRESS_HPP
>>
>>
>> Could you please fix that?
> 
> Hi, I fixed the trailing blank lines (in some cases several lines) and 
> had to hand patch files that ended with line continuation '\' from some 
> macro.  I found these in some globals files like g1_globals.hpp and one 
> ci file, that I can't find anymore.
> 
> http://cr.openjdk.java.net/~coleenp/8216022.diffs.03

Thanks for fixing. Looks good. And for the record, I'm for using #pragma 
once instead of manually typed include guards. The number of miss-typed 
include guards we've seen over the years is enough to convince me that 
people in general aren't very good at getting this right, and we should 
let our tool chain handle this for us.

cheers,
Per

> 
> Thanks,
> Coleen
>>
>> Thanks!
>> Per
>>
>>> bug link https://bugs.openjdk.java.net/browse/JDK-8216022
>>>
>>> On 1/2/19 9:16 PM, coleen.phillimore at oracle.com wrote:
>>>> Summary: change include guards to #pragma once, except in generated 
>>>> header files.
>>>>
>>>> Tested with mach5 for linux-x64{-debug}, solaris-sparc, macosx-x64, 
>>>> windows-x64, built aarch64 with cross compiler, and zero.
>>>>
>>>> Ran tier1 and 2 tests.
>>>>
>>>> The webrev is huge but there are only 3 lines changed in each header 
>>>> file.  So click on the patch.
>>>>
>>>> I'll update the copyright headers with a script with the commit. 
>>>> Also, will do this after the shenandoah copyright headers are fixed.
>>>>
>>>> Adrian: I included you to check your platforms.
>>>>
>>>> Happy New Year!
>>>> Coleen
>>>
> 


More information about the hotspot-dev mailing list