[GR-36219] Fix failing JCK class redefine test

PullRequest: graal/10748

Author: javeleon

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/classfile/attributes/ConstantValueAttribute.java

@@ -62,7 +62,7 @@ public boolean sameAs(Attribute other) {
         if (other == null || getClass() != other.getClass()) {
             return false;
         }
-        if (!super.equals(other)) {
+        if (!super.sameAs(other)) {
             return false;
         }
         ConstantValueAttribute that = (ConstantValueAttribute) other;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/classfile/attributes/MethodParametersAttribute.java

@@ -76,7 +76,7 @@ public boolean sameAs(Attribute other) {
         if (other == null || getClass() != other.getClass()) {
             return false;
         }
-        if (!super.equals(other)) {
+        if (!super.sameAs(other)) {
             return false;
         }
         MethodParametersAttribute that = (MethodParametersAttribute) other;

espresso/src/com.oracle.truffle.espresso/src/com/oracle/truffle/espresso/redefinition/ClassRedefinition.java

@@ -41,6 +41,7 @@
 import com.oracle.truffle.espresso.classfile.ClassfileParser;
 import com.oracle.truffle.espresso.classfile.ClassfileStream;
 import com.oracle.truffle.espresso.classfile.ConstantPool;
+import com.oracle.truffle.espresso.classfile.Constants;
 import com.oracle.truffle.espresso.classfile.attributes.CodeAttribute;
 import com.oracle.truffle.espresso.classfile.attributes.LineNumberTableAttribute;
 import com.oracle.truffle.espresso.classfile.attributes.Local;
@@ -626,7 +627,7 @@ private static boolean isSameMethod(ParserMethod oldMethod, ParserMethod newMeth
     private static boolean isUnchangedField(Field oldField, ParserField newField, Map<ParserField, Field> compatibleFields) {
         boolean sameName = oldField.getName() == newField.getName();
         boolean sameType = oldField.getType() == newField.getType();
-        boolean sameFlags = oldField.getModifiers() == newField.getFlags();
+        boolean sameFlags = oldField.getModifiers() == (newField.getFlags() & Constants.JVM_RECOGNIZED_FIELD_MODIFIERS);
 
         if (sameName && sameType) {
             if (sameFlags) {