1.1 --- a/src/share/vm/runtime/javaCalls.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/runtime/javaCalls.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -200,7 +200,7 @@
1.4
1.5 // ============ Virtual calls ============
1.6
1.7 -void JavaCalls::call_virtual(JavaValue* result, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) {
1.8 +void JavaCalls::call_virtual(JavaValue* result, KlassHandle spec_klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
1.9 CallInfo callinfo;
1.10 Handle receiver = args->receiver();
1.11 KlassHandle recvrKlass(THREAD, receiver.is_null() ? (klassOop)NULL : receiver->klass());
1.12 @@ -215,13 +215,13 @@
1.13 }
1.14
1.15
1.16 -void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, TRAPS) {
1.17 +void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, TRAPS) {
1.18 JavaCallArguments args(receiver); // One oop argument
1.19 call_virtual(result, spec_klass, name, signature, &args, CHECK);
1.20 }
1.21
1.22
1.23 -void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) {
1.24 +void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) {
1.25 JavaCallArguments args(receiver); // One oop argument
1.26 args.push_oop(arg1);
1.27 call_virtual(result, spec_klass, name, signature, &args, CHECK);
1.28 @@ -229,7 +229,7 @@
1.29
1.30
1.31
1.32 -void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) {
1.33 +void JavaCalls::call_virtual(JavaValue* result, Handle receiver, KlassHandle spec_klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) {
1.34 JavaCallArguments args(receiver); // One oop argument
1.35 args.push_oop(arg1);
1.36 args.push_oop(arg2);
1.37 @@ -239,7 +239,7 @@
1.38
1.39 // ============ Special calls ============
1.40
1.41 -void JavaCalls::call_special(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) {
1.42 +void JavaCalls::call_special(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
1.43 CallInfo callinfo;
1.44 LinkResolver::resolve_special_call(callinfo, klass, name, signature, KlassHandle(), false, CHECK);
1.45 methodHandle method = callinfo.selected_method();
1.46 @@ -250,20 +250,20 @@
1.47 }
1.48
1.49
1.50 -void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
1.51 +void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
1.52 JavaCallArguments args(receiver); // One oop argument
1.53 call_special(result, klass, name, signature, &args, CHECK);
1.54 }
1.55
1.56
1.57 -void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) {
1.58 +void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) {
1.59 JavaCallArguments args(receiver); // One oop argument
1.60 args.push_oop(arg1);
1.61 call_special(result, klass, name, signature, &args, CHECK);
1.62 }
1.63
1.64
1.65 -void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) {
1.66 +void JavaCalls::call_special(JavaValue* result, Handle receiver, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) {
1.67 JavaCallArguments args(receiver); // One oop argument
1.68 args.push_oop(arg1);
1.69 args.push_oop(arg2);
1.70 @@ -273,7 +273,7 @@
1.71
1.72 // ============ Static calls ============
1.73
1.74 -void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, JavaCallArguments* args, TRAPS) {
1.75 +void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, JavaCallArguments* args, TRAPS) {
1.76 CallInfo callinfo;
1.77 LinkResolver::resolve_static_call(callinfo, klass, name, signature, KlassHandle(), false, true, CHECK);
1.78 methodHandle method = callinfo.selected_method();
1.79 @@ -284,19 +284,19 @@
1.80 }
1.81
1.82
1.83 -void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, TRAPS) {
1.84 +void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, TRAPS) {
1.85 JavaCallArguments args; // No argument
1.86 call_static(result, klass, name, signature, &args, CHECK);
1.87 }
1.88
1.89
1.90 -void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, TRAPS) {
1.91 +void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, TRAPS) {
1.92 JavaCallArguments args(arg1); // One oop argument
1.93 call_static(result, klass, name, signature, &args, CHECK);
1.94 }
1.95
1.96
1.97 -void JavaCalls::call_static(JavaValue* result, KlassHandle klass, symbolHandle name, symbolHandle signature, Handle arg1, Handle arg2, TRAPS) {
1.98 +void JavaCalls::call_static(JavaValue* result, KlassHandle klass, Symbol* name, Symbol* signature, Handle arg1, Handle arg2, TRAPS) {
1.99 JavaCallArguments args; // One oop argument
1.100 args.push_oop(arg1);
1.101 args.push_oop(arg2);
1.102 @@ -459,7 +459,7 @@
1.103 public:
1.104 bool _is_return;
1.105
1.106 - SignatureChekker(symbolHandle signature, BasicType return_type, bool is_static, bool* is_oop, intptr_t* value, Thread* thread) : SignatureIterator(signature) {
1.107 + SignatureChekker(Symbol* signature, BasicType return_type, bool is_static, bool* is_oop, intptr_t* value, Thread* thread) : SignatureIterator(signature) {
1.108 _is_oop = is_oop;
1.109 _is_return = false;
1.110 _return_type = return_type;
1.111 @@ -550,7 +550,7 @@
1.112 if (return_type == T_ARRAY) return_type = T_OBJECT;
1.113
1.114 // Check that oop information is correct
1.115 - symbolHandle signature (thread, method->signature());
1.116 + Symbol* signature = method->signature();
1.117
1.118 SignatureChekker sc(signature, return_type, method->is_static(),_is_oop, _value, thread);
1.119 sc.iterate_parameters();
