# HG changeset patch
# User coleenp
# Date 1461121921 0
# Node ID daf6ed16c5db7d38d9a058e8ecf1e6cb0848d7d2
# Parent  db6541410dfbff17b5dfea7c2dbe89c9ee20e585# Parent  1a816b464178fc23a9f52268a810f33241dc0ea3
Merge

diff -r 1a816b464178 -r daf6ed16c5db hotspot/src/cpu/zero/vm/globals_zero.hpp
--- a/hotspot/src/cpu/zero/vm/globals_zero.hpp	Tue Apr 19 11:03:37 2016 -0400
+++ b/hotspot/src/cpu/zero/vm/globals_zero.hpp	Wed Apr 20 03:12:01 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)
diff -r 1a816b464178 -r daf6ed16c5db hotspot/src/share/vm/gc/g1/g1EvacStats.cpp
--- a/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp	Tue Apr 19 11:03:37 2016 -0400
+++ b/hotspot/src/share/vm/gc/g1/g1EvacStats.cpp	Wed Apr 20 03:12:01 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"