Deprecate blockIndex in riscv

Related to: #5293 Signed-off-by: Annabelle Huo <Annabelle.Huo@ibm.com>
eclipse · Apr 28, 2021 · 901a96f · 901a96f
1 parent 1d89b25
commit 901a96f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/compiler/riscv/codegen/OMRCodeGenerator.cpp b/compiler/riscv/codegen/OMRCodeGenerator.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 IBM Corp. and others
+ * Copyright (c) 2019, 2021 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
@@ -179,8 +179,6 @@ OMR::RV::CodeGenerator::doRegisterAssignment(TR_RegisterKinds kindsToAssign)
 
       self()->tracePreRAInstruction(instructionCursor);
 
-      self()->setCurrentBlockIndex(instructionCursor->getBlockIndex());
-
       instructionCursor->assignRegisters(TR_GPR);
 
       // Maintain Internal Control Flow Depth

diff --git a/compiler/riscv/codegen/OMRInstruction.cpp b/compiler/riscv/codegen/OMRInstruction.cpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 IBM Corp. and others
+ * Copyright (c) 2019, 2021 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
@@ -35,23 +35,20 @@ OMR::RV::Instruction::Instruction(TR::CodeGenerator *cg, TR::InstOpCode::Mnemoni
    : OMR::Instruction(cg, op, node),
      _conditions(NULL)
    {
-   self()->setBlockIndex(cg->getCurrentBlockIndex());
    }
 
 
 OMR::RV::Instruction::Instruction(TR::CodeGenerator *cg, TR::Instruction *precedingInstruction, TR::InstOpCode::Mnemonic op, TR::Node *node)
    : OMR::Instruction(cg, precedingInstruction, op, node),
      _conditions(NULL)
    {
-   self()->setBlockIndex(cg->getCurrentBlockIndex());
    }
 
 
 OMR::RV::Instruction::Instruction(TR::CodeGenerator *cg, TR::InstOpCode::Mnemonic op, TR::RegisterDependencyConditions *cond, TR::Node *node)
    : OMR::Instruction(cg, op, node),
      _conditions(cond)
    {
-   self()->setBlockIndex(cg->getCurrentBlockIndex());
    if (cond)
       cond->incRegisterTotalUseCounts(cg);
    }
@@ -61,7 +58,6 @@ OMR::RV::Instruction::Instruction(TR::CodeGenerator *cg, TR::Instruction *preced
    : OMR::Instruction(cg, precedingInstruction, op, node),
      _conditions(cond)
    {
-   self()->setBlockIndex(cg->getCurrentBlockIndex());
    if (cond)
       cond->incRegisterTotalUseCounts(cg);
    }

diff --git a/compiler/riscv/codegen/OMRInstruction.hpp b/compiler/riscv/codegen/OMRInstruction.hpp
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2019, 2020 IBM Corp. and others
+ * Copyright (c) 2019, 2021 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
@@ -150,18 +150,6 @@ class OMR_EXTENSIBLE Instruction : public OMR::Instruction
       return (_conditions = cond);
       }
 
-   /**
-    * @brief Gets the basic block index
-    * @return basic block index
-    */
-   int32_t getBlockIndex()            { return _blockIndex; }
-   /**
-    * @brief Sets the basic block index
-    * @param[in] i : basic block index
-    * @return basic block index
-    */
-   void setBlockIndex(int32_t i)   { _blockIndex = i; }
-
    /**
     * @brief Sets GCMap mask
     * @param[in] cg : CodeGenerator
@@ -238,7 +226,6 @@ class OMR_EXTENSIBLE Instruction : public OMR::Instruction
    virtual TR::BtypeInstruction *getBtypeInstruction();
 
    private:
-      int32_t _blockIndex;
       TR::RegisterDependencyConditions *_conditions;
    };