Mercurial > hg > truffle
comparison src/share/vm/ci/ciType.cpp @ 1339:09ac706c2623
Merge
author | asaha |
---|---|
date | Wed, 24 Mar 2010 17:16:33 -0700 |
parents | 4ce7240d622c |
children | c18cbe5936b8 |
comparison
equal
deleted
inserted
replaced
1338:f5dd08ad65df | 1339:09ac706c2623 |
---|---|
109 // Does not work on T_ARRAY. | 109 // Does not work on T_ARRAY. |
110 ciType* ciType::make(BasicType t) { | 110 ciType* ciType::make(BasicType t) { |
111 // short, etc. | 111 // short, etc. |
112 // Note: Bare T_ADDRESS means a raw pointer type, not a return_address. | 112 // Note: Bare T_ADDRESS means a raw pointer type, not a return_address. |
113 assert((uint)t < T_CONFLICT+1, "range check"); | 113 assert((uint)t < T_CONFLICT+1, "range check"); |
114 if (t == T_OBJECT) return ciEnv::_Object; // java/lang/Object | 114 if (t == T_OBJECT) return ciEnv::_Object_klass; // java/lang/Object |
115 assert(_basic_types[t] != NULL, "domain check"); | 115 assert(_basic_types[t] != NULL, "domain check"); |
116 return _basic_types[t]; | 116 return _basic_types[t]; |
117 } | 117 } |
118 | 118 |
119 // ciReturnAddress | 119 // ciReturnAddress |