OpenJDK / jdk8u / jdk8u-dev / hotspot
changeset 8646:64fe89b445cd
Merge
| author | kevinw |
|---|---|
| date | Mon, 21 May 2018 13:05:10 +0000 |
| parents | 8d9ad04d908b 77603437bcee |
| children | f2903632450a |
| files | |
| diffstat | 1 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/opto/escape.cpp Mon May 21 03:13:55 2018 -0700 +++ b/src/share/vm/opto/escape.cpp Mon May 21 13:05:10 2018 +0000 @@ -2016,8 +2016,10 @@ // Check for unsafe oop field access for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { int opcode = n->fast_out(i)->Opcode(); - if (opcode == Op_StoreP || opcode == Op_LoadP || - opcode == Op_StoreN || opcode == Op_LoadN) { + if (opcode == Op_StoreP || opcode == Op_StoreN || + opcode == Op_LoadP || opcode == Op_LoadN || + opcode == Op_GetAndSetP || opcode == Op_GetAndSetN || + opcode == Op_CompareAndSwapP || opcode == Op_CompareAndSwapN) { bt = T_OBJECT; (*unsafe) = true; break; @@ -2037,8 +2039,10 @@ // Allocation initialization, ThreadLocal field access, unsafe access for (DUIterator_Fast imax, i = n->fast_outs(imax); i < imax; i++) { int opcode = n->fast_out(i)->Opcode(); - if (opcode == Op_StoreP || opcode == Op_LoadP || - opcode == Op_StoreN || opcode == Op_LoadN) { + if (opcode == Op_StoreP || opcode == Op_StoreN || + opcode == Op_LoadP || opcode == Op_LoadN || + opcode == Op_GetAndSetP || opcode == Op_GetAndSetN || + opcode == Op_CompareAndSwapP || opcode == Op_CompareAndSwapN) { bt = T_OBJECT; break; }