8346304: SA doesn't need a copy of getModifierFlags

Reviewed-by: sspitsyn, cjplummer

Author: coleenp

src/hotspot/share/runtime/vmStructs.cpp

@@ -2029,8 +2029,6 @@
   /* HotSpot specific JVM_ACC constants from global anon enum */          \
   /************************************************************/          \
                                                                           \
-  declare_constant(JVM_ACC_WRITTEN_FLAGS)                                 \
-                                                                          \
   declare_constant(JVM_CONSTANT_Utf8)                                     \
   declare_constant(JVM_CONSTANT_Unicode)                                  \
   declare_constant(JVM_CONSTANT_Integer)                                  \

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ArrayKlass.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -103,10 +103,6 @@ public int getClassStatus() {
      return JVMDIClassStatus.VERIFIED | JVMDIClassStatus.PREPARED | JVMDIClassStatus.INITIALIZED;
   }
 
-  public long computeModifierFlags() {
-     return JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC;
-  }
-
   public long getArrayHeaderInBytes() {
     return Bits.maskBits(getLayoutHelper() >> LH_HEADER_SIZE_SHIFT, 0xFF);
   }

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/InstanceKlass.java

@@ -434,46 +434,6 @@ private static synchronized void initialize(TypeDataBase db) {
     }
   }
 
-  // refer to compute_modifier_flags in VM code.
-  public long computeModifierFlags() {
-    long access = getAccessFlags();
-    // But check if it happens to be member class.
-    U2Array innerClassList = getInnerClasses();
-    int length = (innerClassList == null)? 0 : innerClassList.length();
-    if (length > 0) {
-       if (Assert.ASSERTS_ENABLED) {
-          Assert.that(length % InnerClassAttributeOffset.innerClassNextOffset == 0 ||
-                      length % InnerClassAttributeOffset.innerClassNextOffset == EnclosingMethodAttributeOffset.enclosingMethodAttributeSize,
-                      "just checking");
-       }
-       for (int i = 0; i < length; i += InnerClassAttributeOffset.innerClassNextOffset) {
-          if (i == length - EnclosingMethodAttributeOffset.enclosingMethodAttributeSize) {
-              break;
-          }
-          int ioff = innerClassList.at(i +
-                         InnerClassAttributeOffset.innerClassInnerClassInfoOffset);
-          // 'ioff' can be zero.
-          // refer to JVM spec. section 4.7.5.
-          if (ioff != 0) {
-             // only look at classes that are already loaded
-             // since we are looking for the flags for our self.
-             Symbol name = getConstants().getKlassNameAt(ioff);
-
-             if (name.equals(getName())) {
-                // This is really a member class
-                access = innerClassList.at(i +
-                        InnerClassAttributeOffset.innerClassAccessFlagsOffset);
-                break;
-             }
-          }
-       } // for inner classes
-    }
-
-    // Remember to strip ACC_SUPER bit
-    return (access & (~JVM_ACC_SUPER)) & JVM_ACC_WRITTEN_FLAGS;
-  }
-
-
   // whether given Symbol is name of an inner/nested Klass of this Klass?
   // anonymous and local classes are excluded.
   public boolean isInnerClassName(Symbol sym) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/Klass.java

@@ -133,23 +133,6 @@ public long traceID() {
     return traceIDField.getJLong(addr);
   }
 
-  // computed access flags - takes care of inner classes etc.
-  // This is closer to actual source level than getAccessFlags() etc.
-  public long computeModifierFlags() {
-    return 0L; // Unless overridden, modifier_flags is 0.
-  }
-
-  // same as JVM_GetClassModifiers
-  public final long getClassModifiers() {
-    // unlike the VM counterpart we never have to deal with primitive type,
-    // because we operator on Klass and not an instance of java.lang.Class.
-    long flags = computeModifierFlags();
-    if (isSuper()) {
-       flags |= JVM_ACC_SUPER;
-    }
-    return flags;
-  }
-
   // subclass check
   public boolean isSubclassOf(Klass k) {
     if (k != null) {

src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/oops/ObjArrayKlass.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -60,19 +60,6 @@ public ObjArrayKlass(Address addr) {
   public Klass getElementKlass() { return (Klass) elementKlass.getValue(this); }
   public Klass getBottomKlass()  { return (Klass) bottomKlass.getValue(this); }
 
-  public long computeModifierFlags() {
-    long elementFlags = getElementKlass().computeModifierFlags();
-    long arrayFlags = 0L;
-    if ((elementFlags & (JVM_ACC_PUBLIC | JVM_ACC_PROTECTED)) != 0) {
-       // The array type is public if the component type is public or protected
-       arrayFlags = JVM_ACC_ABSTRACT | JVM_ACC_FINAL | JVM_ACC_PUBLIC;
-    } else {
-       // The array type is private if the component type is private
-       arrayFlags = JVM_ACC_ABSTRACT | JVM_ACC_FINAL;
-    }
-    return arrayFlags;
-  }
-
   public void iterateFields(MetadataVisitor visitor) {
     super.iterateFields(visitor);
     visitor.doMetadata(elementKlass, true);