Author: Eric Christopher Date: 2020-06-20T16:03:58-07:00 New Revision: 0861889be103bf7bcf013768e913695ed94b50bf
URL: https://github.com/llvm/llvm-project/commit/0861889be103bf7bcf013768e913695ed94b50bf DIFF: https://github.com/llvm/llvm-project/commit/0861889be103bf7bcf013768e913695ed94b50bf.diff LOG: [clang/llvm] As part of using inclusive language within the llvm project, migrate away from the use of blacklist and whitelist. Added: Modified: clang/lib/AST/Decl.cpp clang/lib/CodeGen/CGClass.cpp clang/lib/Format/UnwrappedLineParser.cpp llvm/unittests/Support/SpecialCaseListTest.cpp llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h Removed: ################################################################################ diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp index 23547933b88b..1676f319394d 100644 --- a/clang/lib/AST/Decl.cpp +++ b/clang/lib/AST/Decl.cpp @@ -4522,11 +4522,11 @@ bool RecordDecl::mayInsertExtraPadding(bool EmitRemark) const { ReasonToReject = 5; // is standard layout. else if (Blacklist.isBlacklistedLocation(EnabledAsanMask, getLocation(), "field-padding")) - ReasonToReject = 6; // is in a blacklisted file. + ReasonToReject = 6; // is in an excluded file. else if (Blacklist.isBlacklistedType(EnabledAsanMask, getQualifiedNameAsString(), "field-padding")) - ReasonToReject = 7; // is blacklisted. + ReasonToReject = 7; // The type is excluded. if (EmitRemark) { if (ReasonToReject >= 0) diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp index 1d78b3fccb13..4d143e3e1bdf 100644 --- a/clang/lib/CodeGen/CGClass.cpp +++ b/clang/lib/CodeGen/CGClass.cpp @@ -752,7 +752,7 @@ bool CodeGenFunction::IsConstructorDelegationValid( // parameters // - etc. // If we ever add any of the above cases, remember that: - // - function-try-blocks will always blacklist this optimization + // - function-try-blocks will always exclude this optimization // - we need to perform the constructor prologue and cleanup in // EmitConstructorBody. diff --git a/clang/lib/Format/UnwrappedLineParser.cpp b/clang/lib/Format/UnwrappedLineParser.cpp index cf9673d51617..577b60bc51e2 100644 --- a/clang/lib/Format/UnwrappedLineParser.cpp +++ b/clang/lib/Format/UnwrappedLineParser.cpp @@ -900,7 +900,7 @@ void UnwrappedLineParser::parsePPUnknown() { addUnwrappedLine(); } -// Here we blacklist certain tokens that are not usually the first token in an +// Here we exclude certain tokens that are not usually the first token in an // unwrapped line. This is used in attempt to distinguish macro calls without // trailing semicolons from other constructs split to several lines. static bool tokenCanStartNewLine(const FormatToken &Tok) { diff --git a/llvm/unittests/Support/SpecialCaseListTest.cpp b/llvm/unittests/Support/SpecialCaseListTest.cpp index 4be143d8f41f..bee639df6a66 100644 --- a/llvm/unittests/Support/SpecialCaseListTest.cpp +++ b/llvm/unittests/Support/SpecialCaseListTest.cpp @@ -172,7 +172,7 @@ TEST_F(SpecialCaseListTest, EmptySpecialCaseList) { EXPECT_FALSE(SCL->inSection("", "foo", "bar")); } -TEST_F(SpecialCaseListTest, MultipleBlacklists) { +TEST_F(SpecialCaseListTest, MultipleExclusions) { std::vector<std::string> Files; Files.push_back(makeSpecialCaseListFile("src:bar\n" "src:*foo*\n" diff --git a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h index 86e75a32ef4e..17410d37f9ce 100644 --- a/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h +++ b/llvm/utils/unittest/googletest/include/gtest/internal/gtest-port.h @@ -345,7 +345,7 @@ #if GTEST_LANG_CXX11 && \ (!defined(__GLIBCXX__) || ( \ __GLIBCXX__ >= 20110325ul && /* GCC >= 4.6.0 */ \ - /* Blacklist of patch releases of older branches: */ \ + /* Exclude patch releases of older branches: */ \ __GLIBCXX__ != 20110416ul && /* GCC 4.4.6 */ \ __GLIBCXX__ != 20120313ul && /* GCC 4.4.7 */ \ __GLIBCXX__ != 20110428ul && /* GCC 4.5.3 */ \ _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits