Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > hotspot

changeset 7440:e71997fba947

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reverted some non-critical parts of last changeset.
author Roman Kennke <rkennke@redhat.com>
date Thu, 11 Dec 2014 11:59:43 +0100
parents 21d3b0133d61
children a9af91e95a19
files src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp src/share/vm/oops/instanceKlass.cpp
diffstat 2 files changed, 1 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp	Wed Dec 10 17:18:53 2014 +0100
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp	Thu Dec 11 11:59:43 2014 +0100
@@ -151,12 +151,6 @@
       // yield();
     }
   }
-
-  // Release any threads waiting for full-gc. We won't do it ;-)
-  MonitorLockerEx ml(ShenandoahFullGC_lock);
-  _do_full_gc = false;
-  ml.notify_all();
-
 }
 
 void ShenandoahConcurrentThread::do_full_gc() {
--- a/src/share/vm/oops/instanceKlass.cpp	Wed Dec 10 17:18:53 2014 +0100
+++ b/src/share/vm/oops/instanceKlass.cpp	Thu Dec 11 11:59:43 2014 +0100
@@ -2516,7 +2516,7 @@
 }
 
 address InstanceKlass::static_field_addr(int offset) {
-  return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(oopDesc::bs()->resolve_and_maybe_copy_oop(java_mirror())));
+  return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(java_mirror()));
 }