diff options
author | coleenp <none@none> | 2013-02-11 14:06:22 -0500 |
---|---|---|
committer | coleenp <none@none> | 2013-02-11 14:06:22 -0500 |
commit | 3aa574cd27d1304d0054ada64fcfaf80b79485a9 (patch) | |
tree | f8401592efdcacbfc1bd9766bd3f10c6d4afab84 /src/share/vm/runtime/fieldDescriptor.cpp | |
parent | 6b09a1ab189768bca5e37bb5c433fbf0c6fcf813 (diff) | |
download | jdk8u_hotspot-3aa574cd27d1304d0054ada64fcfaf80b79485a9.tar.gz |
8007320: NPG: move method annotations
Summary: allocate method annotations and attach to ConstMethod if present
Reviewed-by: dcubed, jiangli, sspitsyn, iklam
Diffstat (limited to 'src/share/vm/runtime/fieldDescriptor.cpp')
-rw-r--r-- | src/share/vm/runtime/fieldDescriptor.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/share/vm/runtime/fieldDescriptor.cpp b/src/share/vm/runtime/fieldDescriptor.cpp index 54a225a5f..23d679494 100644 --- a/src/share/vm/runtime/fieldDescriptor.cpp +++ b/src/share/vm/runtime/fieldDescriptor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -67,13 +67,10 @@ AnnotationArray* fieldDescriptor::annotations() const { AnnotationArray* fieldDescriptor::type_annotations() const { InstanceKlass* ik = field_holder(); - Annotations* type_annos = ik->type_annotations(); + Array<AnnotationArray*>* type_annos = ik->fields_type_annotations(); if (type_annos == NULL) return NULL; - Array<AnnotationArray*>* md = type_annos->fields_annotations(); - if (md == NULL) - return NULL; - return md->at(index()); + return type_annos->at(index()); } constantTag fieldDescriptor::initial_value_tag() const { |