archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 03:54:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

7092236: java/util/EnumSet/EnumSetBash.java fails

Browse source 
Reviewed-by: kvn, twisti, jrose
This commit is contained in:
Tom Rodriguez 2011-09-20 23:50:16 -07:00
parent a46128d0dd
commit 52f0eccb24
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

30
hotspot/src/share/vm/ci/ciEnv.cpp
View file

@ -910,27 +910,37 @@ void ciEnv::validate_compile_task_dependencies(ciMethod* target) {
// dependencies were inserted. Any violated dependences in this // dependencies were inserted. Any violated dependences in this
// case are dumped to the tty. // case are dumped to the tty.
bool counter_changed = system_dictionary_modification_counter_changed(); bool counter_changed = system_dictionary_modification_counter_changed();
bool test_deps = counter_changed;
DEBUG_ONLY(test_deps = true);
if (!test_deps) return;
bool print_failures = false; bool verify_deps = trueInDebug;
DEBUG_ONLY(print_failures = !counter_changed); if (!counter_changed && !verify_deps) return;
bool keep_going = (print_failures || xtty != NULL);
int klass_violations = 0; int klass_violations = 0;
for (Dependencies::DepStream deps(dependencies()); deps.next(); ) { for (Dependencies::DepStream deps(dependencies()); deps.next(); ) {
if (!deps.is_klass_type()) continue; // skip non-klass dependencies if (!deps.is_klass_type()) continue; // skip non-klass dependencies
klassOop witness = deps.check_dependency(); klassOop witness = deps.check_dependency();
if (witness != NULL) { if (witness != NULL) {
klass_violations++; klass_violations++;
if (print_failures) deps.print_dependency(witness, /*verbose=*/ true); if (!counter_changed) {
// Dependence failed but counter didn't change. Log a message
// describing what failed and allow the assert at the end to
// trigger.
deps.print_dependency(witness);
} else if (xtty == NULL) {
// If we're not logging then a single violation is sufficient,
// otherwise we want to log all the dependences which were
// violated.
break;
}
} }
// If there's no log and we're not sanity-checking, we're done.
if (!keep_going) break;
} }
if (klass_violations != 0) { if (klass_violations != 0) {
#ifdef ASSERT
if (!counter_changed && !PrintCompilation) {
// Print out the compile task that failed
_task->print_line();
}
#endif
assert(counter_changed, "failed dependencies, but counter didn't change"); assert(counter_changed, "failed dependencies, but counter didn't change");
record_failure("concurrent class loading"); record_failure("concurrent class loading");
} }