Mercurial > hg > graal-jvmci-8

comparison src/share/vm/c1x/c1x_Compiler.cpp @ 2182:9569fdf936ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made merge compile.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 14:21:52 +0100
parents 99ad52189524
children 999f8086cc4f
comparison
equal deleted inserted replaced
2181:d25d4ca69222 2182:9569fdf936ff
119 } 119 }
120 KlassHandle klass = (klassOop) type->get_oop(); 120 KlassHandle klass = (klassOop) type->get_oop();
121 Handle name = VmIds::toString<Handle>(klass->name(), THREAD); 121 Handle name = VmIds::toString<Handle>(klass->name(), THREAD);
122 return createHotSpotTypeResolved(klass, name, CHECK_NULL); 122 return createHotSpotTypeResolved(klass, name, CHECK_NULL);
123 } else { 123 } else {
124 symbolOop name = ((ciKlass *) type)->name()->get_symbolOop(); 124 Symbol* name = ((ciKlass *) type)->name()->get_symbol();
125 return VMExits::createRiTypeUnresolved(VmIds::toString<Handle>(name, THREAD), THREAD); 125 return VMExits::createRiTypeUnresolved(VmIds::toString<Handle>(name, THREAD), THREAD);
126 } 126 }
127 } 127 }
128 128
129 oop C1XCompiler::get_RiField(ciField *field, ciInstanceKlass* accessor_klass, KlassHandle accessor, Bytecodes::Code byteCode, TRAPS) { 129 oop C1XCompiler::get_RiField(ciField *field, ciInstanceKlass* accessor_klass, KlassHandle accessor, Bytecodes::Code byteCode, TRAPS) {
130 bool will_link = field->will_link_from_vm(accessor_klass, byteCode); 130 bool will_link = field->will_link_from_vm(accessor_klass, byteCode);
131 int offset = (field->holder()->is_loaded() && will_link) ? field->offset() : -1; 131 int offset = (field->holder()->is_loaded() && will_link) ? field->offset() : -1;
132 Handle field_name = VmIds::toString<Handle>(field->name()->get_symbolOop(), CHECK_0); 132 Handle field_name = VmIds::toString<Handle>(field->name()->get_symbol(), CHECK_0);
133 Handle field_holder = get_RiType(field->holder(), accessor, CHECK_0); 133 Handle field_holder = get_RiType(field->holder(), accessor, CHECK_0);
134 Handle field_type = get_RiType(field->type(), accessor, CHECK_0); 134 Handle field_type = get_RiType(field->type(), accessor, CHECK_0);
135 135
136 // TODO: implement caching 136 // TODO: implement caching
137 return VMExits::createRiField(field_holder, field_name, field_type, offset, THREAD); 137 return VMExits::createRiField(field_holder, field_name, field_type, offset, THREAD);