OpenJDK / valhalla / valhalla
changeset 49469:4d1e8489a000 lworld
Fix flag definition conflict
| author | fparain |
|---|---|
| date | Thu, 12 Apr 2018 09:26:53 -0400 |
| parents | 7e2ff89e3bc3 |
| children | edb20ed58f7a |
| files | src/hotspot/share/utilities/accessFlags.hpp |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/share/utilities/accessFlags.hpp Fri Apr 06 13:13:51 2018 -0400 +++ b/src/hotspot/share/utilities/accessFlags.hpp Thu Apr 12 09:26:53 2018 -0400 @@ -82,7 +82,7 @@ JVM_ACC_FIELD_MODIFICATION_WATCHED = 0x00008000, // field modification is watched by JVMTI JVM_ACC_FIELD_INTERNAL = 0x00000400, // internal field, same as JVM_ACC_ABSTRACT JVM_ACC_FIELD_STABLE = 0x00000020, // @Stable field, same as JVM_ACC_SYNCHRONIZED and JVM_ACC_SUPER - JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE = 0x00000400, // (static) final field updated outside (class) initializer, same as JVM_ACC_NATIVE + JVM_ACC_FIELD_INITIALIZED_FINAL_UPDATE = 0x00000200, // (static) final field updated outside (class) initializer, same as JVM_ACC_NATIVE JVM_ACC_FIELD_HAS_GENERIC_SIGNATURE = 0x00000800, // field has generic signature JVM_ACC_FIELD_INTERNAL_FLAGS = JVM_ACC_FIELD_ACCESS_WATCHED |