changeset 40056:6bdd3da90181

8160898: assert while replaying ciReplay file created using TieredStopAtLevel=1 Summary: Use highest available tier if no compilation level is specified in replay file. Reviewed-by: zmajo
author thartmann
date Tue, 12 Jul 2016 08:57:00 +0200
parents 34d785a46283
children b4441f6cfe79
files hotspot/src/share/vm/ci/ciReplay.cpp hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/ci/ciReplay.cpp	Mon Jul 11 19:15:21 2016 +0000
+++ b/hotspot/src/share/vm/ci/ciReplay.cpp	Tue Jul 12 08:57:00 2016 +0200
@@ -490,7 +490,8 @@
     int comp_level = parse_int(comp_level_label);
     // old version w/o comp_level
     if (had_error() && (error_message() == comp_level_label)) {
-      comp_level = CompLevel_full_optimization;
+      // use highest available tier
+      comp_level = TieredCompilation ? TieredStopAtLevel : CompLevel_highest_tier;
     }
     if (!is_valid_comp_level(comp_level)) {
       return;
--- a/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh	Mon Jul 11 19:15:21 2016 +0000
+++ b/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh	Tue Jul 12 08:57:00 2016 +0200
@@ -29,7 +29,6 @@
 ## @summary testing of ciReplay with using generated by VM replay.txt w/o comp_level
 ## @author igor.ignatyev@oracle.com
 ## @requires vm.flightRecorder != true
-## @ignore 8157984
 ## @run shell TestVM_no_comp_level.sh
 ##