# HG changeset patch
# User stefank
# Date 1415788448 0
# Node ID d44a81242b1e653f4cf41b886b9a0929615132ab
# Parent  706dce84c9df329876cdfdca6f2c8edf4663c439# Parent  a28b7832203af6ef04e88a76146c3408c09abd2a
Merge

diff -r a28b7832203a -r d44a81242b1e src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp
--- a/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Fri Nov 07 15:34:33 2014 -0800
+++ b/src/share/vm/gc_implementation/g1/g1CollectedHeap.cpp	Wed Nov 12 10:34:08 2014 +0000
@@ -5228,7 +5228,9 @@
   }
 
   void pre_work_verification() {
-    assert(!MetadataOnStackMark::has_buffer_for_thread(Thread::current()), "Should be empty");
+    // The VM Thread will have registered Metadata during the single-threaded phase of MetadataStackOnMark.
+    assert(Thread::current()->is_VM_thread()
+           || !MetadataOnStackMark::has_buffer_for_thread(Thread::current()), "Should be empty");
   }
 
   void post_work_verification() {