1.1 --- a/src/share/vm/oops/fieldInfo.hpp Fri Aug 31 16:39:35 2012 -0700
1.2 +++ b/src/share/vm/oops/fieldInfo.hpp Sat Sep 01 13:25:18 2012 -0400
1.3 @@ -1,5 +1,5 @@
1.4 /*
1.5 - * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
1.6 + * Copyright (c) 2011, 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,14 +25,15 @@
1.11 #ifndef SHARE_VM_OOPS_FIELDINFO_HPP
1.12 #define SHARE_VM_OOPS_FIELDINFO_HPP
1.13
1.14 +#include "oops/constantPool.hpp"
1.15 #include "oops/typeArrayOop.hpp"
1.16 #include "classfile/vmSymbols.hpp"
1.17
1.18 // This class represents the field information contained in the fields
1.19 -// array of an instanceKlass. Currently it's laid on top an array of
1.20 +// array of an InstanceKlass. Currently it's laid on top an array of
1.21 // Java shorts but in the future it could simply be used as a real
1.22 // array type. FieldInfo generally shouldn't be used directly.
1.23 -// Fields should be queried either through instanceKlass or through
1.24 +// Fields should be queried either through InstanceKlass or through
1.25 // the various FieldStreams.
1.26 class FieldInfo VALUE_OBJ_CLASS_SPEC {
1.27 friend class fieldDescriptor;
1.28 @@ -65,8 +66,8 @@
1.29 u2 initval_index() const { return _shorts[initval_index_offset]; }
1.30
1.31 public:
1.32 - static FieldInfo* from_field_array(typeArrayOop fields, int index) {
1.33 - return ((FieldInfo*)fields->short_at_addr(index * field_slots));
1.34 + static FieldInfo* from_field_array(Array<u2>* fields, int index) {
1.35 + return ((FieldInfo*)fields->adr_at(index * field_slots));
1.36 }
1.37 static FieldInfo* from_field_array(u2* fields, int index) {
1.38 return ((FieldInfo*)(fields + index * field_slots));
