Changeset 262928 in webkit for trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp

Timestamp:

Jun 11, 2020, 3:47:21 PM (5 years ago)

Author:

[email protected]

Message:

Replace uses of black/white list with block/allow list
​https://bugs.webkit.org/show_bug.cgi?id=213084

Reviewed by Keith Miller.

We should be using racially neutral names in our code. From Chromium style guide:

"Terms such as 'blacklist' and 'whitelist' reinforce the notion that
black==bad and white==good."

• JavaScriptCore.xcodeproj/project.pbxproj:
• Sources.txt:
• b3/air/AirLowerAfterRegAlloc.cpp:

(JSC::B3::Air::lowerAfterRegAlloc):

• dfg/DFGDriver.cpp:

(JSC::DFG::ensureGlobalDFGAllowlist):
(JSC::DFG::compileImpl):
(JSC::DFG::ensureGlobalDFGWhitelist): Deleted.

• dfg/DFGTierUpCheckInjectionPhase.cpp:

(JSC::DFG::ensureGlobalFTLAllowlist):
(JSC::DFG::TierUpCheckInjectionPhase::run):
(JSC::DFG::ensureGlobalFTLWhitelist): Deleted.

• heap/MachineStackMarker.cpp:
• inspector/scripts/codegen/objc_generator.py:

(ObjCGenerator.should_generate_types_for_domain):
(ObjCGenerator.should_generate_commands_for_domain):
(ObjCGenerator.should_generate_events_for_domain):

• llint/LLIntSlowPaths.cpp:

(JSC::LLInt::ensureGlobalJITAllowlist):
(JSC::LLInt::shouldJIT):
(JSC::LLInt::ensureGlobalJITWhitelist): Deleted.

• runtime/OptionsList.h:
• tools/FunctionAllowlist.cpp: Copied from Source/JavaScriptCore/tools/FunctionWhitelist.cpp.

(JSC::FunctionAllowlist::FunctionAllowlist):
(JSC::FunctionAllowlist::contains const):
(JSC::FunctionWhitelist::FunctionWhitelist): Deleted.
(JSC::FunctionWhitelist::contains const): Deleted.

• tools/FunctionAllowlist.h: Copied from Source/JavaScriptCore/tools/FunctionWhitelist.h.
• tools/FunctionWhitelist.cpp: Removed.
• tools/FunctionWhitelist.h: Removed.

File:

• trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/dfg/DFGDriver.cpp

@@ -32 +32 @@
 #include "DFGThunks.h"
 #include "DFGWorklist.h"
-#include "FunctionWhitelist.h"
+#include "FunctionAllowlist.h"
 #include "JITCode.h"
 #include "Options.h"
@@ -49 +49 @@
 
 #if ENABLE(DFG_JIT)
-static FunctionWhitelist& ensureGlobalDFGWhitelist()
+static FunctionAllowlist& ensureGlobalDFGAllowlist()
 {
-    static LazyNeverDestroyed<FunctionWhitelist> dfgWhitelist;
-    static std::once_flag initializeWhitelistFlag;
-    std::call_once(initializeWhitelistFlag, [] {
-        const char* functionWhitelistFile = Options::dfgWhitelist();
-        dfgWhitelist.construct(functionWhitelistFile);
+    static LazyNeverDestroyed<FunctionAllowlist> dfgAllowlist;
+    static std::once_flag initializeAllowlistFlag;
+    std::call_once(initializeAllowlistFlag, [] {
+        const char* functionAllowlistFile = Options::dfgAllowlist();
+        dfgAllowlist.construct(functionAllowlistFile);
     });
-    return dfgWhitelist;
+    return dfgAllowlist;
 }
 
@@ -66 +66 @@
 {
     if (!Options::bytecodeRangeToDFGCompile().isInRange(codeBlock->instructionsSize())
-        || !ensureGlobalDFGWhitelist().contains(codeBlock))
+        || !ensureGlobalDFGAllowlist().contains(codeBlock))
         return CompilationFailed;