Mercurial > hg > truffle
comparison src/share/vm/runtime/fieldDescriptor.cpp @ 7482:989155e2d07a
Merge with hs25-b15.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Wed, 16 Jan 2013 01:34:24 +0100 |
parents | 35431a769282 |
children | 927a311d00f9 |
comparison
equal
deleted
inserted
replaced
7381:6761a8f854a4 | 7482:989155e2d07a |
---|---|
58 } | 58 } |
59 | 59 |
60 AnnotationArray* fieldDescriptor::annotations() const { | 60 AnnotationArray* fieldDescriptor::annotations() const { |
61 InstanceKlass* ik = field_holder(); | 61 InstanceKlass* ik = field_holder(); |
62 Array<AnnotationArray*>* md = ik->fields_annotations(); | 62 Array<AnnotationArray*>* md = ik->fields_annotations(); |
63 if (md == NULL) | |
64 return NULL; | |
65 return md->at(index()); | |
66 } | |
67 | |
68 AnnotationArray* fieldDescriptor::type_annotations() const { | |
69 InstanceKlass* ik = field_holder(); | |
70 Annotations* type_annos = ik->type_annotations(); | |
71 if (type_annos == NULL) | |
72 return NULL; | |
73 Array<AnnotationArray*>* md = type_annos->fields_annotations(); | |
63 if (md == NULL) | 74 if (md == NULL) |
64 return NULL; | 75 return NULL; |
65 return md->at(index()); | 76 return md->at(index()); |
66 } | 77 } |
67 | 78 |