Mercurial > hg > graal-jvmci-8

changeset 20633:d44a81242b1e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author stefank
date Wed, 12 Nov 2014 10:34:08 +0000
parents 706dce84c9df (diff) a28b7832203a (current diff)
children ab72a2f48aef 643d6baecfe1
files test/runtime/NMT/UnsafeMallocLimit.java test/runtime/NMT/UnsafeMallocLimit2.java
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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() {