Mercurial > hg > truffle

changeset 725:928912ce8438

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author never
date Mon, 20 Apr 2009 14:48:03 -0700
parents 981375ca07b7 (diff) 2bf529ef0adb (current diff)
children be93aad57795 6b2273dd6fa9
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.config	Fri Apr 17 09:38:32 2009 -0700
+++ b/make/jprt.config	Mon Apr 20 14:48:03 2009 -0700
@@ -73,6 +73,7 @@
     else
         if [ "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6"      -o \
              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u10"   -o \
+             "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6u14"   -o \
              "${JPRT_JOB_PRODUCT_RELEASE}" = "jdk6perf" ] ; then
             # All jdk6 builds use SS11
             compiler_name=SS11
--- a/src/share/vm/memory/dump.cpp	Fri Apr 17 09:38:32 2009 -0700
+++ b/src/share/vm/memory/dump.cpp	Mon Apr 20 14:48:03 2009 -0700
@@ -929,7 +929,8 @@
     guarantee(SystemDictionary::constraints()->number_of_entries() == 0,
               "loader constraints are not saved");
     // Revisit and implement this if we prelink method handle call sites:
-    guarantee(SystemDictionary::invoke_method_table()->number_of_entries() == 0,
+    guarantee(SystemDictionary::invoke_method_table() == NULL ||
+              SystemDictionary::invoke_method_table()->number_of_entries() == 0,
               "invoke method table is not saved");
     GenCollectedHeap* gch = GenCollectedHeap::heap();