RFR: Two small C2 cleanups

[Roman Kennke]

Ah! This is already in upstream, and my review changeset doesn't have it:

http://cr.openjdk.java.net/~rkennke/shenandoah-upstream/01/shared-compiler/src/hotspot/share/opto/subnode.cpp.sdiff.html
http://cr.openjdk.java.net/~rkennke/shenandoah-upstream/01/shared-compiler/src/hotspot/share/opto/phasetype.hpp.sdiff.html

Apparently, it has been forgotten to update copyrights in upstream :-)

Let's merge upstream into sh/jdk first and then revisit it. I also have
another cleanup in another file pending.

Roman

> On 11/29/18 11:00 AM, Roman Kennke wrote:
>> We have those gratuitous diffs in C2:
>>
>> diff --git a/src/hotspot/share/opto/phasetype.hpp
>> b/src/hotspot/share/opto/phasetype.hpp
>> --- a/src/hotspot/share/opto/phasetype.hpp
>> +++ b/src/hotspot/share/opto/phasetype.hpp
>> @@ -1,5 +1,5 @@
>>  /*
>> - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights
>> reserved.
>> + * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights
>> reserved.
>>   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>>   *
>>   * This code is free software; you can redistribute it and/or modify it
> 
> I see there is a change that should trigger copyright update, no? Or is that coming from upstream
> anyway? If so, copyright would be changed in upstream?
> 
> https://builds.shipilev.net/patch-openjdk-shenandoah-jdk-only-shared/latest/src/hotspot/share/opto/phasetype.hpp.sdiff.html
> 
>> diff --git a/src/hotspot/share/opto/subnode.cpp
>> b/src/hotspot/share/opto/subnode.cpp
>> --- a/src/hotspot/share/opto/subnode.cpp
>> +++ b/src/hotspot/share/opto/subnode.cpp
>> @@ -883,7 +883,7 @@
>>    //   LoadBarrier?(LoadP(LoadP(AddP(foo:Klass, #java_mirror))))
>>    //   or NULL if not matching.
>>    BarrierSetC2* bs = BarrierSet::barrier_set()->barrier_set_c2();
>> -  n = bs->step_over_gc_barrier(n);
>> +    n = bs->step_over_gc_barrier(n);
>>
>>    if (n->Opcode() != Op_LoadP) return NULL;
> 
> This look okay to fix.
> 
> -Aleksey
> 
>