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

Merge with jdk8u20-b26
author Gilles Duboscq <duboscq@ssw.jku.at>
date Wed, 15 Oct 2014 16:02:50 +0200
parents 562643f42b65 a18dafb24f80
children 7848fc12602b
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.
672 } 672 }
673 673
674 674
675 // Verification 675 // Verification
676 676
677 void ObjArrayKlass::verify_on(outputStream* st, bool check_dictionary) { 677 void ObjArrayKlass::verify_on(outputStream* st) {
678 ArrayKlass::verify_on(st, check_dictionary); 678 ArrayKlass::verify_on(st);
679 guarantee(element_klass()->is_klass(), "should be klass"); 679 guarantee(element_klass()->is_klass(), "should be klass");
680 guarantee(bottom_klass()->is_klass(), "should be klass"); 680 guarantee(bottom_klass()->is_klass(), "should be klass");
681 Klass* bk = bottom_klass(); 681 Klass* bk = bottom_klass();
682 guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(), "invalid bottom klass"); 682 guarantee(bk->oop_is_instance() || bk->oop_is_typeArray(), "invalid bottom klass");
683 } 683 }