Temporarily inherit TR_X86OpCode from InstOpCode

This allows us to replace all uses of the former with the latter in preparation for deprecating the former.
eclipse · May 19, 2021 · 368355e · 368355e
1 parent ccd1fcc
commit 368355e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/compiler/x/codegen/InstOpCode.hpp b/compiler/x/codegen/InstOpCode.hpp
@@ -26,12 +26,13 @@
 
 namespace TR
 {
-   
+
 class InstOpCode: public OMR::InstOpCodeConnector
    {
    public:
    InstOpCode()	: 			OMR::InstOpCodeConnector(bad) {}
    InstOpCode(TR::InstOpCode::Mnemonic m): OMR::InstOpCodeConnector(m) {}
+   InstOpCode(TR_X86OpCodes op):  OMR::InstOpCodeConnector(op) {}
    };
 }
 

diff --git a/compiler/x/codegen/OMRInstOpCode.hpp b/compiler/x/codegen/OMRInstOpCode.hpp
@@ -42,12 +42,13 @@ namespace OMR
 namespace X86
 {
 
-class InstOpCode: public OMR::InstOpCode
+class InstOpCode: public OMR::InstOpCode, public TR_X86OpCode
    {
    protected:
 
-   InstOpCode():  OMR::InstOpCode(bad)  {}
-   InstOpCode(Mnemonic m): OMR::InstOpCode(m)  {}
+   InstOpCode():  OMR::InstOpCode(bad), TR_X86OpCode(BADIA32Op)  {}
+   InstOpCode(Mnemonic m): OMR::InstOpCode(m), TR_X86OpCode(BADIA32Op)  {}
+   InstOpCode(TR_X86OpCodes op):  OMR::InstOpCode(bad), TR_X86OpCode(op)        {}
 
    public: