8209357: [PPC64] Fix build which was broken by 8208672 (Enable -Wreorder)
Reviewed-by: mbaesken, tschatzl
--- a/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp Mon Aug 13 12:24:25 2018 +0200
+++ b/src/hotspot/cpu/ppc/c1_CodeStubs_ppc.cpp Mon Aug 13 12:24:25 2018 +0200
@@ -39,13 +39,13 @@
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");
_info = new CodeEmitInfo(info);
}
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");
_info = new CodeEmitInfo(info);
}
--- a/src/hotspot/cpu/ppc/frame_ppc.hpp Mon Aug 13 12:24:25 2018 +0200
+++ b/src/hotspot/cpu/ppc/frame_ppc.hpp Mon Aug 13 12:24:25 2018 +0200
@@ -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;
// needed by deoptimization
intptr_t* _unextended_sp;
+ // frame pointer for this frame
+ intptr_t* _fp;
+
public:
// Accessors for fields
--- a/src/hotspot/cpu/ppc/frame_ppc.inline.hpp Mon Aug 13 12:24:25 2018 +0200
+++ b/src/hotspot/cpu/ppc/frame_ppc.inline.hpp Mon Aug 13 12:24:25 2018 +0200
@@ -55,7 +55,7 @@
// Constructors
// 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) {
find_codeblob_and_set_pc_and_deopt_state((address)own_abi()->lr); // also sets _fp and adjusts _unextended_sp