--- 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;