Mercurial > hg > truffle

comparison src/share/vm/runtime/vmThread.cpp @ 1490:f03d0a26bf83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6888954: argument formatting for assert() and friends Reviewed-by: kvn, twisti, apetrusenko, never, dcubed
author jcoomes
date Thu, 22 Apr 2010 13:23:15 -0700
parents cff162798819
children c18cbe5936b8
comparison
equal deleted inserted replaced
1489:cff162798819 1490:f03d0a26bf83
591 VM_Operation* prev_vm_operation = vm_operation(); 591 VM_Operation* prev_vm_operation = vm_operation();
592 if (prev_vm_operation != NULL) { 592 if (prev_vm_operation != NULL) {
593 // Check the VM operation allows nested VM operation. This normally not the case, e.g., the compiler 593 // Check the VM operation allows nested VM operation. This normally not the case, e.g., the compiler
594 // does not allow nested scavenges or compiles. 594 // does not allow nested scavenges or compiles.
595 if (!prev_vm_operation->allow_nested_vm_operations()) { 595 if (!prev_vm_operation->allow_nested_vm_operations()) {
596 fatal2("Nested VM operation %s requested by operation %s", op->name(), vm_operation()->name()); 596 fatal(err_msg("Nested VM operation %s requested by operation %s",
597 op->name(), vm_operation()->name()));
597 } 598 }
598 op->set_calling_thread(prev_vm_operation->calling_thread(), prev_vm_operation->priority()); 599 op->set_calling_thread(prev_vm_operation->calling_thread(), prev_vm_operation->priority());
599 } 600 }
600 601
601 EventMark em("Executing %s VM operation: %s", prev_vm_operation ? "nested" : "", op->name()); 602 EventMark em("Executing %s VM operation: %s", prev_vm_operation ? "nested" : "", op->name());