1.1 --- a/src/share/vm/ci/ciReplay.cpp Wed Apr 24 18:20:04 2013 -0400 1.2 +++ b/src/share/vm/ci/ciReplay.cpp Thu Apr 25 11:02:32 2013 -0700 1.3 @@ -89,7 +89,7 @@ 1.4 loader = Handle(thread, SystemDictionary::java_system_loader()); 1.5 stream = fopen(filename, "rt"); 1.6 if (stream == NULL) { 1.7 - fprintf(stderr, "Can't open replay file %s\n", filename); 1.8 + fprintf(stderr, "ERROR: Can't open replay file %s\n", filename); 1.9 } 1.10 buffer_length = 32; 1.11 buffer = NEW_RESOURCE_ARRAY(char, buffer_length); 1.12 @@ -327,7 +327,6 @@ 1.13 if (had_error()) { 1.14 tty->print_cr("Error while parsing line %d: %s\n", line_no, _error_message); 1.15 tty->print_cr("%s", buffer); 1.16 - assert(false, "error"); 1.17 return; 1.18 } 1.19 pos = 0; 1.20 @@ -551,7 +550,7 @@ 1.21 if (parsed_two_word == i) continue; 1.22 1.23 default: 1.24 - ShouldNotReachHere(); 1.25 + fatal(err_msg_res("Unexpected tag: %d", cp->tag_at(i).value())); 1.26 break; 1.27 } 1.28 1.29 @@ -819,6 +818,11 @@ 1.30 ReplaySuppressInitializers = 1; 1.31 } 1.32 1.33 + if (FLAG_IS_DEFAULT(ReplayDataFile)) { 1.34 + tty->print_cr("ERROR: no compiler replay data file specified (use -XX:ReplayDataFile=replay_pid12345.txt)."); 1.35 + return 1; 1.36 + } 1.37 + 1.38 // Load and parse the replay data 1.39 CompileReplay rp(ReplayDataFile, THREAD); 1.40 int exit_code = 0;