From e474c4e3aadc22a1b9f9b006104409f10936244f Mon Sep 17 00:00:00 2001
From: Tim Foley <tfoleyNV@users.noreply.github.com>
Date: Tue, 16 Feb 2021 11:48:21 -0800
Subject: Add an accessor for IRInst opcode (#1707)

* Add an accessor for IRInst opcode

This main changing is renaming `IRInst::op` over to `IRInst::m_op` and then adds an accessor `IRInst::getOp()` to read it. The rest of the changes are just changing use sites to `getOp` (or to `m_op` in the limited cases where we write to it).

This work is in anticipation of a future change that might need to store an extra bit in the same field as the opcode. It seemed better to do this massive refactoring as a separate PR.

* fixup
---
 source/slang/slang-ir-type-set.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source/slang/slang-ir-type-set.cpp')

diff --git a/source/slang/slang-ir-type-set.cpp b/source/slang/slang-ir-type-set.cpp
index 047f9fb95..4bebf658b 100644
--- a/source/slang/slang-ir-type-set.cpp
+++ b/source/slang/slang-ir-type-set.cpp
@@ -77,7 +77,7 @@ IRInst* IRTypeSet::cloneInst(IRInst* inst)
         return inst;
     }
 
-    if (isNominalOp(inst->op))
+    if (isNominalOp(inst->getOp()))
     {
         // We can clone without any definition, and add the linkage
 
@@ -100,7 +100,7 @@ IRInst* IRTypeSet::cloneInst(IRInst* inst)
     // it's no use
 
     IRInst* clone = nullptr;
-    switch (inst->op)
+    switch (inst->getOp())
     {
         case kIROp_IntLit:
         {
@@ -143,9 +143,9 @@ IRInst* IRTypeSet::cloneInst(IRInst* inst)
 
     if (!clone)
     {
-        if (IRBasicType::isaImpl(inst->op))
+        if (IRBasicType::isaImpl(inst->getOp()))
         {
-            clone = m_builder.getType(inst->op);
+            clone = m_builder.getType(inst->getOp());
         }
         else
         {
@@ -168,7 +168,7 @@ IRInst* IRTypeSet::cloneInst(IRInst* inst)
                 UInt operandCounts[1] = { UInt(operandCount) };
                 IRInst*const* listOperands[1] = { cloneOperands.getBuffer() };
 
-                clone = m_builder.findOrAddInst(clonedType, inst->op, 1, operandCounts, listOperands);
+                clone = m_builder.findOrAddInst(clonedType, inst->getOp(), 1, operandCounts, listOperands);
             }
             else
             {
@@ -176,7 +176,7 @@ IRInst* IRTypeSet::cloneInst(IRInst* inst)
                 auto clonedType = cloneType(inst->getFullType());
 
                 Index operandCount = Index(inst->getOperandCount());
-                clone = m_builder.emitIntrinsicInst(clonedType, inst->op, operandCount, nullptr);
+                clone = m_builder.emitIntrinsicInst(clonedType, inst->getOp(), operandCount, nullptr);
                 for (Index i = 0; i < operandCount; ++i)
                 {
                     auto cloneOperand = cloneInst(inst->getOperand(i));
@@ -278,7 +278,7 @@ static bool _hasNominalOperand(IRInst* inst)
     for (Index i = 0; i < operandCount; ++i)
     {
         IRInst* operand = operands[i].get();
-        if (isNominalOp(operand->op))
+        if (isNominalOp(operand->getOp()))
         {
             return true;
         }
-- 
cgit v1.2.3