# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1418313998 -3600
# Node ID a9af91e95a19051689d89d712035eb47bee2c9a2
# Parent  e71997fba947772d54b64e7ea4eb953dff703846
Use correct control in non-Shenandoah GCs in store_String_XXX methods in C2.

diff -r e71997fba947 -r a9af91e95a19 src/share/vm/opto/graphKit.cpp
--- 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);
 }