Mercurial > hg > truffle
diff src/share/vm/graal/graalCompiler.hpp @ 6948:e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Mon, 12 Nov 2012 23:14:12 +0100 |
| parents | fd71ca8c5f88 |
| children | a0f4001cf53c |
line wrap: on
line diff
--- a/src/share/vm/graal/graalCompiler.hpp Mon Nov 12 18:11:17 2012 +0100 +++ b/src/share/vm/graal/graalCompiler.hpp Mon Nov 12 23:14:12 2012 +0100 @@ -70,7 +70,7 @@ // Print compilation timers and statistics virtual void print_timers(); - static Handle get_JavaTypeFromSignature(constantPoolHandle cp, int index, KlassHandle accessor, TRAPS); + static Handle get_JavaTypeFromSignature(Symbol* signature, KlassHandle accessor, TRAPS); static Handle get_JavaType(constantPoolHandle cp, int index, KlassHandle accessor, TRAPS); static Handle get_JavaType(Symbol* klass_name, TRAPS); static Handle get_JavaTypeFromClass(Handle javaClassHandle, TRAPS); @@ -78,8 +78,7 @@ static Handle get_JavaField(int offset, int flags, Symbol* field_name, Handle field_holder, Handle field_type, TRAPS); static Handle createHotSpotResolvedJavaType(KlassHandle klass, Handle name, TRAPS); - static Handle createHotSpotResolvedJavaMethod(methodHandle method, TRAPS); - static Handle createHotSpotMethodData(methodDataHandle method_data, TRAPS); + static Handle createHotSpotResolvedJavaType(methodHandle method, TRAPS); void exit(); @@ -87,7 +86,7 @@ static int to_cp_index_u2(int index) { // Tag. - return to_index_u2(index) + constantPoolOopDesc::CPCACHE_INDEX_TAG; + return to_index_u2(index) + ConstantPool::CPCACHE_INDEX_TAG; } static int to_index_u2(int index) {