/hg/icedtea7-forest/hotspot: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 9 16:35:12 UTC 2015
changeset 3ac6d4ddf264 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=3ac6d4ddf264
author: iignatyev
date: Wed Jun 03 03:14:46 2015 +0100
8021120, PR2301: TieredCompilation can be enabled even if TIERED is undefined
Reviewed-by: kvn, dholmes
changeset cb42e88f9787 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=cb42e88f9787
author: mgerdin
date: Thu Jun 26 13:20:18 2014 +0200
8048214, PR2357: Linker error when compiling G1SATBCardTableModRefBS after include order changes
Reviewed-by: stefank, brutisso, tschatzl
changeset c6bc9f44ad03 in /hg/icedtea7-forest/hotspot
details: http://icedtea.classpath.org/hg/icedtea7-forest/hotspot?cmd=changeset;node=c6bc9f44ad03
author: andrew
date: Tue Jun 09 17:32:55 2015 +0100
Added tag icedtea-2.6pre22 for changeset cb42e88f9787
diffstat:
.hgtags | 1 +
src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp | 11 +++
src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp | 12 +--
src/share/vm/runtime/arguments.cpp | 40 +++++++---
4 files changed, 41 insertions(+), 23 deletions(-)
diffs (121 lines):
diff -r c96991560be1 -r c6bc9f44ad03 .hgtags
--- a/.hgtags Mon Mar 23 10:15:53 2015 +0100
+++ b/.hgtags Tue Jun 09 17:32:55 2015 +0100
@@ -836,3 +836,4 @@
8f3c9cf0636f4d40e9c3647e03c7d0ca6d1019ee icedtea-2.6pre19
904317834a259bdddd4568b74874c2472f119a3c icedtea-2.6pre20
1939c010fd371d22de5c1baf2583a96e8f38da44 icedtea-2.6pre21
+cb42e88f9787c8aa28662f31484d605e550c6d53 icedtea-2.6pre22
diff -r c96991560be1 -r c6bc9f44ad03 src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
--- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Mon Mar 23 10:15:53 2015 +0100
+++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Tue Jun 09 17:32:55 2015 +0100
@@ -79,6 +79,17 @@
}
}
+void G1SATBCardTableModRefBS::write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
+ if (!dest_uninitialized) {
+ write_ref_array_pre_work(dst, count);
+ }
+}
+void G1SATBCardTableModRefBS::write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
+ if (!dest_uninitialized) {
+ write_ref_array_pre_work(dst, count);
+ }
+}
+
bool G1SATBCardTableModRefBS::mark_card_deferred(size_t card_index) {
jbyte val = _byte_map[card_index];
// It's already processed
diff -r c96991560be1 -r c6bc9f44ad03 src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp
--- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Mon Mar 23 10:15:53 2015 +0100
+++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.hpp Tue Jun 09 17:32:55 2015 +0100
@@ -85,16 +85,8 @@
}
template <class T> void write_ref_array_pre_work(T* dst, int count);
- virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized) {
- if (!dest_uninitialized) {
- write_ref_array_pre_work(dst, count);
- }
- }
- virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized) {
- if (!dest_uninitialized) {
- write_ref_array_pre_work(dst, count);
- }
- }
+ virtual void write_ref_array_pre(oop* dst, int count, bool dest_uninitialized);
+ virtual void write_ref_array_pre(narrowOop* dst, int count, bool dest_uninitialized);
/*
Claimed and deferred bits are used together in G1 during the evacuation
diff -r c96991560be1 -r c6bc9f44ad03 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp Mon Mar 23 10:15:53 2015 +0100
+++ b/src/share/vm/runtime/arguments.cpp Tue Jun 09 17:32:55 2015 +0100
@@ -60,6 +60,28 @@
#define DEFAULT_VENDOR_URL_BUG "http://icedtea.classpath.org/bugzilla"
#define DEFAULT_JAVA_LAUNCHER "generic"
+// Disable options not supported in this release, with a warning if they
+// were explicitly requested on the command-line
+#define UNSUPPORTED_OPTION(opt, description) \
+do { \
+ if (opt) { \
+ if (FLAG_IS_CMDLINE(opt)) { \
+ warning(description " is disabled in this release."); \
+ } \
+ FLAG_SET_DEFAULT(opt, false); \
+ } \
+} while(0)
+
+#define UNSUPPORTED_GC_OPTION(gc) \
+do { \
+ if (gc) { \
+ if (FLAG_IS_CMDLINE(gc)) { \
+ warning(#gc " is not supported in this VM. Using Serial GC."); \
+ } \
+ FLAG_SET_DEFAULT(gc, false); \
+ } \
+} while(0)
+
char** Arguments::_jvm_flags_array = NULL;
int Arguments::_num_jvm_flags = 0;
char** Arguments::_jvm_args_array = NULL;
@@ -3073,14 +3095,17 @@
SOLARIS_ONLY(FLAG_SET_DEFAULT(UseISM, false));
}
- // Tiered compilation is undefined with C1.
- TieredCompilation = false;
#else
if (!FLAG_IS_DEFAULT(OptoLoopAlignment) && FLAG_IS_DEFAULT(MaxLoopPad)) {
FLAG_SET_DEFAULT(MaxLoopPad, OptoLoopAlignment-1);
}
#endif
+#ifndef TIERED
+ // Tiered compilation is undefined.
+ UNSUPPORTED_OPTION(TieredCompilation, "TieredCompilation");
+#endif
+
// If we are running in a headless jre, force java.awt.headless property
// to be true unless the property has already been set.
// Also allow the OS environment variable JAVA_AWT_HEADLESS to set headless state.
@@ -3239,17 +3264,6 @@
}
}
-// Disable options not supported in this release, with a warning if they
-// were explicitly requested on the command-line
-#define UNSUPPORTED_OPTION(opt, description) \
-do { \
- if (opt) { \
- if (FLAG_IS_CMDLINE(opt)) { \
- warning(description " is disabled in this release."); \
- } \
- FLAG_SET_DEFAULT(opt, false); \
- } \
-} while(0)
// Parse entry point called from JNI_CreateJavaVM
More information about the distro-pkg-dev
mailing list