From bd81c39107e35ffa89df7df573f2719dee59ecef Mon Sep 17 00:00:00 2001
From: Zarko Todorovski <zarko@ca.ibm.com>
Date: Fri, 12 Nov 2021 15:47:03 +0000
Subject: [PATCH] [NFC][llvm] Remove uses of blacklist in
 llvm/test/Instrumentation

Small patch that changes blacklisted_global to blocked_global and a change in comments.

Reviewed By: pgousseau

Differential Revision: https://reviews.llvm.org/D113692
---
 llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll | 4 ++--
 .../Instrumentation/AddressSanitizer/global_metadata_array.ll | 4 ++--
 .../Instrumentation/AddressSanitizer/global_with_comdat.ll    | 4 ++--
 llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll b/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
index dd7c4cb16b87..936f2911b630 100644
--- a/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_metadata.ll
@@ -9,7 +9,7 @@ target triple = "x86_64-unknown-linux-gnu"
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -66,7 +66,7 @@ attributes #1 = { nounwind sanitize_address "less-precise-fpmad"="false" "frame-
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
index d7ab20e141b6..a95f10ec6ba8 100644
--- a/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_metadata_array.ll
@@ -8,7 +8,7 @@ target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -59,7 +59,7 @@ attributes #1 = { nounwind sanitize_address "less-precise-fpmad"="false" "frame-
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll b/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
index fc557c8faa47..8e74e29f0b67 100644
--- a/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
+++ b/llvm/test/Instrumentation/AddressSanitizer/global_with_comdat.ll
@@ -14,7 +14,7 @@ target triple = "x86_64-unknown-linux-gnu"
 ; Globals:
 @global = global i32 0, align 4
 @dyn_init_global = global i32 0, align 4
-@blacklisted_global = global i32 0, align 4
+@blocked_global = global i32 0, align 4
 @_ZZ4funcvE10static_var = internal global i32 0, align 4
 @.str = private unnamed_addr constant [14 x i8] c"Hello, world!\00", align 1
 @llvm.global_ctors = appending global [1 x { i32, void ()*, i8* }] [{ i32, void ()*, i8* } { i32 65535, void ()* @_GLOBAL__sub_I_asan_globals.cpp, i8* null }]
@@ -86,7 +86,7 @@ attributes #1 = { nounwind sanitize_address "less-precise-fpmad"="false" "frame-
 
 !0 = !{i32* @global, !6, !"global", i1 false, i1 false}
 !1 = !{i32* @dyn_init_global, !7, !"dyn_init_global", i1 true, i1 false}
-!2 = !{i32* @blacklisted_global, null, null, i1 false, i1 true}
+!2 = !{i32* @blocked_global, null, null, i1 false, i1 true}
 !3 = !{i32* @_ZZ4funcvE10static_var, !8, !"static_var", i1 false, i1 false}
 !4 = !{[14 x i8]* @.str, !9, !"<string literal>", i1 false, i1 false}
 
diff --git a/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll b/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
index 82135644c6bf..616bff68672e 100644
--- a/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
+++ b/llvm/test/Instrumentation/MemorySanitizer/msan_basic.ll
@@ -823,7 +823,7 @@ declare i32 @NoSanitizeMemoryUndefHelper(i32 %x)
 ; CHECK: ret i32
 
 
-; Test PHINode instrumentation in blacklisted functions
+; Test PHINode instrumentation in ignorelisted functions
 
 define i32 @NoSanitizeMemoryPHI(i32 %x) {
 entry: