/hg/icedtea8-forest/hotspot: 2 new changesets

[andrew at icedtea.classpath.org]

changeset f643b11edb5a in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=f643b11edb5a
author: fyang
date: Thu Jan 03 13:53:15 2019 +0800

	8215951, PR3682: AArch64: jtreg test vmTestbase/nsk/jvmti/PopFrame/popframe005 segfaults
	Reviewed-by: aph
	Contributed-by: nick.gasson at arm.com


changeset e0e0df53b39d in /hg/icedtea8-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea8-forest/hotspot?cmd=changeset;node=e0e0df53b39d
author: fyang
date: Mon Feb 11 17:09:17 2019 +0800

	8218185, PR3682: aarch64: missing LoadStore barrier in TemplateTable::putfield_or_static
	Reviewed-by: aph
	Contributed-by: lunliu93 at gmail.com


diffstat:

 src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp |  1 +
 src/cpu/aarch64/vm/templateTable_aarch64.cpp       |  2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diffs (23 lines):

diff -r 36d303abca2b -r e0e0df53b39d src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp
--- a/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	Fri Feb 15 06:44:21 2019 +0000
+++ b/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp	Mon Feb 11 17:09:17 2019 +0800
@@ -1863,6 +1863,7 @@
   __ restore_locals();
   __ restore_constant_pool_cache();
   __ get_method(rmethod);
+  __ get_dispatch();
 
   // The method data pointer was incremented already during
   // call profiling. We have to restore the mdp for the current bcp.
diff -r 36d303abca2b -r e0e0df53b39d src/cpu/aarch64/vm/templateTable_aarch64.cpp
--- a/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Fri Feb 15 06:44:21 2019 +0000
+++ b/src/cpu/aarch64/vm/templateTable_aarch64.cpp	Mon Feb 11 17:09:17 2019 +0800
@@ -2633,7 +2633,7 @@
   {
     Label notVolatile;
     __ tbz(r5, ConstantPoolCacheEntry::is_volatile_shift, notVolatile);
-    __ membar(MacroAssembler::StoreStore);
+    __ membar(MacroAssembler::StoreStore | MacroAssembler::LoadStore);
     __ bind(notVolatile);
   }