Merge pull request #4536 from 0xdaryl/fej9

Move getClassDepthAndFlagsValue to TR_J9VMBase
eclipse-openj9 · Feb 1, 2019 · c27b410 · c27b410
2 parents b167041 + 9ff4d9f
commit c27b410
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/runtime/compiler/env/VMJ9.cpp b/runtime/compiler/env/VMJ9.cpp
@@ -6691,7 +6691,7 @@ TR_J9VMBase::hasFinalizer(TR_OpaqueClassBlock * classPointer)
    }
 
 uintptrj_t
-TR_J9VM::getClassDepthAndFlagsValue(TR_OpaqueClassBlock * classPointer)
+TR_J9VMBase::getClassDepthAndFlagsValue(TR_OpaqueClassBlock * classPointer)
    {
    return (TR::Compiler->cls.convertClassOffsetToClassPtr(classPointer)->classDepthAndFlags);
    }

diff --git a/runtime/compiler/env/VMJ9.h b/runtime/compiler/env/VMJ9.h
@@ -240,6 +240,7 @@ class TR_J9VMBase : public TR_FrontEnd
 /////
    virtual bool isGetImplInliningSupported();
 
+   virtual uintptrj_t getClassDepthAndFlagsValue(TR_OpaqueClassBlock * classPointer);
 
    virtual bool isAbstractClass(TR_OpaqueClassBlock * clazzPointer);
    virtual bool isCloneable(TR_OpaqueClassBlock *);
@@ -1036,7 +1037,6 @@ class TR_J9VM : public TR_J9VMBase
    virtual bool               isPublicClass(TR_OpaqueClassBlock *clazz);
    virtual TR_OpaqueMethodBlock *getMethodFromName(char * className, char *methodName, char *signature, TR_OpaqueMethodBlock *callingMethod);
    virtual TR_OpaqueMethodBlock *getMethodFromName(char * className, char *methodName, char *signature);
-   virtual uintptrj_t         getClassDepthAndFlagsValue(TR_OpaqueClassBlock * classPointer);
 
    virtual TR_OpaqueClassBlock * getComponentClassFromArrayClass(TR_OpaqueClassBlock * arrayClass);
    virtual TR_OpaqueClassBlock * getArrayClassFromComponentClass(TR_OpaqueClassBlock *componentClass);