diff src/share/vm/runtime/arguments.cpp @ 7479:f1c06dcee0b5

Merge
author kvn
date Thu, 10 Jan 2013 10:00:43 -0800
parents b2fef6b220e9 d092d1b31229
children 989155e2d07a c73c3f2c5b3b db9981fd3124
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp	Thu Jan 10 07:32:32 2013 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Thu Jan 10 10:00:43 2013 -0800
@@ -3303,6 +3303,18 @@
   if (!EliminateLocks) {
     EliminateNestedLocks = false;
   }
+  if (!Inline) {
+    IncrementalInline = false;
+  }
+#ifndef PRODUCT
+  if (!IncrementalInline) {
+    AlwaysIncrementalInline = false;
+  }
+#endif
+  if (IncrementalInline && FLAG_IS_DEFAULT(MaxNodeLimit)) {
+    // incremental inlining: bump MaxNodeLimit
+    FLAG_SET_DEFAULT(MaxNodeLimit, (intx)75000);
+  }
 #endif
 
   if (PrintAssembly && FLAG_IS_DEFAULT(DebugNonSafepoints)) {