Remove TR::X86UnresolvedVirtualCallSnippet

...and the corresponding IsUnresolvedVirtualCall enumerator. This OpenJ9-specific type is unused. The declaration of its TR_Debug::print method is retained for the moment to avoid breaking builds. Signed-off-by: Devin Papineau <devinmp@ca.ibm.com>
eclipse-omr · Feb 14, 2019 · ad18d5d · ad18d5d
1 parent 7f1faa9
commit ad18d5d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 22 deletions.
diff --git a/compiler/ras/Debug.hpp b/compiler/ras/Debug.hpp
@@ -148,7 +148,7 @@ namespace TR { class X86FPConvertToLongSnippet; }
 namespace TR { class X86GuardedDevirtualSnippet; }
 namespace TR { class X86HelperCallSnippet; }
 namespace TR { class UnresolvedDataSnippet; }
-namespace TR { class X86UnresolvedVirtualCallSnippet; }
+namespace TR { class X86UnresolvedVirtualCallSnippet; } // TODO: delete
 namespace TR { class AMD64Imm64Instruction;    }
 namespace TR { class AMD64Imm64SymInstruction; }
 namespace TR { class AMD64RegImm64Instruction; }
@@ -833,7 +833,7 @@ class TR_Debug
 #ifdef J9_PROJECT_SPECIFIC
    void print(TR::FILE *, TR::X86CallSnippet *);
    void print(TR::FILE *, TR::X86PicDataSnippet *);
-   void print(TR::FILE *, TR::X86UnresolvedVirtualCallSnippet *);
+   void print(TR::FILE *, TR::X86UnresolvedVirtualCallSnippet *); // TODO: delete
    void print(TR::FILE *, TR::IA32WriteBarrierSnippet *);
    void print(TR::FILE *, TR::X86JNIPauseSnippet *);
    void print(TR::FILE *, TR::X86PassJNINullSnippet *);

diff --git a/compiler/runtime/Helpers.inc b/compiler/runtime/Helpers.inc
@@ -462,18 +462,17 @@ SETVAL(TR_IA32JitMethodMonitorEnterPreservingReservation,TR_LXRH+25)
 SETVAL(TR_IA32JitMethodMonitorExitPreservingReservation,TR_LXRH+26)
 SETVAL(TR_IA32JitMethodMonitorExitReservedPrimitive,TR_LXRH+27)
 SETVAL(TR_IA32JitMethodMonitorExitReserved,TR_LXRH+28)
-SETVAL(TR_IA32interpreterUnresolvedVTableSlotGlue,TR_LXRH+29)
-SETVAL(TR_IA32compressString, TR_LXRH+30)
-SETVAL(TR_IA32compressStringNoCheck, TR_LXRH+31)
-SETVAL(TR_IA32compressStringJ, TR_LXRH+32)
-SETVAL(TR_IA32compressStringNoCheckJ, TR_LXRH+33)
-SETVAL(TR_IA32andORString, TR_LXRH+34)
-SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+35)
-SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+36)
-SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+37)
-SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+38)
-SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+39)
-SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+40)
+SETVAL(TR_IA32compressString, TR_LXRH+29)
+SETVAL(TR_IA32compressStringNoCheck, TR_LXRH+30)
+SETVAL(TR_IA32compressStringJ, TR_LXRH+31)
+SETVAL(TR_IA32compressStringNoCheckJ, TR_LXRH+32)
+SETVAL(TR_IA32andORString, TR_LXRH+33)
+SETVAL(TR_IA32arrayTranslateTRTO, TR_LXRH+34)
+SETVAL(TR_IA32arrayTranslateTROTNoBreak, TR_LXRH+35)
+SETVAL(TR_IA32arrayTranslateTROT, TR_LXRH+36)
+SETVAL(TR_IA32encodeUTF16Big,TR_LXRH+37)
+SETVAL(TR_IA32encodeUTF16Little,TR_LXRH+38)
+SETVAL(TR_IA32numRuntimeHelpers,TR_LXRH+39)
 
 SETVAL(TR_AMD64floatRemainder,TR_LXRH+0)
 SETVAL(TR_AMD64doubleRemainder,TR_LXRH+1)

diff --git a/compiler/x/codegen/OMRSnippet.cpp b/compiler/x/codegen/OMRSnippet.cpp
@@ -45,7 +45,6 @@ namespace TR { class X86GuardedDevirtualSnippet; }
 namespace TR { class X86PicDataSnippet; }
 namespace TR { class X86RecompilationSnippet; }
 namespace TR { class X86SpineCheckSnippet; }
-namespace TR { class X86UnresolvedVirtualCallSnippet; }
 namespace TR { class LabelSymbol; }
 namespace TR { class Node; }
 
@@ -84,9 +83,6 @@ TR_Debug::getNamex(TR::Snippet *snippet)
       case TR::Snippet::IsIPicData:
          return "IPic Data";
          break;
-      case TR::Snippet::IsUnresolvedVirtualCall:
-         return "Unresolved Virtual Call Snippet";
-         break;
       case TR::Snippet::IsForceRecompilation:
          return "Force Recompilation Snippet";
          break;
@@ -158,9 +154,6 @@ TR_Debug::printx(TR::FILE *pOutFile, TR::Snippet *snippet)
       case TR::Snippet::IsVPicData:
          print(pOutFile, (TR::X86PicDataSnippet *)snippet);
          break;
-      case TR::Snippet::IsUnresolvedVirtualCall:
-         print(pOutFile, (TR::X86UnresolvedVirtualCallSnippet *)snippet);
-         break;
       case TR::Snippet::IsCheckFailure:
          print(pOutFile, (TR::X86CheckFailureSnippet *)snippet);
          break;

diff --git a/compiler/x/codegen/OMRSnippet.hpp b/compiler/x/codegen/OMRSnippet.hpp
@@ -63,7 +63,6 @@ class OMR_EXTENSIBLE Snippet : public OMR::Snippet
          IsUnresolvedCall,
       IsIPicData,
       IsVPicData,
-      IsUnresolvedVirtualCall,
       IsUnresolvedVTableSlot,
       IsVirtualPIC,
       IsCheckFailure,