refactoring of acmp data profiling interface

Author: MichaelHaas99

src/hotspot/share/jvmci/jvmciCompilerToVM.cpp

@@ -494,10 +494,10 @@ C2V_VMENTRY_NULL(jobject, getResolvedJavaType0, (JNIEnv* env, jobject, jobject b
       }
     } else if (JVMCIENV->isa_HotSpotMethodData(base_object)) {
       jlong base_address = (intptr_t) JVMCIENV->asMethodData(base_object);
-      Klass* temp = *((Klass**) (intptr_t) (base_address + offset));
-      temp = (Klass*)(((uintptr_t) temp)& WordAlignmentMask);
-      klass = temp;
-      //klass = *((Klass**) (intptr_t) (base_address + offset));
+      intptr_t temp = (intptr_t) *((Klass**) (intptr_t) (base_address + offset));
+      // clear the bits used for acmp data profiling
+      clear_bits(temp, 0b011);
+      klass = (Klass*) temp;
       if (klass == nullptr || !klass->is_loader_alive()) {
         // Klasses in methodData might be concurrently unloading so return null in that case.
         return nullptr;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/ACmpDataAccessor.java

@@ -7,8 +7,4 @@ public interface ACmpDataAccessor {
 
     void setDeoptClassCheck();
     void setDeoptNullCheck();
-
-    static ACmpDataAccessor create(){
-        return new HotSpotMethodData.ACmpData.ACmpDataAccessorImpl();
-    }
 }

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/HotSpotMethodData.java

@@ -737,74 +737,58 @@ public StringBuilder appendTo(StringBuilder sb, HotSpotMethodData data, int pos)
     static class ACmpData extends BranchData {
 
         abstract static class SingleTypeEntryImpl implements SingleTypeEntry {
-            final long value;
-            final int flags;
-            final VMState state;
-            HotSpotResolvedObjectType validType;
-            boolean maybeNull;
-            boolean neverNull;
-            boolean alwaysNull;
-            boolean inlineType;
+            private final long value;
+            private final VMState state;
+            private HotSpotResolvedObjectType validType;
+            private boolean maybeNull;
+            private boolean neverNull;
+            private boolean alwaysNull;
+            private boolean inlineType;
 
             final static long nullSeen =1;
             final static long typeMask = ~nullSeen;
             final static long typeUnknown = 2;
-            final static long statusBits = nullSeen | typeUnknown;
-            final static long typeKlassMask = ~statusBits;
 
             SingleTypeEntryImpl(ACmpData aCmpData, HotSpotMethodData data, int position) {
                 this.state = aCmpData.state;
-                this.flags = aCmpData.getFlags(data, position);
                 this.value = data.readPointer(position, getOperandOffset());
+
                 int offset = state.computeFullOffset(position, getOperandOffset());
-                this.validType = computeValidType(data, offset);
-                if(!wasNullSeen()){
+                this.validType = computeValidType(this.value, data, offset);
+
+                if(!wasNullSeen(this.value)){
                     this.neverNull = true;
-                }else if(isTypeNone()){
+                }else if(isTypeNone(this.value)){
                     this.alwaysNull = true;
                 }else{
                     this.maybeNull = true;
                 }
-                this.inlineType =(flags & getInlineFlag()) !=0;
-            }
 
-            SingleTypeEntryImpl() {
-                this.value = 0;
-                this.state = null;
-                this.flags = 0;
-                this.validType = null;
-                this.maybeNull = wasNullSeen() && !isTypeNone();
-                this.neverNull = !wasNullSeen();
-                this.alwaysNull= isTypeNone();
-                this.inlineType =false;
+                int flags = aCmpData.getFlags(data, position);
+                this.inlineType =(flags & getInlineFlag()) !=0;
             }
 
             abstract int getOperandOffset();
             abstract int getInlineFlag();
 
+            protected VMState getState(){
+                return state;
+            }
 
-            @Override
-            public boolean isTypeNone(){
+            private static boolean isTypeNone(long value){
                 return (value & typeMask) == 0;
             }
 
-            @Override
-            public boolean isTypeUnknown(){
+            private static  boolean isTypeUnknown(long value){
                 return (value & typeUnknown) != 0;
             }
 
-            @Override
-            public boolean wasNullSeen(){
+            private static  boolean wasNullSeen(long value){
                 return (value & nullSeen) != 0;
             }
 
-            @Override
-            public long klassPart(){
-                return value & typeKlassMask;
-            }
-
-            private HotSpotResolvedObjectType computeValidType(HotSpotMethodData data, int offset){
-                if(!isTypeNone() && ! isTypeUnknown()){
+            private HotSpotResolvedObjectType computeValidType(long value, HotSpotMethodData data, int offset){
+                if(!isTypeNone(value) && ! isTypeUnknown(value)){
                     return compilerToVM().getResolvedJavaType(data, offset);
                 }else{
                     return null;
@@ -858,16 +842,14 @@ static class LeftSingleTypeEntryImpl extends SingleTypeEntryImpl {
                 super(aCmpData, data, position);
             }
 
-            LeftSingleTypeEntryImpl(){}
-
             @Override
             int getOperandOffset(){
-                return state.leftOperandOffset;
+                return getState().leftOperandOffset;
             }
 
             @Override
             int getInlineFlag(){
-                return state.leftInlineTypeFlag;
+                return getState().leftInlineTypeFlag;
             }
         }
 
@@ -877,16 +859,14 @@ static class RightSingleTypeEntryImpl extends SingleTypeEntryImpl {
                 super(aCmpData, data, position);
             }
 
-            RightSingleTypeEntryImpl(){}
-
             @Override
             int getOperandOffset(){
-                return state.rightOperandOffset;
+                return getState().rightOperandOffset;
             }
 
             @Override
             int getInlineFlag(){
-                return state.rightInlineTypeFlag;
+                return getState().rightInlineTypeFlag;
             }
         }
 
@@ -900,23 +880,6 @@ static class ACmpDataAccessorImpl implements ACmpDataAccessor{
                 right = aCmpData.getRight(aCmpData, data, position);
             }
 
-            ACmpDataAccessorImpl(){
-//                left = new SingleTypeEntryImpl(1, false, null, 0);
-//                right = new SingleTypeEntryImpl(1, false, null, 0);
-                left = new LeftSingleTypeEntryImpl(){
-                    @Override
-                    int getInlineFlag() {
-                        return 0;
-                    }
-                };
-                right = new RightSingleTypeEntryImpl(){
-                    @Override
-                    int getInlineFlag() {
-                        return 0;
-                    }
-                };
-            }
-
             @Override
             public SingleTypeEntry getLeft() {
                 return left;

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/hotspot/SingleTypeEntry.java

@@ -3,14 +3,6 @@
 public interface SingleTypeEntry{
 
 
-    boolean isTypeNone();
-
-    boolean isTypeUnknown();
-
-    boolean wasNullSeen();
-
-    long klassPart();
-
     HotSpotResolvedObjectType getValidType();
 
     boolean maybeNull();

src/jdk.internal.vm.ci/share/classes/jdk/vm/ci/meta/DefaultProfilingInfo.java

@@ -71,7 +71,6 @@ public TriState getExceptionSeen(int bci) {
 
     @Override
     public ACmpDataAccessor getACmpData(int bci) {
-        //return ACmpDataAccessor.create();
         return null;
     }