address Justin

Author: bob80905

llvm/lib/Target/DirectX/DXILPrepare.cpp

@@ -185,7 +185,7 @@ class DXILPrepareModule : public ModulePass {
     VersionTuple ValVer = MetadataInfo.ValidatorVersion;
     bool SkipValidation = ValVer.getMajor() == 0 && ValVer.getMinor() == 0;
 
-    // construct whitelist of valid metadata node kinds
+    // construct allowlist of valid metadata node kinds
     std::array<unsigned, 6> DXILCompatibleMDs = getCompatibleInstructionMDs(M);
 
     for (auto &F : M.functions()) {

llvm/test/CodeGen/DirectX/metadata-stripping.ll

@@ -8,22 +8,25 @@ target triple = "dxilv1.0-unknown-shadermodel6.0-compute"
 define void @main(i32* %ptr) {
 entry:  
   ; metadata ID changes to 0 once the current !0 and !1 are removed
-  ; since they aren't in the whitelist. range needs a payload.
+  ; since they aren't in the allowlist. range needs a payload.
   ; CHECK: %val = load i32, ptr %ptr, align 4, !range [[RANGEMD:![0-9]+]]
   %val = load i32, ptr %ptr, align 4, !range !2
 
   %cmp.i = icmp ult i32 1, 2
+  ; Ensure that the !llvm.loop metadata node gets dropped.
+  ; CHECK: br i1 %cmp.i, label %_Z4mainDv3_j.exit, label %_Z4mainDv3_j.exit{{$}}
   br i1 %cmp.i, label %_Z4mainDv3_j.exit, label %_Z4mainDv3_j.exit, !llvm.loop !0
 
 _Z4mainDv3_j.exit:                                ; preds = %for.body.i, %entry
   ret void
 }
 
-; CHECK: [[RANGEMD]] = !{i32 1, i32 5}
-; this next check line checks that nothing comes after the above check line. 
+; These next check lines check that only the range metadata remains
 ; No more metadata should be necessary, the rest (the current 0 and 1)
 ; should be removed.
 ; CHECK-NOT: !{!"llvm.loop.mustprogress"}
+; CHECK: [[RANGEMD]] = !{i32 1, i32 5}
+; CHECK-NOT: !{!"llvm.loop.mustprogress"}
 !0 = distinct !{!0, !1}
 !1 = !{!"llvm.loop.mustprogress"}
 !2 = !{i32 1, i32 5}