Mercurial > hg > graal-jvmci-8
diff src/share/vm/compiler/oopMap.hpp @ 23974:f13e777eb255
Merge with jdk8u111-b14
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Wed, 16 Nov 2016 12:32:54 -0800 |
| parents | c28cb37b2e1d 626f594dffa6 |
| children | 52b62eee9e3d |
line wrap: on
line diff
--- a/src/share/vm/compiler/oopMap.hpp Wed Nov 09 14:41:57 2016 -0800 +++ b/src/share/vm/compiler/oopMap.hpp Wed Nov 16 12:32:54 2016 -0800 @@ -74,8 +74,8 @@ // Constructors OopMapValue () { set_value(0); set_content_reg(VMRegImpl::Bad()); } - OopMapValue (VMReg reg, oop_types t) { set_reg_type(reg,t); } - OopMapValue (VMReg reg, oop_types t, VMReg reg2) { set_reg_type(reg,t); set_content_reg(reg2); } + OopMapValue (VMReg reg, oop_types t) { set_reg_type(reg, t); set_content_reg(VMRegImpl::Bad()); } + OopMapValue (VMReg reg, oop_types t, VMReg reg2) { set_reg_type(reg, t); set_content_reg(reg2); } OopMapValue (CompressedReadStream* stream) { read_from(stream); } // Archiving @@ -88,7 +88,7 @@ void read_from(CompressedReadStream* stream) { set_value(stream->read_int()); - if(is_callee_saved() || is_derived_oop()) { + if (is_callee_saved() || is_derived_oop()) { set_content_reg(VMRegImpl::as_VMReg(stream->read_int(), true)); } }