Fix assertions in GAS and private memory resolution

Change-Id: I91556a7a9c89e020cc672c76bcb8861c0461c7fb

Author: wpan

IGC/Compiler/CISACodeGen/ResolveGAS.cpp

@@ -432,21 +432,16 @@ bool GASPropagator::visitPHINode(PHINode &PN) {
   }
 
   // Propagate this phi node.
+  PHINode *NewPN = PHINode::Create(NonGASTy, e, "", &PN);
   for (unsigned i = 0; i != e; ++i)
-    PN.setIncomingValue(i, NewIncomingValues[i]);
-  PN.mutateType(NonGASTy);
+    NewPN->addIncoming(NewIncomingValues[i], PN.getIncomingBlock(i));
+  NewPN->takeName(&PN);
 
-  // Create additional cast to enable further propagation.
   BuilderType::InsertPointGuard Guard(*IRB);
   IRB->SetInsertPoint(PN.getParent()->getFirstNonPHI());
-  Value *NewPtr = IRB->CreateAddrSpaceCast(&PN, GASTy);
-  for (auto UI = PN.use_begin(), UE = PN.use_end(); UI != UE; /*EMPTY*/) {
-    Use &U = *UI++;
-    if (U.getUser() == NewPtr)
-      continue;
-    U.set(NewPtr);
-  }
-
+  Value *NewPtr = IRB->CreateAddrSpaceCast(NewPN, GASTy);
+  PN.replaceAllUsesWith(NewPtr);
+  PN.eraseFromParent();
   return true;
 }
 

IGC/Compiler/Optimizer/OpenCLPasses/PrivateMemory/PrivateMemoryResolution.cpp

@@ -832,6 +832,11 @@ bool PrivateMemoryResolution::resolveAllocaInstuctions(bool stackCall)
                     uint64_t tmpAllocaSize = bufferSize;
                     while (pTmpType != pTypeOfAccessedObject)
                     {
+                        if (pTmpType->isStructTy() && pTmpType->getStructNumElements() == 1)
+                        {
+                            pTmpType = pTmpType->getStructElementType(0);
+                        }
+
                         if (pTmpType->isArrayTy())
                         {
                             tmpAllocaSize *= pTmpType->getArrayNumElements();