diff src/share/vm/c1x/c1x_JavaAccess.cpp @ 2182:9569fdf936ff

Made merge compile.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Wed, 16 Feb 2011 14:21:52 +0100
parents cf75612bdaa5
children 999f8086cc4f
line wrap: on
line diff
--- a/src/share/vm/c1x/c1x_JavaAccess.cpp	Wed Feb 16 13:47:20 2011 +0100
+++ b/src/share/vm/c1x/c1x_JavaAccess.cpp	Wed Feb 16 14:21:52 2011 +0100
@@ -29,8 +29,8 @@
 // It looks up the name and signature symbols without creating new ones, all the symbols of these classes need to be already loaded.
 
 static void compute_offset(int &dest_offset, klassOop klass_oop, const char* name, const char* signature, bool static_field) {
-  symbolOop name_symbol = SymbolTable::probe(name, strlen(name));
-  symbolOop signature_symbol = SymbolTable::probe(signature, strlen(signature));
+  Symbol* name_symbol = SymbolTable::probe(name, strlen(name));
+  Symbol* signature_symbol = SymbolTable::probe(signature, strlen(signature));
 #ifdef DEBUG
   if (name_symbol == NULL) {
     tty->print_cr("symbol with name %s was not found in symbol table (klass=%s)", name, klass_oop->klass_part()->name()->as_C_string());