RFR: Fix non-PCH build

Zhengyu Gu zgu at redhat.com
Thu Jun 14 16:39:40 UTC 2018


Good.

-Zhengyu

On 06/14/2018 12:37 PM, Aleksey Shipilev wrote:
> Fails to compile:
> 
> /home/shade/trunks/shenandoah-jdk/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp:45:35:
> error: ‘ShenandoahRuntime::write_ref_field_pre_entry’ is not a type
>   JRT_LEAF(void, ShenandoahRuntime::write_ref_field_pre_entry(oopDesc* orig, JavaThread *thread))
>                                     ^
> /home/shade/trunks/shenandoah-jdk/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp:46:3: error:
> expected constructor, destructor, or type conversion before ‘if’
>     if (orig == NULL) {
>     ^
> /home/shade/trunks/shenandoah-jdk/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp:52:45:
> error: expected constructor, destructor, or type conversion before ‘(’ token
>     ShenandoahThreadLocalData::satb_mark_queue(thread).enqueue(orig);
>                                               ^
> /home/shade/trunks/shenandoah-jdk/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp:53:1: error:
> ‘JRT_END’ does not name a type
>   JRT_END
>   ^
>     ... (rest of output omitted)
> 
> Fix:
> 
> diff -r 468e91da7c49 src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp
> --- a/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp	Thu Jun 14 17:54:55 2018 +0200
> +++ b/src/hotspot/share/gc/shenandoah/shenandoahRuntime.cpp	Thu Jun 14 18:36:59 2018 +0200
> @@ -22,10 +22,13 @@
>    */
> 
>   #include "precompiled.hpp"
>   #include "gc/shenandoah/shenandoahBarrierSet.hpp"
>   #include "gc/shenandoah/shenandoahRuntime.hpp"
> +#include "gc/shenandoah/shenandoahThreadLocalData.hpp"
> +#include "runtime/interfaceSupport.inline.hpp"
> +#include "oops/oop.inline.hpp"
> 
>   void ShenandoahRuntime::write_ref_array_pre_oop_entry(oop* dst, size_t length) {
>     ShenandoahBarrierSet *bs = ShenandoahBarrierSet::barrier_set();
>     bs->write_ref_array_pre(dst, length, false);
>   }
> 
> 
> -Aleksey
> 


More information about the shenandoah-dev mailing list