equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. |
7 * published by the Free Software Foundation. |
53 assert(nativeInstruction_at(pc+4)->is_movk() |
53 assert(nativeInstruction_at(pc+4)->is_movk() |
54 && nativeInstruction_at(pc+8)->is_movk(), "wrong insn in patch"); |
54 && nativeInstruction_at(pc+8)->is_movk(), "wrong insn in patch"); |
55 } |
55 } |
56 } |
56 } |
57 #endif // ASSERT |
57 #endif // ASSERT |
58 Handle obj = HotSpotObjectConstantImpl::object(constant); |
58 Handle obj(THREAD, HotSpotObjectConstantImpl::object(constant)); |
59 jobject value = JNIHandles::make_local(obj()); |
59 jobject value = JNIHandles::make_local(obj()); |
60 MacroAssembler::patch_oop(pc, (address)obj()); |
60 MacroAssembler::patch_oop(pc, (address)obj()); |
61 int oop_index = _oop_recorder->find_index(value); |
61 int oop_index = _oop_recorder->find_index(value); |
62 RelocationHolder rspec = oop_Relocation::spec(oop_index); |
62 RelocationHolder rspec = oop_Relocation::spec(oop_index); |
63 _instructions->relocate(pc, rspec); |
63 _instructions->relocate(pc, rspec); |