Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove TR::X86UnresolvedVirtualCallSnippet #3574

Merged
merged 1 commit into from
Feb 15, 2019
Merged

Remove TR::X86UnresolvedVirtualCallSnippet #3574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/ras/Debug.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand Down Expand Up @@ -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 *);
Expand Down
23 changes: 11 additions & 12 deletions compiler/runtime/Helpers.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions compiler/x/codegen/OMRSnippet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions compiler/x/codegen/OMRSnippet.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2000, 2016 IBM Corp. and others
* Copyright (c) 2000, 2019 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down Expand Up @@ -63,7 +63,6 @@ class OMR_EXTENSIBLE Snippet : public OMR::Snippet
IsUnresolvedCall,
IsIPicData,
IsVPicData,
IsUnresolvedVirtualCall,
IsUnresolvedVTableSlot,
IsVirtualPIC,
IsCheckFailure,
Expand Down