Fixed assertion in GenUpdateCB

davidjwoo · sys_zuul · commit 0bed8a9e4178 · 2019-12-04T00:00:40.000-08:00
GenUpdateCB was incorrectly identifying constant buffer loads with
an index sourced from a phi node as having a constant index. This
has been fixed.

Change-Id: Iff42751f9dd48c85b960eef575c5f6457880063a
diff --git a/IGC/Compiler/GenUpdateCB.cpp b/IGC/Compiler/GenUpdateCB.cpp
@@ -96,12 +96,11 @@ bool GenUpdateCB::isConstantBufferLoad(LoadInst* inst, unsigned& bufId)
     {
         if (IntToPtrInst * itop = dyn_cast<IntToPtrInst>(inst->getOperand(0)))
         {
-            if (!dyn_cast<Constant>(itop->getOperand(0)))
+            if (isa<Constant>(itop->getOperand(0)))
             {
-                return false;
+                return true;
             }
         }
-        return true;
     }
     return false;
 }

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,11 @@ bool GenUpdateCB::isConstantBufferLoad(LoadInst* inst, unsigned& bufId)`
`96`	`96`	`{`
`97`	`97`	`if (IntToPtrInst * itop = dyn_cast<IntToPtrInst>(inst->getOperand(0)))`
`98`	`98`	`{`
`99`		`- if (!dyn_cast<Constant>(itop->getOperand(0)))`
	`99`	`+ if (isa<Constant>(itop->getOperand(0)))`
`100`	`100`	`{`
`101`		`- return false;`
	`101`	`+ return true;`
`102`	`102`	`}`
`103`	`103`	`}`
`104`		`- return true;`
`105`	`104`	`}`
`106`	`105`	`return false;`
`107`	`106`	`}`