comparison src/share/vm/oops/arrayKlass.cpp @ 18041:52b4284cb496

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 89152779163c 386dd1c71858
children eaf39a954227
comparison
equal deleted inserted replaced
17606:45d7b2c7029d 18041:52b4284cb496
1 /* 1 /*
2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1997, 2014, 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.
62 oop ArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) { 62 oop ArrayKlass::multi_allocate(int rank, jint* sizes, TRAPS) {
63 ShouldNotReachHere(); 63 ShouldNotReachHere();
64 return NULL; 64 return NULL;
65 } 65 }
66 66
67 Method* ArrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature) const { 67 Method* ArrayKlass::uncached_lookup_method(Symbol* name, Symbol* signature, MethodLookupMode mode) const {
68 // There are no methods in an array klass but the super class (Object) has some 68 // There are no methods in an array klass but the super class (Object) has some
69 assert(super(), "super klass must be present"); 69 assert(super(), "super klass must be present");
70 return super()->uncached_lookup_method(name, signature); 70 return super()->uncached_lookup_method(name, signature, mode);
71 } 71 }
72 72
73 ArrayKlass::ArrayKlass(Symbol* name) { 73 ArrayKlass::ArrayKlass(Symbol* name) {
74 set_name(name); 74 set_name(name);
75 75
212 } 212 }
213 213
214 214
215 // Verification 215 // Verification
216 216
217 void ArrayKlass::verify_on(outputStream* st, bool check_dictionary) { 217 void ArrayKlass::verify_on(outputStream* st) {
218 Klass::verify_on(st, check_dictionary); 218 Klass::verify_on(st);
219 219
220 if (component_mirror() != NULL) { 220 if (component_mirror() != NULL) {
221 guarantee(component_mirror()->klass() != NULL, "should have a class"); 221 guarantee(component_mirror()->klass() != NULL, "should have a class");
222 } 222 }
223 } 223 }