1.1 --- a/src/share/vm/runtime/fieldDescriptor.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/runtime/fieldDescriptor.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved.
1.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 *
1.9 * This code is free software; you can redistribute it and/or modify it
1.10 @@ -25,9 +25,7 @@
1.11 #ifndef SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP
1.12 #define SHARE_VM_RUNTIME_FIELDDESCRIPTOR_HPP
1.13
1.14 -#include "oops/constantPoolOop.hpp"
1.15 -#include "oops/klassOop.hpp"
1.16 -#include "oops/oop.inline.hpp"
1.17 +#include "oops/constantPool.hpp"
1.18 #include "oops/symbol.hpp"
1.19 #include "runtime/fieldType.hpp"
1.20 #include "utilities/accessFlags.hpp"
1.21 @@ -45,12 +43,12 @@
1.22
1.23 // update the access_flags for the field in the klass
1.24 void update_klass_field_access_flag() {
1.25 - instanceKlass* ik = instanceKlass::cast(field_holder());
1.26 + InstanceKlass* ik = InstanceKlass::cast(field_holder());
1.27 ik->field(index())->set_access_flags(_access_flags.as_short());
1.28 }
1.29
1.30 FieldInfo* field() const {
1.31 - instanceKlass* ik = instanceKlass::cast(field_holder());
1.32 + InstanceKlass* ik = InstanceKlass::cast(field_holder());
1.33 return ik->field(_index);
1.34 }
1.35
1.36 @@ -61,15 +59,15 @@
1.37 Symbol* signature() const {
1.38 return field()->signature(_cp);
1.39 }
1.40 - klassOop field_holder() const { return _cp->pool_holder(); }
1.41 - constantPoolOop constants() const { return _cp(); }
1.42 + Klass* field_holder() const { return _cp->pool_holder(); }
1.43 + ConstantPool* constants() const { return _cp(); }
1.44 AccessFlags access_flags() const { return _access_flags; }
1.45 oop loader() const;
1.46 - // Offset (in words) of field from start of instanceOop / klassOop
1.47 + // Offset (in words) of field from start of instanceOop / Klass*
1.48 int offset() const { return field()->offset(); }
1.49 Symbol* generic_signature() const;
1.50 int index() const { return _index; }
1.51 - typeArrayOop annotations() const;
1.52 + AnnotationArray* annotations() const;
1.53
1.54 // Initial field value
1.55 bool has_initial_value() const { return field()->initval_index() != 0; }
1.56 @@ -113,7 +111,7 @@
1.57 }
1.58
1.59 // Initialization
1.60 - void initialize(klassOop k, int index);
1.61 + void initialize(InstanceKlass* ik, int index);
1.62
1.63 // Print
1.64 void print() { print_on(tty); }
