Fixup

Author: vmaksimo

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -371,19 +371,14 @@ void SPIRVModuleAnalysis::visitDecl(
       MAI.setSkipEmission(NextInstr);
       NextInstr = NextInstr->getNextNode();
     }
-  } else if (Opcode == SPIRV::OpCompositeConstruct) {
+  } else if (Opcode == SPIRV::OpConstantComposite) {
     GReg = handleTypeDeclOrConstant(MI, SignatureToGReg);
     const MachineInstr *NextInstr = MI.getNextNode();
     while (NextInstr && NextInstr->getOpcode() ==
-                            SPIRV::OpCompositeConstructContinuedINTEL) {
+                            SPIRV::OpConstantCompositeContinuedINTEL) {
       Register Tmp = handleTypeDeclOrConstant(*NextInstr, SignatureToGReg);
-      // For the case with the global variable,
-      // OpConstantCompositeContinuedINTEL does not go directly after
-      // OpConstantComposite, but they are "split" by the OpVariable
-      // instruction. My guess is that the order can be fixed somewhere here,
-      // but not sure. MAI.setRegisterAlias(MF,
-      // NextInstr->getOperand(0).getReg(), Tmp);
-      // MAI.setSkipEmission(NextInstr);
+      MAI.setRegisterAlias(MF, NextInstr->getOperand(0).getReg(), Tmp);
+      MAI.setSkipEmission(NextInstr);
       NextInstr = NextInstr->getNextNode();
     }
   } else if (TII->isTypeDeclInstr(MI) || TII->isConstantInstr(MI) ||