Restore clean unroll checkpoint build

Author: AnastaZIuk

external/SPIRV-Headers

@@ -483,7 +483,7 @@ namespace {
         result =  Context->getObjCIdType();
       FunctionProtoType::ExtProtoInfo fpi;
       fpi.Variadic = variadic;
-      return Context->getFunctionType(result, args, fpi);
+      return Context->getFunctionType(result, args, fpi, {});
     }
 
     // Helper function: create a CStyleCastExpr with trivial type source info.

tools/clang/lib/Frontend/Rewrite/RewriteObjC.cpp

@@ -8053,7 +8053,7 @@ SpirvInstruction *SpirvEmitter::createVectorSplat(const Expr *scalarExpr,
   // Should find a more meaningful one.
   if (auto *constVal = dyn_cast<SpirvConstant>(scalarVal)) {
     llvm::SmallVector<SpirvConstant *, 4> elements(size_t(size), constVal);
-    const bool isSpecConst = constVal->getopcode() == spv::Op::OpSpecConstant;
+    const bool isSpecConst = constVal->isSpecConstant();
     auto *value =
         spvBuilder.getConstantComposite(vecType, elements, isSpecConst);
     if (!value)
@@ -16673,9 +16673,15 @@ bool SpirvEmitter::spirvToolsLegalize(std::vector<uint32_t> *mod,
     optimizer.RegisterPass(
         spvtools::CreateInterfaceVariableScalarReplacementPass());
   }
-  optimizer.RegisterLegalizationPasses(spirvOptions.preserveInterface,
-                                       needsLegalizationLoopUnroll,
-                                       needsLegalizationSsaRewrite);
+  auto legalizationSsaRewriteMode = spvtools::SSARewriteMode::None;
+  if (needsLegalizationLoopUnroll) {
+    legalizationSsaRewriteMode = spvtools::SSARewriteMode::All;
+  } else if (needsLegalizationSsaRewrite) {
+    legalizationSsaRewriteMode = spvtools::SSARewriteMode::OpaqueOnly;
+  }
+  optimizer.RegisterLegalizationPasses(
+      spirvOptions.preserveInterface, needsLegalizationLoopUnroll,
+      legalizationSsaRewriteMode);
   // Add flattening of resources if needed.
   if (spirvOptions.flattenResourceArrays) {
     optimizer.RegisterPass(