Changeset 202737 in webkit for trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp

Timestamp:

Jul 1, 2016, 9:38:11 AM (9 years ago)

Author:

[email protected]

Message:

Update JSC_functionOverrides to handle the new SourceCode strings that have params.
​https://bugs.webkit.org/show_bug.cgi?id=159321

Reviewed by Geoffrey Garen.

And add tests so that this won't fail silently and bit rot anymore.

• API/tests/FunctionOverridesTest.cpp: Added.

(testFunctionOverrides):

• API/tests/FunctionOverridesTest.h: Added.
• API/tests/testapi-function-overrides.js: Added.
• API/tests/testapi.c:

(main):

• JavaScriptCore.xcodeproj/project.pbxproj:
• bytecode/UnlinkedFunctionExecutable.cpp:

(JSC::UnlinkedFunctionExecutable::link):

• shell/PlatformWin.cmake:
• tools/FunctionOverrides.cpp:

(JSC::FunctionOverrides::FunctionOverrides):
(JSC::FunctionOverrides::reinstallOverrides):
(JSC::initializeOverrideInfo):
(JSC::FunctionOverrides::initializeOverrideFor):

• tools/FunctionOverrides.h:

(JSC::FunctionOverrides::clear):

File:

• trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/tools/FunctionOverrides.cpp

@@ -1 +1 @@
 /*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -105 +105 @@
 }
 
+void FunctionOverrides::reinstallOverrides()
+{
+    FunctionOverrides& overrides = FunctionOverrides::overrides();
+    const char* overridesFileName = Options::functionOverrides();
+    overrides.clear();
+    overrides.parseOverridesInFile(overridesFileName);
+}
+
 static void initializeOverrideInfo(const SourceCode& origCode, const String& newBody, FunctionOverrides::OverrideInfo& info)
 {
     String origProviderStr = origCode.provider()->source().toString();
-    unsigned origBraceStart = origCode.startOffset();
-    unsigned origFunctionStart = origProviderStr.reverseFind("function", origBraceStart);
+    unsigned origStart = origCode.startOffset();
+    unsigned origFunctionStart = origProviderStr.reverseFind("function", origStart);
+    unsigned origBraceStart = origProviderStr.find("{", origStart);
     unsigned headerLength = origBraceStart - origFunctionStart;
     String origHeader = origProviderStr.substring(origFunctionStart, headerLength);
@@ -128 +137 @@
 
     info.sourceCode =
-        SourceCode(WTFMove(newProvider), info.typeProfilingStartOffset, info.typeProfilingEndOffset + 1, 1, 1);
+        SourceCode(WTFMove(newProvider), info.parametersStartOffset, info.typeProfilingEndOffset + 1, 1, 1);
 }
     
@@ -136 +145 @@
     FunctionOverrides& overrides = FunctionOverrides::overrides();
 
-    auto it = overrides.m_entries.find(origCode.view().toString());
+    String sourceString = origCode.view().toString();
+    size_t sourceBodyStart = sourceString.find('{');
+    if (sourceBodyStart == notFound)
+        return false;
+    String sourceBodyString = sourceString.substring(sourceBodyStart);
+
+    auto it = overrides.m_entries.find(sourceBodyString);
     if (it == overrides.m_entries.end())
         return false;