changeset 4576:1aa21f922568

8007028: java/util/NavigableMap/LockStep hit assert(flat != TypePtr::BOTTOM) failed: cannot alias-analyze an untyped ptr Summary: do not allow switch on EliminateAutoBox in hs24. Reviewed-by: twisti
author kvn
date Thu, 20 Jun 2013 19:19:06 -0700
parents 9aba4a729302
children fde31393d1ce
files src/share/vm/runtime/arguments.cpp
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Fri Jun 14 09:18:42 2013 -0400
+++ b/src/share/vm/runtime/arguments.cpp	Thu Jun 20 19:19:06 2013 -0700
@@ -1609,8 +1609,12 @@
 void Arguments::set_aggressive_opts_flags() {
 #ifdef COMPILER2
   if (AggressiveOpts || !FLAG_IS_DEFAULT(AutoBoxCacheMax)) {
+    // EliminateAutoBox code is broken in C2
     if (FLAG_IS_DEFAULT(EliminateAutoBox)) {
-      FLAG_SET_DEFAULT(EliminateAutoBox, true);
+      // FLAG_SET_DEFAULT(EliminateAutoBox, true);
+    }
+    if (EliminateAutoBox) {
+      FLAG_SET_DEFAULT(EliminateAutoBox, false);
     }
     if (FLAG_IS_DEFAULT(AutoBoxCacheMax)) {
       FLAG_SET_DEFAULT(AutoBoxCacheMax, 20000);