comparison src/share/vm/ci/ciTypeArrayKlass.cpp @ 6948:e522a00b91aa

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
author Doug Simon <doug.simon@oracle.com>
date Mon, 12 Nov 2012 23:14:12 +0100
parents d8ce2825b193
children
comparison
equal deleted inserted replaced
6711:ae13cc658b80 6948:e522a00b91aa
1 /* 1 /*
2 * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved. 2 * Copyright (c) 1999, 2012, 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.
26 #include "ci/ciTypeArrayKlass.hpp" 26 #include "ci/ciTypeArrayKlass.hpp"
27 #include "ci/ciUtilities.hpp" 27 #include "ci/ciUtilities.hpp"
28 28
29 // ciTypeArrayKlass 29 // ciTypeArrayKlass
30 // 30 //
31 // This class represents a klassOop in the HotSpot virtual machine 31 // This class represents a Klass* in the HotSpot virtual machine
32 // whose Klass part in a TypeArrayKlass. 32 // whose Klass part in a TypeArrayKlass.
33 33
34 // ------------------------------------------------------------------ 34 // ------------------------------------------------------------------
35 // ciTypeArrayKlass::ciTypeArrayKlass 35 // ciTypeArrayKlass::ciTypeArrayKlass
36 ciTypeArrayKlass::ciTypeArrayKlass(KlassHandle h_k) : ciArrayKlass(h_k) { 36 ciTypeArrayKlass::ciTypeArrayKlass(KlassHandle h_k) : ciArrayKlass(h_k) {
37 assert(get_Klass()->oop_is_typeArray(), "wrong type"); 37 assert(get_Klass()->oop_is_typeArray(), "wrong type");
38 assert(element_type() == get_typeArrayKlass()->element_type(), ""); 38 assert(element_type() == get_TypeArrayKlass()->element_type(), "");
39 } 39 }
40 40
41 // ------------------------------------------------------------------ 41 // ------------------------------------------------------------------
42 // ciTypeArrayKlass::make_impl 42 // ciTypeArrayKlass::make_impl
43 // 43 //
44 // Implementation of make. 44 // Implementation of make.
45 ciTypeArrayKlass* ciTypeArrayKlass::make_impl(BasicType t) { 45 ciTypeArrayKlass* ciTypeArrayKlass::make_impl(BasicType t) {
46 klassOop k = Universe::typeArrayKlassObj(t); 46 Klass* k = Universe::typeArrayKlassObj(t);
47 return CURRENT_ENV->get_object(k)->as_type_array_klass(); 47 return CURRENT_ENV->get_type_array_klass(k);
48 } 48 }
49 49
50 // ------------------------------------------------------------------ 50 // ------------------------------------------------------------------
51 // ciTypeArrayKlass::make 51 // ciTypeArrayKlass::make
52 // 52 //