Mercurial > hg > truffle
comparison src/share/vm/ci/ciInstanceKlass.cpp @ 12355:cefad50507d8
Merge with hs25-b53
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Fri, 11 Oct 2013 10:38:03 +0200 |
parents | 836a62f43af9 b2e698d2276c |
children | 096c224171c4 |
comparison
equal
deleted
inserted
replaced
12058:ccb4f2af2319 | 12355:cefad50507d8 |
---|---|
1 /* | 1 /* |
2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. | 2 * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | 4 * |
5 * This code is free software; you can redistribute it and/or modify it | 5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as | 6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. | 7 * published by the Free Software Foundation. |
520 fields->appendAll(super_fields); | 520 fields->appendAll(super_fields); |
521 } | 521 } |
522 | 522 |
523 for (JavaFieldStream fs(k); !fs.done(); fs.next()) { | 523 for (JavaFieldStream fs(k); !fs.done(); fs.next()) { |
524 if (fs.access_flags().is_static()) continue; | 524 if (fs.access_flags().is_static()) continue; |
525 fieldDescriptor fd; | 525 fieldDescriptor& fd = fs.field_descriptor(); |
526 fd.initialize(k, fs.index()); | |
527 ciField* field = new (arena) ciField(&fd); | 526 ciField* field = new (arena) ciField(&fd); |
528 fields->append(field); | 527 fields->append(field); |
529 } | 528 } |
530 assert(fields->length() == flen, "sanity"); | 529 assert(fields->length() == flen, "sanity"); |
531 return fields; | 530 return fields; |