addressing nit

Author: joaosaffran

clang/lib/CodeGen/CodeGenFunction.cpp

@@ -40,6 +40,7 @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/FPEnv.h"
+#include "llvm/IR/Instruction.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
 #include "llvm/IR/MDBuilder.h"
@@ -2081,8 +2082,8 @@ void CodeGenFunction::EmitBranchOnBoolExpr(
     Weights = createProfileWeights(TrueCount, CurrentCount - TrueCount);
   }
 
-  auto *BrInst = Builder.CreateCondBr(CondV, TrueBlock, FalseBlock, Weights,
-                                      Unpredictable);
+  llvm::Instruction *BrInst = Builder.CreateCondBr(CondV, TrueBlock, FalseBlock,
+                                                   Weights, Unpredictable);
   switch (HLSLControlFlowAttr) {
   case HLSLControlFlowHintAttr::Microsoft_branch:
   case HLSLControlFlowHintAttr::Microsoft_flatten: {

clang/test/AST/HLSL/HLSLControlFlowHint.hlsl

@@ -29,8 +29,8 @@ export int flatten(int X){
 }
 
 // CHECK: FunctionDecl 0x{{[0-9A-Fa-f]+}} <{{.*}}> {{.*}} used no_attr 'int (int)'
-// CHECK-NO: AttributedStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>
-// CHECK-NO: -HLSLControlFlowHintAttr
+// CHECK-NOT: AttributedStmt 0x{{[0-9A-Fa-f]+}} <<invalid sloc>
+// CHECK-NOT: -HLSLControlFlowHintAttr
 export int no_attr(int X){
     int resp;
     if (X > 0) {

clang/test/CodeGenHLSL/HLSLControlFlowHint.hlsl

@@ -32,7 +32,7 @@ export int test_flatten(int X){
 }
 
 // CHECK: define {{.*}} i32 {{.*}}test_no_attr{{.*}}(i32 {{.*}} [[VALD:%.*]])
-// CHECK-NO: !hlsl.controlflow.hint
+// CHECK-NOT: !hlsl.controlflow.hint
 export int test_no_attr(int X){
     int resp;
     if (X > 0) {

llvm/lib/Target/DirectX/DXILTranslateMetadata.cpp

@@ -15,6 +15,7 @@
 #include "llvm/ADT/Twine.h"
 #include "llvm/Analysis/DXILMetadataAnalysis.h"
 #include "llvm/Analysis/DXILResource.h"
+#include "llvm/IR/BasicBlock.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/DiagnosticInfo.h"
 #include "llvm/IR/DiagnosticPrinter.h"
@@ -299,11 +300,11 @@ static MDTuple *emitTopLevelLibraryNode(Module &M, MDNode *RMD,
 // TODO: We might need to refactor this to be more generic,
 // in case we need more metadata to be replaced.
 static void translateBranchMetadata(Module &M) {
-  for (auto &F : M) {
-    for (auto &BB : F) {
-      auto *BBTerminatorInst = BB.getTerminator();
+  for (Function &F : M) {
+    for (BasicBlock &BB : F) {
+      Instruction *BBTerminatorInst = BB.getTerminator();
 
-      auto *HlslControlFlowMD =
+      MDNode *HlslControlFlowMD =
           BBTerminatorInst->getMetadata("hlsl.controlflow.hint");
 
       if (!HlslControlFlowMD)
@@ -313,14 +314,14 @@ static void translateBranchMetadata(Module &M) {
              "invalid operands for hlsl.controlflow.hint");
 
       MDBuilder MDHelper(M.getContext());
-      auto *Op1 =
+      ConstantInt *Op1 =
           mdconst::extract<ConstantInt>(HlslControlFlowMD->getOperand(1));
 
       SmallVector<llvm::Metadata *, 2> Vals(
           ArrayRef<Metadata *>{MDHelper.createString("dx.controlflow.hints"),
                                MDHelper.createConstant(Op1)});
 
-      auto *MDNode = llvm::MDNode::get(M.getContext(), Vals);
+      MDNode *MDNode = llvm::MDNode::get(M.getContext(), Vals);
 
       BBTerminatorInst->setMetadata("dx.controlflow.hints", MDNode);
       BBTerminatorInst->setMetadata("hlsl.controlflow.hint", nullptr);

llvm/lib/Target/SPIRV/SPIRVInstructionSelector.cpp

@@ -2800,7 +2800,8 @@ bool SPIRVInstructionSelector::selectIntrinsic(Register ResVReg,
   case Intrinsic::spv_selection_merge: {
     auto MIB =
         BuildMI(BB, I, I.getDebugLoc(), TII.get(SPIRV::OpSelectionMerge));
-    assert(I.getOperand(1).isMBB());
+    assert(I.getOperand(1).isMBB() &&
+           "operand 1 to spv_selection_merge must be a basic block");
     MIB.addMBB(I.getOperand(1).getMBB());
     MIB.addImm(getSelectionOperandForImm(I.getOperand(2).getImm()));
     return MIB.constrainAllUses(TII, TRI, RBI);