1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8209357: [PPC64] Fix build which was broken by 8208672 (Enable -Wreorder)

Browse Source 
Reviewed-by: mbaesken, tschatzl
This commit is contained in:
Gunter Haug 2018-08-13 12:24:25 +02:00
parent 1712e272cd
commit 93c176ef2e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp
View File

@ -39,13 +39,13 @@
RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array) RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index, LIR_Opr array)
: _throw_index_out_of_bounds_exception(false), _index(index), _array(array) { : _index(index), _array(array), _throw_index_out_of_bounds_exception(false) {
assert(info != NULL, "must have info"); assert(info != NULL, "must have info");
_info = new CodeEmitInfo(info); _info = new CodeEmitInfo(info);
} }
RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index) RangeCheckStub::RangeCheckStub(CodeEmitInfo* info, LIR_Opr index)
: _throw_index_out_of_bounds_exception(true), _index(index), _array(NULL) { : _index(index), _array(NULL), _throw_index_out_of_bounds_exception(true) {
assert(info != NULL, "must have info"); assert(info != NULL, "must have info");
_info = new CodeEmitInfo(info); _info = new CodeEmitInfo(info);
} }

6
src/hotspot/cpu/ppc/frame_ppc.hpp
View File

@ -359,13 +359,13 @@
// ... // ...
// //
// frame pointer for this frame
intptr_t* _fp;
// The frame's stack pointer before it has been extended by a c2i adapter; // The frame's stack pointer before it has been extended by a c2i adapter;
// needed by deoptimization // needed by deoptimization
intptr_t* _unextended_sp; intptr_t* _unextended_sp;
// frame pointer for this frame
intptr_t* _fp;
public: public:
// Accessors for fields // Accessors for fields

2
src/hotspot/cpu/ppc/frame_ppc.inline.hpp
View File

@ -55,7 +55,7 @@ inline void frame::find_codeblob_and_set_pc_and_deopt_state(address pc) {
// Constructors // Constructors
// Initialize all fields, _unextended_sp will be adjusted in find_codeblob_and_set_pc_and_deopt_state. // Initialize all fields, _unextended_sp will be adjusted in find_codeblob_and_set_pc_and_deopt_state.
inline frame::frame() : _sp(NULL), _unextended_sp(NULL), _fp(NULL), _cb(NULL), _pc(NULL), _deopt_state(unknown) {} inline frame::frame() : _sp(NULL), _pc(NULL), _cb(NULL), _deopt_state(unknown), _unextended_sp(NULL), _fp(NULL) {}
inline frame::frame(intptr_t* sp) : _sp(sp), _unextended_sp(sp) { inline frame::frame(intptr_t* sp) : _sp(sp), _unextended_sp(sp) {
find_codeblob_and_set_pc_and_deopt_state((address)own_abi()->lr); // also sets _fp and adjusts _unextended_sp find_codeblob_and_set_pc_and_deopt_state((address)own_abi()->lr); // also sets _fp and adjusts _unextended_sp