JavaScriptCore-7601.1.46.3.tar.gz

[apple/javascriptcore.git] / dfg / DFGFunctionWhitelist.cpp

diff --git a/dfg/DFGFunctionWhitelist.cpp b/dfg/DFGFunctionWhitelist.cpp
index f618499aec3482b2e0fcb35554127f00b4a3f2bf..57dc109d48dcfd2cff12339d6aa4aed160307f7e 100644 (file)
--- a/dfg/DFGFunctionWhitelist.cpp
+++ b/dfg/DFGFunctionWhitelist.cpp
@@ -42,7 +42,7 @@ FunctionWhitelist& FunctionWhitelist::ensureGlobalWhitelist()
     static LazyNeverDestroyed<FunctionWhitelist> functionWhitelist;
     static std::once_flag initializeWhitelistFlag;
     std::call_once(initializeWhitelistFlag, [] {
-        const char* functionWhitelistFile = Options::dfgFunctionWhitelistFile();
+        const char* functionWhitelistFile = Options::dfgWhitelist();
         functionWhitelist.construct(functionWhitelistFile);
     });
     return functionWhitelist;
@@ -92,7 +92,7 @@ void FunctionWhitelist::parseFunctionNamesInFile(const char* filename)
 bool FunctionWhitelist::contains(CodeBlock* codeBlock) const 
 {
     ASSERT(!isCompilationThread());
-    if (!Options::dfgFunctionWhitelistFile())
+    if (!Options::dfgWhitelist())
         return true;
 
     if (m_entries.isEmpty())
@@ -106,10 +106,7 @@ bool FunctionWhitelist::contains(CodeBlock* codeBlock) const
     if (m_entries.contains(hash))
         return true;
 
-    String nameAndHash = name;
-    nameAndHash.append('#');
-    nameAndHash.append(hash);
-    return m_entries.contains(nameAndHash);
+    return m_entries.contains(name + '#' + hash);
 }
 
 } } // namespace JSC::DFG