diff options
| -rw-r--r-- | gradle.properties | 1 | ||||
| -rw-r--r-- | hotspot/.hg/patches/arguments-java8u31.patch | 58 | ||||
| -rw-r--r-- | hotspot/.hg/patches/series | 8 |
3 files changed, 64 insertions, 3 deletions
diff --git a/gradle.properties b/gradle.properties index f93da479..e26ddf4d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,6 +24,7 @@ compiler=compiler2 targetJre=build/jre # Tag to base DCEVM on +#hotspotTag=jdk8u31-b13 #hotspotTag=jdk8u20-b22 #hotspotTag=jdk8u5-b13 hotspotTag=jdk7u71-b01 diff --git a/hotspot/.hg/patches/arguments-java8u31.patch b/hotspot/.hg/patches/arguments-java8u31.patch new file mode 100644 index 00000000..b7e892bb --- /dev/null +++ b/hotspot/.hg/patches/arguments-java8u31.patch @@ -0,0 +1,58 @@ +diff --git a/src/share/vm/runtime/arguments.cpp b/src/share/vm/runtime/arguments.cpp +index 1565f88..5982b58 100644 +--- a/src/share/vm/runtime/arguments.cpp ++++ b/src/share/vm/runtime/arguments.cpp +@@ -62,8 +62,8 @@ + #include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp" + #endif // INCLUDE_ALL_GCS + +-// Note: This is a special bug reporting site for the JVM +-#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" ++// (DCEVM) The DCE VM has its own JIRA bug tracking system. ++#define DEFAULT_VENDOR_URL_BUG "https://github.com/Guidewire/DCEVM/issues" + #define DEFAULT_JAVA_LAUNCHER "generic" + + // Disable options not supported in this release, with a warning if they +@@ -1511,6 +1511,10 @@ + + void Arguments::set_ergonomics_flags() { + ++ if (AllowEnhancedClassRedefinition) { ++ // (DCEVM) enforces serial GC ++ FLAG_SET_ERGO(bool, UseSerialGC, true); ++ } + if (os::is_server_class_machine()) { + // If no other collector is requested explicitly, + // let the VM select the collector based on +@@ -1988,6 +1992,17 @@ + if (UseConcMarkSweepGC || UseParNewGC) i++; + if (UseParallelGC || UseParallelOldGC) i++; + if (UseG1GC) i++; ++ ++ if (AllowEnhancedClassRedefinition) { ++ // (DCEVM) Must use serial GC. This limitation applies because the instance size changing GC modifications ++ // are only built into the mark and compact algorithm. ++ if (!UseSerialGC && i >= 1) { ++ jio_fprintf(defaultStream::error_stream(), ++ "Must use the serial GC in the DCEVM\n"); ++ status = false; ++ } ++ } ++ + if (i > 1) { + jio_fprintf(defaultStream::error_stream(), + "Conflicting collector combinations in option list; " +diff --git a/src/share/vm/runtime/globals.hpp b/src/share/vm/runtime/globals.hpp +index 63222af..7597eda 100644 +--- a/src/share/vm/runtime/globals.hpp ++++ b/src/share/vm/runtime/globals.hpp +@@ -1283,6 +1283,9 @@ + product(intx, TraceRedefineClasses, 0, \ + "Trace level for JVMTI RedefineClasses") \ + \ ++ product(bool, AllowEnhancedClassRedefinition, true, \ ++ "Allow enhanced class redefinition beyond swapping method bodies")\ ++ \ + develop(bool, StressMethodComparator, false, \ + "Run the MethodComparator on all loaded methods") \ + \
\ No newline at end of file diff --git a/hotspot/.hg/patches/series b/hotspot/.hg/patches/series index bac0bef5..b2ce836a 100644 --- a/hotspot/.hg/patches/series +++ b/hotspot/.hg/patches/series @@ -2,7 +2,8 @@ distro-name.patch # Add AllowEnhancedRedefinition argument -arguments-java8.patch #+jdk8 +arguments-java8.patch #+light-jdk8u5-b13 #+light-jdk8u20-b22 +arguments-java8u31.patch #+light-jdk8u31-b13 # GC changes to allow modifying instances during redefinition run gc-java8.patch #+jdk8 @@ -31,6 +32,7 @@ full-jdk7u60-deopt-cp.patch #+full-jdk7u60-b09 #+full-jdk7u71-b01 light-jdk8u5-b13.patch #+light-jdk8u5-b13 -light-jdk8u20-b22.patch #+light-jdk8u20-b22 -light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 +light-jdk8u20-b22.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 +light-jdk8u20-deopt-cp.patch #+light-jdk8u20-b22 #+light-jdk8u31-b13 + |