Changeset 202737 in webkit

Timestamp:

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

Author:

mark.lam@apple.com

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):

Location:

trunk/Source/JavaScriptCore

Files:

• API/tests/FunctionOverridesTest.cpp (added)
• API/tests/FunctionOverridesTest.h (added)
• API/tests/testapi-function-overrides.js (added)
• API/tests/testapi.c (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (6 diffs)
• bytecode/UnlinkedFunctionExecutable.cpp (modified) (1 diff)
• shell/PlatformWin.cmake (modified) (2 diffs)
• tools/FunctionOverrides.cpp (modified) (4 diffs)
• tools/FunctionOverrides.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/API/tests/testapi.c

@@ -43 +43 @@
 #include "CustomGlobalObjectClassTest.h"
 #include "ExecutionTimeLimitTest.h"
+#include "FunctionOverridesTest.h"
 #include "GlobalContextWithFinalizerTest.h"
 #include "PingPongStackOverflowTest.h"
@@ -1886 +1887 @@
     failed = testTypedArrayCAPI() || failed;
     failed = testExecutionTimeLimit() || failed;
+    failed = testFunctionOverrides() || failed;
     failed = testGlobalContextWithFinalizer() || failed;
     failed = testPingPongStackOverflow() || failed;

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-07-01  Mark Lam  <mark.lam@apple.com>
+
+        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):
+
 2016-07-01  Caio Lima  <ticaiolima@gmail.com>
 

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -2109 +2109 @@
                 FEB58C14187B8B160098EF0B /* ErrorHandlingScope.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FEB58C12187B8B160098EF0B /* ErrorHandlingScope.cpp */; };
                 FEB58C15187B8B160098EF0B /* ErrorHandlingScope.h in Headers */ = {isa = PBXBuildFile; fileRef = FEB58C13187B8B160098EF0B /* ErrorHandlingScope.h */; settings = {ATTRIBUTES = (Private, ); }; };
+                FECB8B271D25BB85006F2463 /* FunctionOverridesTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FECB8B251D25BB6E006F2463 /* FunctionOverridesTest.cpp */; };
+                FECB8B2A1D25CB5A006F2463 /* testapi-function-overrides.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = FECB8B291D25CABB006F2463 /* testapi-function-overrides.js */; };
                 FED287B215EC9A5700DA8161 /* LLIntOpcode.h in Headers */ = {isa = PBXBuildFile; fileRef = FED287B115EC9A5700DA8161 /* LLIntOpcode.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 FED94F2E171E3E2300BE77A4 /* Watchdog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FED94F2B171E3E2300BE77A4 /* Watchdog.cpp */; };
@@ -2237 +2239 @@
                         dstSubfolderSpec = 16;
                         files = (
+                                FECB8B2A1D25CB5A006F2463 /* testapi-function-overrides.js in Copy Support Script */,
                                 5DBB151B131D0B310056AD36 /* testapi.js in Copy Support Script */,
                         );
@@ -4373 +4376 @@
                 FEB58C12187B8B160098EF0B /* ErrorHandlingScope.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ErrorHandlingScope.cpp; sourceTree = "<group>"; };
                 FEB58C13187B8B160098EF0B /* ErrorHandlingScope.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ErrorHandlingScope.h; sourceTree = "<group>"; };
+                FECB8B251D25BB6E006F2463 /* FunctionOverridesTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FunctionOverridesTest.cpp; path = API/tests/FunctionOverridesTest.cpp; sourceTree = "<group>"; };
+                FECB8B261D25BB6E006F2463 /* FunctionOverridesTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FunctionOverridesTest.h; path = API/tests/FunctionOverridesTest.h; sourceTree = "<group>"; };
+                FECB8B291D25CABB006F2463 /* testapi-function-overrides.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = "testapi-function-overrides.js"; path = "API/tests/testapi-function-overrides.js"; sourceTree = "<group>"; };
                 FED287B115EC9A5700DA8161 /* LLIntOpcode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntOpcode.h; path = llint/LLIntOpcode.h; sourceTree = "<group>"; };
                 FED94F2B171E3E2300BE77A4 /* Watchdog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Watchdog.cpp; sourceTree = "<group>"; };
@@ -4958 +4964 @@
                                 FE0D4A041AB8DD0A002F54BF /* ExecutionTimeLimitTest.cpp */,
                                 FE0D4A051AB8DD0A002F54BF /* ExecutionTimeLimitTest.h */,
+                                FECB8B251D25BB6E006F2463 /* FunctionOverridesTest.cpp */,
+                                FECB8B261D25BB6E006F2463 /* FunctionOverridesTest.h */,
                                 FE0D4A071ABA2437002F54BF /* GlobalContextWithFinalizerTest.cpp */,
                                 FE0D4A081ABA2437002F54BF /* GlobalContextWithFinalizerTest.h */,
@@ -4971 +4979 @@
                                 14BD5A2D0A3E91F600BAF59C /* testapi.c */,
                                 14D857740A4696C80032146C /* testapi.js */,
+                                FECB8B291D25CABB006F2463 /* testapi-function-overrides.js */,
                                 86D22219167EF9440024C804 /* testapi.mm */,
                                 651122E5140469BA002B101D /* testRegExp.cpp */,
@@ -8625 +8634 @@
                         files = (
                                 FEF040511AAE662D00BD28B0 /* CompareAndSwapTest.cpp in Sources */,
+                                FECB8B271D25BB85006F2463 /* FunctionOverridesTest.cpp in Sources */,
                                 C29ECB031804D0ED00D2CBB4 /* CurrentThisInsideBlockGetterTest.mm in Sources */,
                                 C20328201981979D0088B499 /* CustomGlobalObjectClassTest.c in Sources */,

trunk/Source/JavaScriptCore/bytecode/UnlinkedFunctionExecutable.cpp

@@ -146 +146 @@
     if (UNLIKELY(Options::functionOverrides())) {
         hasFunctionOverride = FunctionOverrides::initializeOverrideFor(code, overrideInfo);
-        if (hasFunctionOverride) {
+        if (UNLIKELY(hasFunctionOverride)) {
             firstLine = overrideInfo.firstLine;
             lineCount = overrideInfo.lineCount;

trunk/Source/JavaScriptCore/shell/PlatformWin.cmake

@@ -30 +30 @@
     ../API/tests/CustomGlobalObjectClassTest.c
     ../API/tests/ExecutionTimeLimitTest.cpp
+    ../API/tests/FunctionOverridesTest.cpp
     ../API/tests/GlobalContextWithFinalizerTest.cpp
     ../API/tests/PingPongStackOverflowTest.cpp
@@ -48 +49 @@
     ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
 )
+file(COPY
+    "${JAVASCRIPTCORE_DIR}/API/tests/testapi-function-overrides.js"
+    DESTINATION
+    ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
+)

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;

trunk/Source/JavaScriptCore/tools/FunctionOverrides.h

@@ -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
@@ -54 +54 @@
     static bool initializeOverrideFor(const SourceCode& origCode, OverrideInfo& result);
 
+    JS_EXPORT_PRIVATE static void reinstallOverrides();
+
 private:
     void parseOverridesInFile(const char* fileName);
+    void clear() { m_entries.clear(); }
 
     HashMap<String, String> m_entries;