⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 291302 in webkit


Ignore:
Timestamp:
Mar 15, 2022, 10:31:04 AM (5 years ago)
Author:
commit-queue@webkit.org
Message:

Stop using DYLD_INTERPOSE
​https://bugs.webkit.org/show_bug.cgi?id=237867

Patch by Alex Christensen <​achristensen@webkit.org> on 2022-03-15
Reviewed by Anders Carlsson.

Source/WebCore:

It never worked on iOS, and it doesn't work on M1 Macs.
It used to be used for NPAPI and the SecItemShim,
but those have been removed and updated to use other methods that work on M1 Macs.
It is currently only used for tests in editing/secure-input which continue to pass
as much as they did before this change.

  • Configurations/WebCoreTestShim.xcconfig: Removed.
  • WebCore.xcodeproj/project.pbxproj:
  • platform/mac/DynamicLinkerInterposing.h: Removed.
  • testing/WebCoreTestShimLibrary.cpp: Removed.

Tools:

  • Scripts/webkitpy/port/mac.py:

(MacPort.setup_environ_for_server):

  • Scripts/webkitpy/port/mac_unittest.py:

(MacTest.test_setup_environ_for_server):

Location:
trunk
Files:
3 deleted
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r291301 r291302  
     12022-03-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop using DYLD_INTERPOSE
     4        https://bugs.webkit.org/show_bug.cgi?id=237867
     5
     6        Reviewed by Anders Carlsson.
     7
     8        It never worked on iOS, and it doesn't work on M1 Macs.
     9        It used to be used for NPAPI and the SecItemShim,
     10        but those have been removed and updated to use other methods that work on M1 Macs.
     11        It is currently only used for tests in editing/secure-input which continue to pass
     12        as much as they did before this change.
     13
     14        * Configurations/WebCoreTestShim.xcconfig: Removed.
     15        * WebCore.xcodeproj/project.pbxproj:
     16        * platform/mac/DynamicLinkerInterposing.h: Removed.
     17        * testing/WebCoreTestShimLibrary.cpp: Removed.
     18
    1192022-03-15  Antoine Quint  <graouts@webkit.org>
    220

  • trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj

    r291269 r291302  
    1616                                41816F8313859C7A0057AAA4 /* PBXTargetDependency */,
    1717                                41816F8513859C7D0057AAA4 /* PBXTargetDependency */,
    18                                 E1BA671C1742CBF800C20251 /* PBXTargetDependency */,
    1918                        );
    2019                        name = All;
    … …  
    52185217                E1B25107152A0BB00069B779 /* StylePropertyShorthand.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B25105152A0BAF0069B779 /* StylePropertyShorthand.h */; };
    52195218                E1B533491717DEE300F205F9 /* CachedRawResourceClient.h in Headers */ = {isa = PBXBuildFile; fileRef = E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5220                 E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */; settings = {ATTRIBUTES = (Private, ); }; };
    5221                 E1BA671A1742BEF400C20251 /* WebCoreTestShimLibrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */; };
    52225219                E1BD331A182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BD3318182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.h */; };
    52235220                E1BE512E0CF6C512002EA959 /* XSLTUnicodeSort.h in Headers */ = {isa = PBXBuildFile; fileRef = E1BE512C0CF6C512002EA959 /* XSLTUnicodeSort.h */; };
    … …  
    58225819                        remoteGlobalIDString = DD041FBE09D9DDBE0010AF2A;
    58235820                        remoteInfo = "Derived Sources";
    5824                 };
    5825                 E1BA66F51742BDE000C20251 /* PBXContainerItemProxy */ = {
    5826                         isa = PBXContainerItemProxy;
    5827                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    5828                         proxyType = 1;
    5829                         remoteGlobalIDString = 93F198A508245E59001E9ABC;
    5830                         remoteInfo = WebCore;
    5831                 };
    5832                 E1BA671B1742CBF800C20251 /* PBXContainerItemProxy */ = {
    5833                         isa = PBXContainerItemProxy;
    5834                         containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
    5835                         proxyType = 1;
    5836                         remoteGlobalIDString = E1BA66F31742BDE000C20251;
    5837                         remoteInfo = WebCoreTestShim;
    58385821                };
    58395822/* End PBXContainerItemProxy section */
    … …  
    1720717190                E1B533481717DEE300F205F9 /* CachedRawResourceClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CachedRawResourceClient.h; sourceTree = "<group>"; };
    1720817191                E1BA003016FB92AC00BA7A35 /* ResourceHandleClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResourceHandleClient.cpp; sourceTree = "<group>"; };
    17209                 E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DynamicLinkerInterposing.h; sourceTree = "<group>"; };
    17210                 E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = WebCoreTestShim.xcconfig; sourceTree = "<group>"; };
    17211                 E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libWebCoreTestShim.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
    17212                 E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebCoreTestShimLibrary.cpp; sourceTree = "<group>"; };
    1721317192                E1BB84AC1822CA7400525043 /* CryptoAlgorithmRegistryMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRegistryMac.cpp; sourceTree = "<group>"; };
    1721417193                E1BD3317182D8DDD00C05D9F /* CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CryptoAlgorithmRSASSA_PKCS1_v1_5.cpp; sourceTree = "<group>"; };
    … …  
    1838518364                        runOnlyForDeploymentPostprocessing = 0;
    1838618365                };
    18387                 E1BA670E1742BDE000C20251 /* Frameworks */ = {
    18388                         isa = PBXFrameworksBuildPhase;
    18389                         buildActionMask = 2147483647;
    18390                         files = (
    18391                         );
    18392                         runOnlyForDeploymentPostprocessing = 0;
    18393                 };
    1839418366/* End PBXFrameworksBuildPhase section */
    1839518367
    … …  
    1841218384                        isa = PBXGroup;
    1841318385                        children = (
    18414                                 E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */,
    1841518386                                417DA6D013734E02007C57FB /* libWebCoreTestSupport.dylib */,
    1841618387                                93F19B1A08245E5A001E9ABC /* WebCore.framework */,
    … …  
    2049120462                                1C904DF90BA9D2C80081E9D0 /* Version.xcconfig */,
    2049220463                                1CDD45E50BA9C84600F90147 /* WebCore.xcconfig */,
    20493                                 E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */,
    2049420464                                4181707D1386EDF20057AAA4 /* WebCoreTestSupport.xcconfig */,
    2049520465                                37119A7920CCB610002C6DC9 /* WebKitTargetConditionals.xcconfig */,
    … …  
    2121821188                                EB081CD81696084400553730 /* TypeConversions.h */,
    2121921189                                EB081CD91696084400553730 /* TypeConversions.idl */,
    21220                                 E1BA67191742BEF400C20251 /* WebCoreTestShimLibrary.cpp */,
    2122121190                                E18D83E9243F71D3009247D6 /* WebFakeXRDevice.cpp */,
    2122221191                                E18D83ED243F71D6009247D6 /* WebFakeXRDevice.h */,
    … …  
    2399323962                                F4B2A90626502BA0009E7286 /* DataDetectorHighlight.h */,
    2399423963                                F4B2A90826502BC0009E7286 /* DataDetectorHighlight.mm */,
    23995                                 E1BA66F01742BD8600C20251 /* DynamicLinkerInterposing.h */,
    2399623964                                510A91E524CFCC1800BFD89C /* HIDDevice.cpp */,
    2399723965                                510A91E224CFCC1800BFD89C /* HIDDevice.h */,
    … …  
    3448734455                                93D6B7A82551D41F0058DD3A /* DummySpeechRecognitionProvider.h in Headers */,
    3448834456                                93085DF826E822C7000EC6A7 /* DummyStorageProvider.h in Headers */,
    34489                                 E1BA66F11742BD8600C20251 /* DynamicLinkerInterposing.h in Headers */,
    3449034457                                FD6ED2C8136B8E66003CF072 /* DynamicsCompressor.h in Headers */,
    3449134458                                FD537357137B653B00008DCE /* DynamicsCompressorKernel.h in Headers */,
    … …  
    3830938276                        runOnlyForDeploymentPostprocessing = 0;
    3831038277                };
    38311                 E1BA66F61742BDE000C20251 /* Headers */ = {
    38312                         isa = PBXHeadersBuildPhase;
    38313                         buildActionMask = 2147483647;
    38314                         files = (
    38315                         );
    38316                         runOnlyForDeploymentPostprocessing = 0;
    38317                 };
    3831838278/* End PBXHeadersBuildPhase section */
    3831938279
    … …  
    3837138331                        productReference = 93F19B1A08245E5A001E9ABC /* WebCore.framework */;
    3837238332                        productType = "com.apple.product-type.framework";
    38373                 };
    38374                 E1BA66F31742BDE000C20251 /* WebCoreTestShim */ = {
    38375                         isa = PBXNativeTarget;
    38376                         buildConfigurationList = E1BA67121742BDE000C20251 /* Build configuration list for PBXNativeTarget "WebCoreTestShim" */;
    38377                         buildPhases = (
    38378                                 E1BA66F61742BDE000C20251 /* Headers */,
    38379                                 E1BA67021742BDE000C20251 /* Sources */,
    38380                                 E1BA670E1742BDE000C20251 /* Frameworks */,
    38381                         );
    38382                         buildRules = (
    38383                         );
    38384                         dependencies = (
    38385                                 E1BA66F41742BDE000C20251 /* PBXTargetDependency */,
    38386                         );
    38387                         name = WebCoreTestShim;
    38388                         productName = WebCoreTestSupport;
    38389                         productReference = E1BA67161742BDE000C20251 /* libWebCoreTestShim.dylib */;
    38390                         productType = "com.apple.product-type.library.dynamic";
    3839138333                };
    3839238334/* End PBXNativeTarget section */
    … …  
    3843638378                                DD041FBE09D9DDBE0010AF2A /* Derived Sources */,
    3843738379                                417DA6CF13734E02007C57FB /* WebCoreTestSupport */,
    38438                                 E1BA66F31742BDE000C20251 /* WebCoreTestShim */,
    3843938380                                5325BDC621DFF33700A0DEE1 /* Apply Configuration to XCFileLists */,
    3844038381                        );
    … …  
    3952339464                        runOnlyForDeploymentPostprocessing = 0;
    3952439465                };
    39525                 E1BA67021742BDE000C20251 /* Sources */ = {
    39526                         isa = PBXSourcesBuildPhase;
    39527                         buildActionMask = 2147483647;
    39528                         files = (
    39529                                 E1BA671A1742BEF400C20251 /* WebCoreTestShimLibrary.cpp in Sources */,
    39530                         );
    39531                         runOnlyForDeploymentPostprocessing = 0;
    39532                 };
    3953339466/* End PBXSourcesBuildPhase section */
    3953439467
    … …  
    3956339496                        target = DD041FBE09D9DDBE0010AF2A /* Derived Sources */;
    3956439497                        targetProxy = DD041FF009D9E3250010AF2A /* PBXContainerItemProxy */;
    39565                 };
    39566                 E1BA66F41742BDE000C20251 /* PBXTargetDependency */ = {
    39567                         isa = PBXTargetDependency;
    39568                         target = 93F198A508245E59001E9ABC /* WebCore */;
    39569                         targetProxy = E1BA66F51742BDE000C20251 /* PBXContainerItemProxy */;
    39570                 };
    39571                 E1BA671C1742CBF800C20251 /* PBXTargetDependency */ = {
    39572                         isa = PBXTargetDependency;
    39573                         target = E1BA66F31742BDE000C20251 /* WebCoreTestShim */;
    39574                         targetProxy = E1BA671B1742CBF800C20251 /* PBXContainerItemProxy */;
    3957539498                };
    3957639499/* End PBXTargetDependency section */
    … …  
    3976539688                        name = Production;
    3976639689                };
    39767                 E1BA67131742BDE000C20251 /* Debug */ = {
    39768                         isa = XCBuildConfiguration;
    39769                         baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
    39770                         buildSettings = {
    39771                         };
    39772                         name = Debug;
    39773                 };
    39774                 E1BA67141742BDE000C20251 /* Release */ = {
    39775                         isa = XCBuildConfiguration;
    39776                         baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
    39777                         buildSettings = {
    39778                         };
    39779                         name = Release;
    39780                 };
    39781                 E1BA67151742BDE000C20251 /* Production */ = {
    39782                         isa = XCBuildConfiguration;
    39783                         baseConfigurationReference = E1BA66F21742BDCC00C20251 /* WebCoreTestShim.xcconfig */;
    39784                         buildSettings = {
    39785                         };
    39786                         name = Production;
    39787                 };
    3978839690/* End XCBuildConfiguration section */
    3978939691
    … …  
    3985939761                        defaultConfigurationName = Production;
    3986039762                };
    39861                 E1BA67121742BDE000C20251 /* Build configuration list for PBXNativeTarget "WebCoreTestShim" */ = {
    39862                         isa = XCConfigurationList;
    39863                         buildConfigurations = (
    39864                                 E1BA67131742BDE000C20251 /* Debug */,
    39865                                 E1BA67141742BDE000C20251 /* Release */,
    39866                                 E1BA67151742BDE000C20251 /* Production */,
    39867                         );
    39868                         defaultConfigurationIsVisible = 0;
    39869                         defaultConfigurationName = Production;
    39870                 };
    3987139763/* End XCConfigurationList section */
    3987239764        };

  • trunk/Tools/ChangeLog

    r291292 r291302  
     12022-03-15  Alex Christensen  <achristensen@webkit.org>
     2
     3        Stop using DYLD_INTERPOSE
     4        https://bugs.webkit.org/show_bug.cgi?id=237867
     5
     6        Reviewed by Anders Carlsson.
     7
     8        * Scripts/webkitpy/port/mac.py:
     9        (MacPort.setup_environ_for_server):
     10        * Scripts/webkitpy/port/mac_unittest.py:
     11        (MacTest.test_setup_environ_for_server):
     12
    1132022-03-14  Jonathan Bedard  <jbedard@apple.com>
    214

  • trunk/Tools/Scripts/webkitpy/port/mac.py

    r281988 r291302  
    186186                self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
    187187                self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
    188             self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
    189188        env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
    190189        return env

  • trunk/Tools/Scripts/webkitpy/port/mac_unittest.py

    r280196 r291302  
    8989        self.assertEqual(env['MallocStackLogging'], '1')
    9090        self.assertEqual(env['MallocScribble'], '1')
    91         self.assertEqual(env['DYLD_INSERT_LIBRARIES'], '/usr/lib/libgmalloc.dylib:/mock-build/libWebCoreTestShim.dylib')
     91        self.assertEqual(env['DYLD_INSERT_LIBRARIES'], '/usr/lib/libgmalloc.dylib')
    9292
    9393    def test_show_results_html_file(self):
Note: See TracChangeset for help on using the changeset viewer.