Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot
changeset 7441:a9af91e95a19
Use correct control in non-Shenandoah GCs in store_String_XXX methods in C2.
author | Roman Kennke <rkennke@redhat.com> |
---|---|
date | Thu, 11 Dec 2014 17:06:38 +0100 |
parents | e71997fba947 |
children | 94b7293bdf5b |
files | src/share/vm/opto/graphKit.cpp |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/graphKit.cpp Thu Dec 11 11:59:43 2014 +0100 +++ b/src/share/vm/opto/graphKit.cpp Thu Dec 11 17:06:38 2014 +0100 @@ -4157,7 +4157,7 @@ // TODO: See comment in load_String_offset(). str = shenandoah_write_barrier(str); - store_to_memory(control(), basic_plus_adr(str, offset_offset), + store_to_memory(UseShenandoahGC ? control() : ctrl, basic_plus_adr(str, offset_offset), value, T_INT, offset_field_idx, MemNode::unordered); } @@ -4171,7 +4171,7 @@ str = shenandoah_write_barrier(str); value = shenandoah_read_barrier(value); - store_oop_to_object(control(), str, basic_plus_adr(str, value_offset), value_field_type, + store_oop_to_object(UseShenandoahGC ? control() : ctrl, str, basic_plus_adr(str, value_offset), value_field_type, value, TypeAryPtr::CHARS, T_OBJECT, MemNode::unordered); } @@ -4185,7 +4185,7 @@ // TODO: See comment in load_String_offset(). str = shenandoah_write_barrier(str); - store_to_memory(control(), basic_plus_adr(str, count_offset), + store_to_memory(UseShenandoahGC ? control() : ctrl, basic_plus_adr(str, count_offset), value, T_INT, count_field_idx, MemNode::unordered); }