Skip to content
Permalink
Browse files
8247590: [lworld] JVM_ACC_FIELD_INLINED clashes with ENUM
  • Loading branch information
David Simms committed Jun 15, 2020
1 parent ad38a9f commit 246ac15992e68ff1e20e50563b2eae3a2a721456
Showing 4 changed files with 4 additions and 4 deletions.
@@ -86,7 +86,7 @@ enum {
JVM_ACC_FIELD_STABLE = 0x00000020, // @Stable field, same as JVM_ACC_SYNCHRONIZED and JVM_ACC_SUPER
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_INLINED = 0x00004000, // field is inlined
JVM_ACC_FIELD_INLINED = 0x00008000, // field is inlined

JVM_ACC_FIELD_INTERNAL_FLAGS = JVM_ACC_FIELD_ACCESS_WATCHED |
JVM_ACC_FIELD_MODIFICATION_WATCHED |
@@ -458,7 +458,7 @@ public boolean isNative() {
static final int SYNTHETIC = 0x00001000;
static final int ANNOTATION = 0x00002000;
static final int ENUM = 0x00004000;
static final int FLATTENED = 0x00004000;
static final int FLATTENED = 0x00008000;

/** Utility method to query the modifier flags of this member; returns false if the member is not a method. */
public boolean isBridge() {
@@ -332,7 +332,7 @@ public static String toString(int mod) {
static final int ANNOTATION = 0x00002000;
static final int ENUM = 0x00004000;
static final int MANDATED = 0x00008000;
static final int FLATTENED = 0x00004000; // HotSpot-specific bit
static final int FLATTENED = 0x00008000; // HotSpot-specific bit
static boolean isSynthetic(int mod) {
return (mod & SYNTHETIC) != 0;
}
@@ -177,7 +177,7 @@ public static Unsafe getUnsafe() {
@HotSpotIntrinsicCandidate
public native void putInt(Object o, long offset, int x);

private static final int JVM_ACC_FIELD_INLINED = 0x00004000; // HotSpot-specific bit
private static final int JVM_ACC_FIELD_INLINED = 0x00008000; // HotSpot-specific bit

/**
* Returns true if the given field is flattened.

0 comments on commit 246ac15

Please sign in to comment.