Mercurial > hg > truffle

comparison src/share/vm/graal/graalCompilerToVM.cpp @ 4461:539fca6a3b98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Christian Haeubl <christian.haeubl@oracle.com>
date Thu, 02 Feb 2012 16:07:52 -0800
parents 48756b901156 b4b16e4e043f
children f400f9554f09
comparison
equal deleted inserted replaced
4460:b9e6576eefe7 4461:539fca6a3b98
376 TRACE_graal_3("CompilerToVM::RiConstantPool_loadReferencedType"); 376 TRACE_graal_3("CompilerToVM::RiConstantPool_loadReferencedType");
377 VM_ENTRY_MARK; 377 VM_ENTRY_MARK;
378 378
379 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants(); 379 constantPoolOop cp = instanceKlass::cast(java_lang_Class::as_klassOop(HotSpotTypeResolved::javaMirror(type)))->constants();
380 int byteCode = (op & 0xFF); 380 int byteCode = (op & 0xFF);
381 if (byteCode != Bytecodes::_checkcast && byteCode != Bytecodes::_instanceof && byteCode != Bytecodes::_new && byteCode != Bytecodes::_anewarray && byteCode != Bytecodes::_multianewarray) { 381 if (byteCode != Bytecodes::_checkcast && byteCode != Bytecodes::_instanceof && byteCode != Bytecodes::_new && byteCode != Bytecodes::_anewarray
382 && byteCode != Bytecodes::_multianewarray && byteCode != Bytecodes::_ldc && byteCode != Bytecodes::_ldc_w && byteCode != Bytecodes::_ldc2_w)
383 {
382 index = cp->remap_instruction_operand_from_cache(GraalCompiler::to_cp_index_u2(index)); 384 index = cp->remap_instruction_operand_from_cache(GraalCompiler::to_cp_index_u2(index));
383 } 385 }
384 constantTag tag = cp->tag_at(index); 386 constantTag tag = cp->tag_at(index);
385 if (tag.is_field_or_method()) { 387 if (tag.is_field_or_method()) {
386 index = cp->uncached_klass_ref_index_at(index); 388 index = cp->uncached_klass_ref_index_at(index);