# HG changeset patch
# User lucy
# Date 1534249703 -7200
# Node ID c9150700bbd07e16ae0e2499d116afc65809653c
# Parent  38ec0cea438ea9031e492a30b7ea18a51a052064
8209433: [s390] Fix build, broken by 8208672 (Enable -Wreorder)
Reviewed-by: tschatzl, shade

diff -r 38ec0cea438e -r c9150700bbd0 src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp
--- a/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp	Mon Aug 13 09:19:21 2018 -0700
+++ b/src/hotspot/cpu/s390/c1_CodeStubs_s390.cpp	Tue Aug 14 14:28:23 2018 +0200
@@ -41,13 +41,13 @@
 #define CHECK_BAILOUT() { if (ce->compilation()->bailed_out()) return; }
 
 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);
 }
diff -r 38ec0cea438e -r c9150700bbd0 src/hotspot/cpu/s390/frame_s390.hpp
--- a/src/hotspot/cpu/s390/frame_s390.hpp	Mon Aug 13 09:19:21 2018 -0700
+++ b/src/hotspot/cpu/s390/frame_s390.hpp	Tue Aug 14 14:28:23 2018 +0200
@@ -444,12 +444,12 @@
 
   // NOTE: Stack pointer is now held in the base class, so remove it from here.
 
+  // Needed by deoptimization.
+  intptr_t* _unextended_sp;
+
   // Frame pointer for this frame.
   intptr_t* _fp;
 
-  // Needed by deoptimization.
-  intptr_t* _unextended_sp;
-
  public:
 
   // Interface for all frames:
diff -r 38ec0cea438e -r c9150700bbd0 src/hotspot/cpu/s390/frame_s390.inline.hpp
--- a/src/hotspot/cpu/s390/frame_s390.inline.hpp	Mon Aug 13 09:19:21 2018 -0700
+++ b/src/hotspot/cpu/s390/frame_s390.inline.hpp	Tue Aug 14 14:28:23 2018 +0200
@@ -54,7 +54,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()->return_pc);
@@ -71,7 +71,7 @@
 // Generic constructor. Used by pns() in debug.cpp only
 #ifndef PRODUCT
 inline frame::frame(void* sp, void* pc, void* unextended_sp) :
-  _sp((intptr_t*)sp), _unextended_sp((intptr_t*)unextended_sp), _cb(NULL), _pc(NULL) {
+  _sp((intptr_t*)sp), _pc(NULL), _cb(NULL), _unextended_sp((intptr_t*)unextended_sp) {
   find_codeblob_and_set_pc_and_deopt_state((address)pc); // Also sets _fp and adjusts _unextended_sp.
 }
 #endif