Mercurial > hg > truffle

comparison src/share/vm/runtime/sharedRuntime.hpp @ 14442:1174c8abbdb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Thu, 05 Dec 2013 15:13:12 -0800
parents cfd05ec74089 570aaefce624
children abec000618bf a9becfeecd1b
comparison
equal deleted inserted replaced
14441:e7cbc95179c4 14442:1174c8abbdb6
54 bool is_optimized, TRAPS); 54 bool is_optimized, TRAPS);
55 55
56 // Shared stub locations 56 // Shared stub locations
57 57
58 static RuntimeStub* _wrong_method_blob; 58 static RuntimeStub* _wrong_method_blob;
59 static RuntimeStub* _wrong_method_abstract_blob;
59 static RuntimeStub* _ic_miss_blob; 60 static RuntimeStub* _ic_miss_blob;
60 static RuntimeStub* _resolve_opt_virtual_call_blob; 61 static RuntimeStub* _resolve_opt_virtual_call_blob;
61 static RuntimeStub* _resolve_virtual_call_blob; 62 static RuntimeStub* _resolve_virtual_call_blob;
62 static RuntimeStub* _resolve_static_call_blob; 63 static RuntimeStub* _resolve_static_call_blob;
63 64
204 static address get_handle_wrong_method_stub() { 205 static address get_handle_wrong_method_stub() {
205 assert(_wrong_method_blob!= NULL, "oops"); 206 assert(_wrong_method_blob!= NULL, "oops");
206 return _wrong_method_blob->entry_point(); 207 return _wrong_method_blob->entry_point();
207 } 208 }
208 209
210 static address get_handle_wrong_method_abstract_stub() {
211 assert(_wrong_method_abstract_blob!= NULL, "oops");
212 return _wrong_method_abstract_blob->entry_point();
213 }
214
209 #ifdef COMPILER2 215 #ifdef COMPILER2
210 static void generate_uncommon_trap_blob(void); 216 static void generate_uncommon_trap_blob(void);
211 static UncommonTrapBlob* uncommon_trap_blob() { return _uncommon_trap_blob; } 217 static UncommonTrapBlob* uncommon_trap_blob() { return _uncommon_trap_blob; }
212 #endif // COMPILER2 218 #endif // COMPILER2
213 219
497 jint length, JavaThread* thread); 503 jint length, JavaThread* thread);
498 504
499 // handle ic miss with caller being compiled code 505 // handle ic miss with caller being compiled code
500 // wrong method handling (inline cache misses, zombie methods) 506 // wrong method handling (inline cache misses, zombie methods)
501 static address handle_wrong_method(JavaThread* thread); 507 static address handle_wrong_method(JavaThread* thread);
508 static address handle_wrong_method_abstract(JavaThread* thread);
502 static address handle_wrong_method_ic_miss(JavaThread* thread); 509 static address handle_wrong_method_ic_miss(JavaThread* thread);
503 510
504 #ifndef PRODUCT 511 #ifndef PRODUCT
505 512
506 // Collect and print inline cache miss statistics 513 // Collect and print inline cache miss statistics