Mercurial > hg > truffle

diff src/share/vm/memory/space.cpp @ 20276:1526a938e670

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8047818: G1 HeapRegions can no longer be ContiguousSpaces Summary: Change parent of G1OffsetTableContigSpace to CompactibleSpace, reimplement missing functionality Reviewed-by: stefank, jmasa, tschatzl
author mgerdin
date Thu, 26 Jun 2014 11:36:58 +0200
parents ff1e37e7eb83
children ee019285a52c
line wrap: on
line diff
--- a/src/share/vm/memory/space.cpp	Thu Jun 26 13:20:18 2014 +0200
+++ b/src/share/vm/memory/space.cpp	Thu Jun 26 11:36:58 2014 +0200
@@ -684,14 +684,8 @@
 // This version requires locking.
 inline HeapWord* ContiguousSpace::allocate_impl(size_t size,
                                                 HeapWord* const end_value) {
-  // In G1 there are places where a GC worker can allocates into a
-  // region using this serial allocation code without being prone to a
-  // race with other GC workers (we ensure that no other GC worker can
-  // access the same region at the same time). So the assert below is
-  // too strong in the case of G1.
   assert(Heap_lock->owned_by_self() ||
-         (SafepointSynchronize::is_at_safepoint() &&
-                               (Thread::current()->is_VM_thread() || UseG1GC)),
+         (SafepointSynchronize::is_at_safepoint() && Thread::current()->is_VM_thread()),
          "not locked");
   HeapWord* obj = top();
   if (pointer_delta(end_value, obj) >= size) {