8209193: Fix aarch64-linux compilation after -Wreorder changes
Reviewed-by: shade, drwhite
diff --git a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
index 3018a31..ec03e2b 100644
--- a/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/assembler_aarch64.hpp
@@ -295,7 +295,7 @@
int _offset;
Register _r;
public:
- PrePost(Register reg, int o) : _r(reg), _offset(o) { }
+ PrePost(Register reg, int o) : _offset(o), _r(reg) { }
int offset() { return _offset; }
Register reg() { return _r; }
};
@@ -353,7 +353,7 @@
ext::operation _op;
public:
extend() { }
- extend(int s, int o, ext::operation op) : _shift(s), _option(o), _op(op) { }
+ extend(int s, int o, ext::operation op) : _option(o), _shift(s), _op(op) { }
int option() const{ return _option; }
int shift() const { return _shift; }
ext::operation op() const { return _op; }
@@ -398,26 +398,25 @@
Address()
: _mode(no_mode) { }
Address(Register r)
- : _mode(base_plus_offset), _base(r), _offset(0), _index(noreg), _target(0) { }
+ : _base(r), _index(noreg), _offset(0), _mode(base_plus_offset), _target(0) { }
Address(Register r, int o)
- : _mode(base_plus_offset), _base(r), _offset(o), _index(noreg), _target(0) { }
+ : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, long o)
- : _mode(base_plus_offset), _base(r), _offset(o), _index(noreg), _target(0) { }
+ : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
Address(Register r, unsigned long o)
- : _mode(base_plus_offset), _base(r), _offset(o), _index(noreg), _target(0) { }
+ : _base(r), _index(noreg), _offset(o), _mode(base_plus_offset), _target(0) { }
#ifdef ASSERT
Address(Register r, ByteSize disp)
- : _mode(base_plus_offset), _base(r), _offset(in_bytes(disp)),
- _index(noreg), _target(0) { }
+ : _base(r), _index(noreg), _offset(in_bytes(disp)), _mode(base_plus_offset), _target(0) { }
#endif
Address(Register r, Register r1, extend ext = lsl())
- : _mode(base_plus_offset_reg), _base(r), _index(r1),
- _ext(ext), _offset(0), _target(0) { }
+ : _base(r), _index(r1), _offset(0), _mode(base_plus_offset_reg),
+ _ext(ext), _target(0) { }
Address(Pre p)
- : _mode(pre), _base(p.reg()), _offset(p.offset()) { }
+ : _base(p.reg()), _offset(p.offset()), _mode(pre) { }
Address(Post p)
- : _mode(p.idx_reg() == NULL ? post : post_reg), _base(p.reg()),
- _offset(p.offset()), _target(0), _index(p.idx_reg()) { }
+ : _base(p.reg()), _index(p.idx_reg()), _offset(p.offset()),
+ _mode(p.idx_reg() == NULL ? post : post_reg), _target(0) { }
Address(address target, RelocationHolder const& rspec)
: _mode(literal),
_rspec(rspec),
@@ -426,7 +425,7 @@
Address(address target, relocInfo::relocType rtype = relocInfo::external_word_type);
Address(Register base, RegisterOrConstant index, extend ext = lsl())
: _base (base),
- _ext(ext), _offset(0), _target(0) {
+ _offset(0), _ext(ext), _target(0) {
if (index.is_register()) {
_mode = base_plus_offset_reg;
_index = index.as_register();
diff --git a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
index fca142f..09f5ded 100644
--- a/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_CodeStubs_aarch64.cpp
@@ -50,13 +50,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);
}
diff --git a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
index 0c1c73d..0435561 100644
--- a/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
@@ -1152,12 +1152,12 @@
public:
MoveOperation(int src_index, VMRegPair src, int dst_index, VMRegPair dst):
_src(src)
- , _src_index(src_index)
, _dst(dst)
+ , _src_index(src_index)
, _dst_index(dst_index)
+ , _processed(false)
, _next(NULL)
- , _prev(NULL)
- , _processed(false) { Unimplemented(); }
+ , _prev(NULL) { Unimplemented(); }
VMRegPair src() const { Unimplemented(); return _src; }
int src_id() const { Unimplemented(); return 0; }
