--- a/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Fri Sep 18 13:41:24 2015 +0200
+++ b/hotspot/src/cpu/aarch64/vm/c1_CodeStubs_aarch64.cpp Wed Oct 21 11:40:05 2015 +0200
@@ -41,7 +41,9 @@
void CounterOverflowStub::emit_code(LIR_Assembler* ce) {
__ bind(_entry);
- ce->store_parameter(_method->as_register(), 1);
+ Metadata *m = _method->as_constant_ptr()->as_metadata();
+ __ mov_metadata(rscratch1, m);
+ ce->store_parameter(rscratch1, 1);
ce->store_parameter(_bci, 0);
__ far_call(RuntimeAddress(Runtime1::entry_for(Runtime1::counter_overflow_id)));
ce->add_call_info_here(_info);