refactor

Author: vmaksimo

llvm/lib/Target/SPIRV/SPIRVModuleAnalysis.cpp

@@ -361,26 +361,21 @@ void SPIRVModuleAnalysis::visitDecl(
   } else if (Opcode == SPIRV::OpFunction ||
              Opcode == SPIRV::OpFunctionParameter) {
     GReg = handleFunctionOrParameter(MF, MI, GlobalToGReg, IsFunDef);
-  } else if (Opcode == SPIRV::OpTypeStruct) {
+  } else if (Opcode == SPIRV::OpTypeStruct ||
+             Opcode == SPIRV::OpConstantComposite) {
     GReg = handleTypeDeclOrConstant(MI, SignatureToGReg);
     const MachineInstr *NextInstr = MI.getNextNode();
     while (NextInstr &&
-           NextInstr->getOpcode() == SPIRV::OpTypeStructContinuedINTEL) {
+           ((Opcode == SPIRV::OpTypeStruct &&
+             NextInstr->getOpcode() == SPIRV::OpTypeStructContinuedINTEL) ||
+            (Opcode == SPIRV::OpConstantComposite &&
+             NextInstr->getOpcode() ==
+                 SPIRV::OpConstantCompositeContinuedINTEL))) {
       MCRegister Tmp = handleTypeDeclOrConstant(*NextInstr, SignatureToGReg);
       MAI.setRegisterAlias(MF, NextInstr->getOperand(0).getReg(), Tmp);
       MAI.setSkipEmission(NextInstr);
       NextInstr = NextInstr->getNextNode();
     }
-  } else if (Opcode == SPIRV::OpConstantComposite) {
-    GReg = handleTypeDeclOrConstant(MI, SignatureToGReg);
-    const MachineInstr *NextInstr = MI.getNextNode();
-    while (NextInstr && NextInstr->getOpcode() ==
-                            SPIRV::OpConstantCompositeContinuedINTEL) {
-      Register Tmp = handleTypeDeclOrConstant(*NextInstr, SignatureToGReg);
-      MAI.setRegisterAlias(MF, NextInstr->getOperand(0).getReg(), Tmp);
-      MAI.setSkipEmission(NextInstr);
-      NextInstr = NextInstr->getNextNode();
-    }
   } else if (TII->isTypeDeclInstr(MI) || TII->isConstantInstr(MI) ||
              TII->isInlineAsmDefInstr(MI)) {
     GReg = handleTypeDeclOrConstant(MI, SignatureToGReg);