Mercurial > hg > truffle
comparison src/share/vm/ci/ciObjectFactory.cpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | 6b0fd0964b87 |
children | cefad50507d8 |
comparison
equal
deleted
inserted
replaced
11197:3479ab380552 | 11198:1e6d5dec4a4e |
---|---|
262 // Get the ciObject corresponding to some oop. If the ciObject has | 262 // Get the ciObject corresponding to some oop. If the ciObject has |
263 // already been created, it is returned. Otherwise, a new ciObject | 263 // already been created, it is returned. Otherwise, a new ciObject |
264 // is created. | 264 // is created. |
265 ciMetadata* ciObjectFactory::get_metadata(Metadata* key) { | 265 ciMetadata* ciObjectFactory::get_metadata(Metadata* key) { |
266 ASSERT_IN_VM; | 266 ASSERT_IN_VM; |
267 | |
268 assert(key == NULL || key->is_metadata(), "must be"); | |
269 | 267 |
270 #ifdef ASSERT | 268 #ifdef ASSERT |
271 if (CIObjectFactoryVerify) { | 269 if (CIObjectFactoryVerify) { |
272 Metadata* last = NULL; | 270 Metadata* last = NULL; |
273 for (int j = 0; j< _ci_metadata->length(); j++) { | 271 for (int j = 0; j< _ci_metadata->length(); j++) { |