comparison src/share/vm/ci/ciType.cpp @ 6988:2cb439954abf

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Gilles Duboscq <duboscq@ssw.jku.at>
date Mon, 19 Nov 2012 15:36:13 +0100
parents 070d523b96a7
children f1de9dbc914e
comparison
equal deleted inserted replaced
6963:dd0dd0321e2a 6988:2cb439954abf
43 assert(basic_type >= T_BOOLEAN && basic_type <= T_CONFLICT, "range check"); 43 assert(basic_type >= T_BOOLEAN && basic_type <= T_CONFLICT, "range check");
44 _basic_type = basic_type; 44 _basic_type = basic_type;
45 } 45 }
46 46
47 ciType::ciType(KlassHandle k) : ciMetadata(k()) { 47 ciType::ciType(KlassHandle k) : ciMetadata(k()) {
48 _basic_type = Klass::cast(k())->oop_is_array() ? T_ARRAY : T_OBJECT; 48 _basic_type = k()->oop_is_array() ? T_ARRAY : T_OBJECT;
49 } 49 }
50 50
51 51
52 // ------------------------------------------------------------------ 52 // ------------------------------------------------------------------
53 // ciType::is_subtype_of 53 // ciType::is_subtype_of