# HG changeset patch
# User dcubed
# Date 1295451699 28800
# Node ID c1a0ede55d6f61b414a52da40befb92c439a4568
# Parent  633a44a9fc45e2e1322b3e023dd696208f71791a
7012493: 2/2 6849574/Test.java fails with Internal Error (src/share/vm/prims/jvmtiTagMap.cpp:3294)
Summary: Refine assertion to work before VMThread has started.
Reviewed-by: ysr, never, dholmes, acorn

diff -r 633a44a9fc45 -r c1a0ede55d6f src/share/vm/prims/jvmtiTagMap.cpp
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Wed Jan 19 07:15:09 2011 -0800
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Wed Jan 19 07:41:39 2011 -0800
@@ -3290,7 +3290,11 @@
 
 
 void JvmtiTagMap::weak_oops_do(BoolObjectClosure* is_alive, OopClosure* f) {
-  assert(SafepointSynchronize::is_at_safepoint(),
+  // No locks during VM bring-up (0 threads) and no safepoints after main
+  // thread creation and before VMThread creation (1 thread); initial GC
+  // verification can happen in that window which gets to here.
+  assert(Threads::number_of_threads() <= 1 ||
+         SafepointSynchronize::is_at_safepoint(),
          "must be executed at a safepoint");
   if (JvmtiEnv::environments_might_exist()) {
     JvmtiEnvIterator it;