Mercurial > hg > truffle
diff 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 |
line wrap: on
line diff
--- a/src/share/vm/shark/sharkBuilder.cpp Thu Aug 01 21:34:57 2013 +0200 +++ b/src/share/vm/shark/sharkBuilder.cpp Mon Aug 05 13:20:06 2013 +0200 @@ -471,7 +471,7 @@ Value* SharkBuilder::CreateInlineMetadata(Metadata* metadata, llvm::PointerType* type, const char* name) { assert(metadata != NULL, "inlined metadata must not be NULL"); - assert(metadata->is_metadata(), "sanity check"); + assert(metadata->is_metaspace_object(), "sanity check"); return CreateLoad( CreateIntToPtr( code_buffer_address(code_buffer()->inline_Metadata(metadata)),