changeset 10944:63b87be22d3e

Merge
author coleenp
date Wed, 20 Apr 2016 05:27:06 +0000
parents 857efca82258 978187e4a066
children 03f934c94ffa
files
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/globals_zero.hpp	Sun Apr 17 19:15:52 2016 -0700
+++ b/src/cpu/zero/vm/globals_zero.hpp	Wed Apr 20 05:27:06 2016 +0000
@@ -43,7 +43,12 @@
 define_pd_global(intx,  OptoLoopAlignment,    16);
 define_pd_global(intx,  InlineFrequencyCount, 100);
 define_pd_global(intx,  InlineSmallCode,      1000);
-define_pd_global(intx,  InitArrayShortSize,   -1); // not used
+
+// not used, but must satisfy following constraints:
+// 1.) <VALUE> must be in the allowed range for intx *and*
+// 2.) <VALUE> % BytesPerLong == 0 so as to not
+//     violate the constraint verifier on JVM start-up.
+define_pd_global(intx,  InitArrayShortSize,   0);
 
 #define DEFAULT_STACK_YELLOW_PAGES (2)
 #define DEFAULT_STACK_RED_PAGES (1)
--- a/src/share/vm/gc/g1/g1EvacStats.cpp	Sun Apr 17 19:15:52 2016 -0700
+++ b/src/share/vm/gc/g1/g1EvacStats.cpp	Wed Apr 20 05:27:06 2016 +0000
@@ -24,6 +24,7 @@
 
 #include "precompiled.hpp"
 #include "memory/allocation.inline.hpp"
+#include "gc/g1/g1_globals.hpp"
 #include "gc/g1/g1EvacStats.hpp"
 #include "gc/shared/gcId.hpp"
 #include "logging/log.hpp"