1.1 --- a/src/share/vm/classfile/javaClasses.hpp Thu Sep 08 10:12:25 2011 +0200
1.2 +++ b/src/share/vm/classfile/javaClasses.hpp Thu Sep 08 05:11:31 2011 -0700
1.3 @@ -771,7 +771,7 @@
1.4 ref->obj_field_put(referent_offset, value);
1.5 }
1.6 static void set_referent_raw(oop ref, oop value) {
1.7 - ref->obj_field_raw_put(referent_offset, value);
1.8 + ref->obj_field_put_raw(referent_offset, value);
1.9 }
1.10 static HeapWord* referent_addr(oop ref) {
1.11 return ref->obj_field_addr<HeapWord>(referent_offset);
1.12 @@ -783,7 +783,7 @@
1.13 ref->obj_field_put(next_offset, value);
1.14 }
1.15 static void set_next_raw(oop ref, oop value) {
1.16 - ref->obj_field_raw_put(next_offset, value);
1.17 + ref->obj_field_put_raw(next_offset, value);
1.18 }
1.19 static HeapWord* next_addr(oop ref) {
1.20 return ref->obj_field_addr<HeapWord>(next_offset);
1.21 @@ -795,7 +795,7 @@
1.22 ref->obj_field_put(discovered_offset, value);
1.23 }
1.24 static void set_discovered_raw(oop ref, oop value) {
1.25 - ref->obj_field_raw_put(discovered_offset, value);
1.26 + ref->obj_field_put_raw(discovered_offset, value);
1.27 }
1.28 static HeapWord* discovered_addr(oop ref) {
1.29 return ref->obj_field_addr<HeapWord>(discovered_offset);
1.30 @@ -1163,14 +1163,17 @@
1.31
1.32 public:
1.33 // Accessors
1.34 - static oop target(oop site);
1.35 - static void set_target(oop site, oop target);
1.36 + static oop target( oop site) { return site->obj_field( _target_offset); }
1.37 + static void set_target( oop site, oop target) { site->obj_field_put( _target_offset, target); }
1.38
1.39 - static oop caller_method(oop site);
1.40 - static void set_caller_method(oop site, oop ref);
1.41 + static volatile oop target_volatile(oop site) { return site->obj_field_volatile( _target_offset); }
1.42 + static void set_target_volatile(oop site, oop target) { site->obj_field_put_volatile(_target_offset, target); }
1.43
1.44 - static jint caller_bci(oop site);
1.45 - static void set_caller_bci(oop site, jint bci);
1.46 + static oop caller_method(oop site);
1.47 + static void set_caller_method(oop site, oop ref);
1.48 +
1.49 + static jint caller_bci(oop site);
1.50 + static void set_caller_bci(oop site, jint bci);
1.51
1.52 // Testers
1.53 static bool is_subclass(klassOop klass) {
