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

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

diff --git a/source/slang/slang-ir-link.cpp b/source/slang/slang-ir-link.cpp
index e4c1bad85..480fe504c 100644
--- a/source/slang/slang-ir-link.cpp
+++ b/source/slang/slang-ir-link.cpp
@@ -222,7 +222,7 @@ IRType* cloneType(
 
 IRInst* IRSpecContext::maybeCloneValue(IRInst* originalValue)
 {
-    switch (originalValue->op)
+    switch (originalValue->getOp())
     {
     case kIROp_StructType:
     case kIROp_Func:
@@ -280,7 +280,7 @@ IRInst* IRSpecContext::maybeCloneValue(IRInst* originalValue)
             UInt argCount = originalValue->getOperandCount();
             IRInst* clonedValue = builder->createIntrinsicInst(
                 cloneType(this, originalValue->getFullType()),
-                originalValue->op,
+                originalValue->getOp(),
                 argCount, nullptr);
             registerClonedValue(this, clonedValue, originalValue);
             for (UInt aa = 0; aa < argCount; ++aa)
@@ -432,14 +432,14 @@ static void cloneExtraDecorations(
     {
         for(auto decoration : sym->irGlobalValue->getDecorations())
         {
-            switch(decoration->op)
+            switch(decoration->getOp())
             {
             default:
                 break;
 
             case kIROp_BindExistentialSlotsDecoration:
             case kIROp_LayoutDecoration:
-                if(!clonedInst->findDecorationImpl(decoration->op))
+                if(!clonedInst->findDecorationImpl(decoration->getOp()))
                 {
                     cloneInst(context, builder, decoration);
                 }
@@ -1059,7 +1059,7 @@ IRInst* cloneInst(
     IRInst*                         originalInst,
     IROriginalValuesForClone const& originalValues)
 {
-    switch (originalInst->op)
+    switch (originalInst->getOp())
     {
         // We need to special-case any instruction that is not
         // allocated like an ordinary `IRInst` with trailing args.
@@ -1103,7 +1103,7 @@ IRInst* cloneInst(
     UInt argCount = originalInst->getOperandCount();
     IRInst* clonedInst = builder->createIntrinsicInst(
         cloneType(context, originalInst->getFullType()),
-        originalInst->op,
+        originalInst->getOp(),
         argCount, nullptr);
     registerClonedValue(context, clonedInst, originalValues);
     auto oldBuilder = context->builder;
@@ -1493,7 +1493,7 @@ LinkedIR linkIR(
     {
         for( auto decoration : irModule->getModuleInst()->getDecorations() )
         {
-            switch( decoration->op )
+            switch( decoration->getOp() )
             {
             case kIROp_NVAPISlotDecoration:
                 {
-- 
cgit v1.2.3