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-generics-lowering-context.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'source/slang/slang-ir-generics-lowering-context.cpp')

diff --git a/source/slang/slang-ir-generics-lowering-context.cpp b/source/slang/slang-ir-generics-lowering-context.cpp
index 5ae19391b..0633dbc10 100644
--- a/source/slang/slang-ir-generics-lowering-context.cpp
+++ b/source/slang/slang-ir-generics-lowering-context.cpp
@@ -10,7 +10,7 @@ namespace Slang
     {
         if (as<IRParam>(typeInst) && as<IRTypeType>(typeInst->getDataType()))
             return true;
-        switch (typeInst->op)
+        switch (typeInst->getOp())
         {
         case kIROp_ThisType:
         case kIROp_AssociatedType:
@@ -40,7 +40,7 @@ namespace Slang
     {
         if (typeInst)
         {
-            switch (typeInst->op)
+            switch (typeInst->getOp())
             {
             case kIROp_TypeType:
             case kIROp_TypeKind:
@@ -107,7 +107,7 @@ namespace Slang
 
     IRType* SharedGenericsLoweringContext::lowerAssociatedType(IRBuilder* builder, IRInst* type)
     {
-        if (type->op != kIROp_AssociatedType)
+        if (type->getOp() != kIROp_AssociatedType)
             return (IRType*)type;
         IRIntegerValue anyValueSize = kInvalidAnyValueSize;
         for (UInt i = 0; i < type->getOperandCount(); i++)
@@ -144,7 +144,7 @@ namespace Slang
             return builder->getRTTIHandleType();
         }
 
-        switch (paramType->op)
+        switch (paramType->getOp())
         {
         case kIROp_WitnessTableType:
         case kIROp_WitnessTableIDType:
@@ -295,7 +295,7 @@ namespace Slang
             auto reqVal = findInterfaceRequirementVal(
                 interfaceType,
                 lookupInterface->getRequirementKey());
-            SLANG_ASSERT(reqVal && reqVal->op == kIROp_AssociatedType);
+            SLANG_ASSERT(reqVal && reqVal->getOp() == kIROp_AssociatedType);
             return lowerType(builder, reqVal, typeMapping, nullptr);
         }
         case kIROp_BoundInterfaceType:
@@ -322,7 +322,7 @@ namespace Slang
                     translated = true;
             }
             if (translated)
-                return builder->getType(paramType->op, loweredOperands.getCount(), loweredOperands.getBuffer());
+                return builder->getType(paramType->getOp(), loweredOperands.getCount(), loweredOperands.getBuffer());
             return (IRType*)paramType;
         }
         }
@@ -333,7 +333,7 @@ namespace Slang
         List<IRWitnessTable*> witnessTables;
         for (auto globalInst : module->getGlobalInsts())
         {
-            if (globalInst->op == kIROp_WitnessTable &&
+            if (globalInst->getOp() == kIROp_WitnessTable &&
                 cast<IRWitnessTableType>(globalInst->getDataType())->getConformanceType() ==
                     interfaceType)
             {
-- 
cgit v1.2.3