Mercurial > hg > truffle
comparison src/share/vm/shark/sharkBuilder.cpp @ 11198:1e6d5dec4a4e
Merge.
author | Christian Humer <christian.humer@gmail.com> |
---|---|
date | Mon, 05 Aug 2013 13:20:06 +0200 |
parents | e0c9a1d29eb4 |
children | de6a9e811145 |
comparison
equal
deleted
inserted
replaced
11197:3479ab380552 | 11198:1e6d5dec4a4e |
---|---|
469 name); | 469 name); |
470 } | 470 } |
471 | 471 |
472 Value* SharkBuilder::CreateInlineMetadata(Metadata* metadata, llvm::PointerType* type, const char* name) { | 472 Value* SharkBuilder::CreateInlineMetadata(Metadata* metadata, llvm::PointerType* type, const char* name) { |
473 assert(metadata != NULL, "inlined metadata must not be NULL"); | 473 assert(metadata != NULL, "inlined metadata must not be NULL"); |
474 assert(metadata->is_metadata(), "sanity check"); | 474 assert(metadata->is_metaspace_object(), "sanity check"); |
475 return CreateLoad( | 475 return CreateLoad( |
476 CreateIntToPtr( | 476 CreateIntToPtr( |
477 code_buffer_address(code_buffer()->inline_Metadata(metadata)), | 477 code_buffer_address(code_buffer()->inline_Metadata(metadata)), |
478 PointerType::getUnqual(type)), | 478 PointerType::getUnqual(type)), |
479 name); | 479 name); |