changeset 12600:f5776d683ae5

8173037: V [jvm.dll+0x2343fc] GraphBuilder::args_list_for_profiling+0x8c Summary: Disabled WB Compilaton at unsupported levels. Reviewed-by: kvn
author jcm
date Sun, 22 Jan 2017 22:18:49 -0800
parents 283d05ba6692
children c576bd949a9d
files src/share/vm/compiler/compilerDefinitions.cpp src/share/vm/prims/whitebox.cpp src/share/vm/runtime/arguments.cpp
diffstat 3 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/compiler/compilerDefinitions.cpp	Sat Jan 21 15:08:53 2017 -0800
+++ b/src/share/vm/compiler/compilerDefinitions.cpp	Sun Jan 22 22:18:49 2017 -0800
@@ -68,7 +68,6 @@
   CompLevel_initial_compile = CompLevel_simple;
   FLAG_SET_ERGO(bool, TieredCompilation, false);
   FLAG_SET_ERGO(bool, ProfileInterpreter, false);
-  FLAG_SET_ERGO(bool, NeverActAsServerClassMachine, true);
 #if INCLUDE_JVMCI
   FLAG_SET_ERGO(bool, EnableJVMCI, false);
   FLAG_SET_ERGO(bool, UseJVMCICompiler, false);
@@ -76,6 +75,9 @@
 #if INCLUDE_AOT
   FLAG_SET_ERGO(bool, UseAOT, false);
 #endif
+  if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) {
+    FLAG_SET_ERGO(bool, NeverActAsServerClassMachine, true);
+  }
   if (FLAG_IS_DEFAULT(InitialCodeCacheSize)) {
     FLAG_SET_ERGO(uintx, InitialCodeCacheSize, 160*K);
   }
--- a/src/share/vm/prims/whitebox.cpp	Sat Jan 21 15:08:53 2017 -0800
+++ b/src/share/vm/prims/whitebox.cpp	Sun Jan 22 22:18:49 2017 -0800
@@ -765,7 +765,7 @@
 
 bool WhiteBox::compile_method(Method* method, int comp_level, int bci, Thread* THREAD) {
   // Screen for unavailable/bad comp level or null method
-  if (method == NULL || comp_level > TieredStopAtLevel ||
+  if (method == NULL || comp_level > MIN2((CompLevel) TieredStopAtLevel, CompLevel_highest_tier) ||
       CompileBroker::compiler(comp_level) == NULL) {
     return false;
   }
--- a/src/share/vm/runtime/arguments.cpp	Sat Jan 21 15:08:53 2017 -0800
+++ b/src/share/vm/runtime/arguments.cpp	Sun Jan 22 22:18:49 2017 -0800
@@ -1829,7 +1829,7 @@
 void Arguments::select_compilation_mode_ergonomically() {
 #if defined(_WINDOWS) && !defined(_LP64)
   if (FLAG_IS_DEFAULT(NeverActAsServerClassMachine)) {
-    NeverActAsServerClassMachine = true;
+    FLAG_SET_ERGO(bool, NeverActAsServerClassMachine, true);
   }
 #endif
   if (NeverActAsServerClassMachine) {