Remove TR_LinkageConventions field in Z linkages

This field is unused and so is removed to avoid dead code. Signed-off-by: Dhruv Chopra <Dhruv.C.Chopra@ibm.com>
eclipse · Jan 4, 2021 · 481e344 · 481e344
1 parent d19d2ff
commit 481e344
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/compiler/z/codegen/Linkage.hpp b/compiler/z/codegen/Linkage.hpp
@@ -39,8 +39,8 @@ class OMR_EXTENSIBLE Linkage : public OMR::LinkageConnector
    Linkage(TR::CodeGenerator *cg)
       : OMR::LinkageConnector(cg) {}
 
-   Linkage(TR::CodeGenerator *cg, TR_S390LinkageConventions elc, TR_LinkageConventions le)
-      : OMR::LinkageConnector(cg, elc, le) {}
+   Linkage(TR::CodeGenerator *cg, TR_S390LinkageConventions elc)
+      : OMR::LinkageConnector(cg, elc) {}
    };
 }
 

diff --git a/compiler/z/codegen/OMRLinkage.cpp b/compiler/z/codegen/OMRLinkage.cpp
@@ -102,7 +102,7 @@ extern bool storeHelperImmediateInstruction(TR::Node * valueChild, TR::CodeGener
 
 OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen)
    : OMR::Linkage(codeGen),
-      _explicitLinkageType(TR_S390LinkageDefault), _linkageType(TR_None), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
+      _explicitLinkageType(TR_S390LinkageDefault), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
       _integerReturnRegister(TR::RealRegister::NoReg),
       _floatReturnRegister(TR::RealRegister::NoReg),
       _doubleReturnRegister(TR::RealRegister::NoReg),
@@ -135,9 +135,9 @@ OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen)
  * convention.
  * Even though this method is common, its implementation is machine-specific.
  */
-OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen,TR_S390LinkageConventions elc, TR_LinkageConventions lc)
+OMR::Z::Linkage::Linkage(TR::CodeGenerator * codeGen,TR_S390LinkageConventions elc)
    : OMR::Linkage(codeGen),
-      _explicitLinkageType(elc), _linkageType(lc), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
+      _explicitLinkageType(elc), _stackSizeCheckNeeded(true), _raContextSaveNeeded(true),
       _integerReturnRegister(TR::RealRegister::NoReg),
       _floatReturnRegister(TR::RealRegister::NoReg),
       _doubleReturnRegister(TR::RealRegister::NoReg),

diff --git a/compiler/z/codegen/OMRLinkage.hpp b/compiler/z/codegen/OMRLinkage.hpp
@@ -191,7 +191,6 @@ namespace Z
 class OMR_EXTENSIBLE Linkage : public OMR::Linkage
    {
 private:
-   TR_LinkageConventions _linkageType;
    TR_S390LinkageConventions _explicitLinkageType;
    uint32_t _properties;
    uint32_t _registerFlags[TR::RealRegister::NumRegisters];
@@ -253,7 +252,7 @@ enum TR_DispatchType
 
    Linkage(TR::CodeGenerator *);
 
-   Linkage(TR::CodeGenerator *, TR_S390LinkageConventions, TR_LinkageConventions);
+   Linkage(TR::CodeGenerator *, TR_S390LinkageConventions);
 
    TR_S390LinkageConventions getExplicitLinkageType() { return _explicitLinkageType; }
    void setExplicitLinkageType(TR_S390LinkageConventions lc ) { _explicitLinkageType = lc; }

diff --git a/compiler/z/codegen/SystemLinkage.cpp b/compiler/z/codegen/SystemLinkage.cpp
@@ -69,9 +69,9 @@
 #include "z/codegen/S390Instruction.hpp"
 #include "z/codegen/SystemLinkage.hpp"
 
-TR::SystemLinkage::SystemLinkage(TR::CodeGenerator* cg, TR_S390LinkageConventions elc, TR_LinkageConventions lc)
+TR::SystemLinkage::SystemLinkage(TR::CodeGenerator* cg, TR_S390LinkageConventions elc)
    :
-      TR::Linkage(cg, elc,lc),
+      TR::Linkage(cg, elc),
       _GPRSaveMask(0),
       _FPRSaveMask(0)
    {

diff --git a/compiler/z/codegen/SystemLinkage.hpp b/compiler/z/codegen/SystemLinkage.hpp
@@ -56,7 +56,7 @@ class SystemLinkage : public TR::Linkage
    {
    public:
 
-   SystemLinkage(TR::CodeGenerator * cg, TR_S390LinkageConventions elc = TR_S390LinkageDefault, TR_LinkageConventions lc = TR_System);
+   SystemLinkage(TR::CodeGenerator * cg, TR_S390LinkageConventions elc = TR_S390LinkageDefault);
 
    TR::SystemLinkage * self();