Mercurial > hg > graal-compiler
diff src/share/vm/classfile/systemDictionary.cpp @ 6822:f6b0eb4e44cf
7200949: JSR 292: rubybench/bench/time/bench_base64.rb fails with jruby.jar not on boot class path
Reviewed-by: jrose, kvn
| author | twisti |
|---|---|
| date | Mon, 01 Oct 2012 14:50:10 -0700 |
| parents | 2a48c84f1d04 |
| children | 6e5a59a8e4a7 65d07d9ee446 dd2b66d09ccd |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.cpp Fri Sep 28 14:36:20 2012 -0700 +++ b/src/share/vm/classfile/systemDictionary.cpp Mon Oct 01 14:50:10 2012 -0700 @@ -2429,7 +2429,8 @@ methodHandle SystemDictionary::find_method_handle_invoker(Symbol* name, Symbol* signature, KlassHandle accessing_klass, - Handle* appendix_result, + Handle *appendix_result, + Handle *method_type_result, TRAPS) { methodHandle empty; assert(EnableInvokeDynamic, ""); @@ -2461,6 +2462,7 @@ vmSymbols::linkMethod_signature(), &args, CHECK_(empty)); Handle mname(THREAD, (oop) result.get_jobject()); + (*method_type_result) = method_type; return unpack_method_and_appendix(mname, appendix_box, appendix_result, THREAD); } @@ -2607,7 +2609,8 @@ Handle bootstrap_specifier, Symbol* name, Symbol* type, - Handle* appendix_result, + Handle *appendix_result, + Handle *method_type_result, TRAPS) { methodHandle empty; Handle bsm, info; @@ -2650,6 +2653,7 @@ vmSymbols::linkCallSite_signature(), &args, CHECK_(empty)); Handle mname(THREAD, (oop) result.get_jobject()); + (*method_type_result) = method_type; return unpack_method_and_appendix(mname, appendix_box, appendix_result, THREAD); }