# HG changeset patch
# User redestad
# Date 1462574617 -7200
# Node ID 3657c978f79acd407a0dce59fb95a92942cc51cd
# Parent  1e55f818652873560586defb85184dca67e8c00a
8150044: Generate classlists at build-time
Reviewed-by: alanb, mchung, iklam
Contributed-by: claes.redestad@oracle.com, erik.joelsson@oracle.com

diff -r 1e55f8186528 -r 3657c978f79a hotspot/src/share/vm/memory/metaspaceShared.hpp
--- a/hotspot/src/share/vm/memory/metaspaceShared.hpp	Thu May 05 19:10:36 2016 +0000
+++ b/hotspot/src/share/vm/memory/metaspaceShared.hpp	Sat May 07 00:43:37 2016 +0200
@@ -43,10 +43,10 @@
 // for the x64 platform
 #define DEFAULT_VTBL_COMMON_CODE_SIZE   (1*K) // conservative size of the "common_code" for the x64 platform
 
-#define DEFAULT_SHARED_READ_WRITE_SIZE  (NOT_LP64(12*M) LP64_ONLY(16*M))
-#define MIN_SHARED_READ_WRITE_SIZE      (NOT_LP64(7*M) LP64_ONLY(12*M))
+#define DEFAULT_SHARED_READ_WRITE_SIZE  (NOT_LP64(8*M) LP64_ONLY(10*M))
+#define MIN_SHARED_READ_WRITE_SIZE      (NOT_LP64(7*M) LP64_ONLY(10*M))
 
-#define DEFAULT_SHARED_READ_ONLY_SIZE   (NOT_LP64(12*M) LP64_ONLY(16*M))
+#define DEFAULT_SHARED_READ_ONLY_SIZE   (NOT_LP64(8*M) LP64_ONLY(10*M))
 #define MIN_SHARED_READ_ONLY_SIZE       (NOT_LP64(8*M) LP64_ONLY(9*M))
 
 // the MIN_SHARED_MISC_DATA_SIZE and MIN_SHARED_MISC_CODE_SIZE estimates are based on
diff -r 1e55f8186528 -r 3657c978f79a hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java
--- a/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java	Thu May 05 19:10:36 2016 +0000
+++ b/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java	Sat May 07 00:43:37 2016 +0200
@@ -35,7 +35,7 @@
 public class MaxMetaspaceSize {
   public static void main(String[] args) throws Exception {
     ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
-        "-XX:MaxMetaspaceSize=20m", "-Xshare:dump");
+        "-XX:MaxMetaspaceSize=10m", "-Xshare:dump");
     OutputAnalyzer output = new OutputAnalyzer(pb.start());
       output.shouldContain("is not large enough.\nEither don't specify the -XX:MaxMetaspaceSize=<size>\nor increase the size to at least");
       output.shouldHaveExitValue(2);