Attachment 341331 Details for Bug 185997 – [PATCH] Proposed Fix

[patch] [PATCH] Proposed Fix

stale-1.patch (text/plain), 13.71 KB, created by Joseph Pecoraro on 2018-05-25 14:54:17 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Pecoraro

Created: 2018-05-25 14:54:17 PDT

Size: 13.71 KB

patch

obsolete

>diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
>index e39fce3aa35..54d83935b33 100644
>--- a/Source/bmalloc/ChangeLog
>+++ b/Source/bmalloc/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-25  Joseph Pecoraro  <pecoraro@apple.com>
>+
>+        [Cocoa]: Remove  what appears to be a stale mbmalloc target
>+        https://bugs.webkit.org/show_bug.cgi?id=185997
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * bmalloc.xcodeproj/project.pbxproj:
>+        * bmalloc/mbmalloc.cpp: Removed.
>+
> 2018-05-23  Antti Koivisto  <antti@apple.com>
> 
>         Increase the simulated memory size on PLATFORM(IOS_SIMULATOR) from 512MB to 1024MB
>diff --git a/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj b/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj
>index bd3889e93dd..b447389b6f5 100644
>--- a/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj
>+++ b/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj
>@@ -90,7 +90,6 @@
> 		143CB81D19022BC900B16A45 /* Mutex.h in Headers */ = {isa = PBXBuildFile; fileRef = 143CB81B19022BC900B16A45 /* Mutex.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1440AFCB1A95261100837FAA /* Zone.h in Headers */ = {isa = PBXBuildFile; fileRef = 1440AFCA1A95261100837FAA /* Zone.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		1440AFCD1A9527AF00837FAA /* Zone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1440AFCC1A9527AF00837FAA /* Zone.cpp */; };
>-		1448C30018F3754600502839 /* mbmalloc.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1448C2FF18F3754300502839 /* mbmalloc.cpp */; };
> 		1448C30118F3754C00502839 /* bmalloc.h in Headers */ = {isa = PBXBuildFile; fileRef = 1448C2FE18F3754300502839 /* bmalloc.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		144BE11F1CA346520099C8C0 /* Object.h in Headers */ = {isa = PBXBuildFile; fileRef = 144BE11E1CA346520099C8C0 /* Object.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		144C07F41C7B70260051BB6A /* LargeMap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 144C07F21C7B70260051BB6A /* LargeMap.cpp */; };
>@@ -102,7 +101,6 @@
> 		14C8992B1CC485E70027A057 /* Map.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C8992A1CC485E70027A057 /* Map.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14C8992D1CC578330027A057 /* LargeRange.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C8992C1CC578330027A057 /* LargeRange.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14C919C918FCC59F0028DB43 /* BPlatform.h in Headers */ = {isa = PBXBuildFile; fileRef = 14C919C818FCC59F0028DB43 /* BPlatform.h */; settings = {ATTRIBUTES = (Private, ); }; };
>-		14CC394C18EA8858004AFE34 /* libbmalloc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14F271BE18EA3963008C152F /* libbmalloc.a */; };
> 		14DD789018F48CEB00950702 /* Sizes.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F6874179DF84100D65598 /* Sizes.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14DD789318F48D0F00950702 /* ObjectType.h in Headers */ = {isa = PBXBuildFile; fileRef = 1485656018A43DBA00ED6942 /* ObjectType.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		14DD789818F48D4A00950702 /* Allocator.h in Headers */ = {isa = PBXBuildFile; fileRef = 145F6856179DC8CA00D65598 /* Allocator.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -154,13 +152,6 @@
> 			remoteGlobalIDString = 14F271BD18EA3963008C152F;
> 			remoteInfo = bmalloc;
> 		};
>-		14CC394D18EA8861004AFE34 /* PBXContainerItemProxy */ = {
>-			isa = PBXContainerItemProxy;
>-			containerPortal = 145F6837179DC45F00D65598 /* Project object */;
>-			proxyType = 1;
>-			remoteGlobalIDString = 14F271BD18EA3963008C152F;
>-			remoteInfo = bmalloc;
>-		};
> /* End PBXContainerItemProxy section */
> 
> /* Begin PBXCopyFilesBuildPhase section */
>@@ -255,7 +246,6 @@
> 		144469FD17A61F1F00F9EA1D /* PerThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = PerThread.h; path = bmalloc/PerThread.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
> 		14446A0717A61FA400F9EA1D /* PerProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PerProcess.h; path = bmalloc/PerProcess.h; sourceTree = "<group>"; };
> 		1448C2FE18F3754300502839 /* bmalloc.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = bmalloc.h; path = bmalloc/bmalloc.h; sourceTree = "<group>"; };
>-		1448C2FF18F3754300502839 /* mbmalloc.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = mbmalloc.cpp; path = bmalloc/mbmalloc.cpp; sourceTree = "<group>"; };
> 		144BE11E1CA346520099C8C0 /* Object.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Object.h; path = bmalloc/Object.h; sourceTree = "<group>"; };
> 		144C07F21C7B70260051BB6A /* LargeMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LargeMap.cpp; path = bmalloc/LargeMap.cpp; sourceTree = "<group>"; };
> 		144C07F31C7B70260051BB6A /* LargeMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LargeMap.h; path = bmalloc/LargeMap.h; sourceTree = "<group>"; };
>@@ -282,7 +272,6 @@
> 		14C8992A1CC485E70027A057 /* Map.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Map.h; path = bmalloc/Map.h; sourceTree = "<group>"; };
> 		14C8992C1CC578330027A057 /* LargeRange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LargeRange.h; path = bmalloc/LargeRange.h; sourceTree = "<group>"; };
> 		14C919C818FCC59F0028DB43 /* BPlatform.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BPlatform.h; path = bmalloc/BPlatform.h; sourceTree = "<group>"; };
>-		14CC394418EA8743004AFE34 /* libmbmalloc.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libmbmalloc.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
> 		14D9DB4517F2447100EAAB79 /* FixedVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = FixedVector.h; path = bmalloc/FixedVector.h; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
> 		14DA320C18875B09007269E0 /* Heap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Heap.h; path = bmalloc/Heap.h; sourceTree = "<group>"; };
> 		14DA320E18875D9F007269E0 /* Heap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Heap.cpp; path = bmalloc/Heap.cpp; sourceTree = "<group>"; };
>@@ -308,14 +297,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		14CC394118EA8743004AFE34 /* Frameworks */ = {
>-			isa = PBXFrameworksBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-				14CC394C18EA8858004AFE34 /* libbmalloc.a in Frameworks */,
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> 		14F271BB18EA3963008C152F /* Frameworks */ = {
> 			isa = PBXFrameworksBuildPhase;
> 			buildActionMask = 2147483647;
>@@ -395,7 +376,6 @@
> 			children = (
> 				0F5167731FAD6852008236A8 /* bmalloc.cpp */,
> 				1448C2FE18F3754300502839 /* bmalloc.h */,
>-				1448C2FF18F3754300502839 /* mbmalloc.cpp */,
> 			);
> 			name = api;
> 			sourceTree = "<group>";
>@@ -422,7 +402,6 @@
> 			children = (
> 				0F7EB7EF1F95285300F1ABCB /* testbmalloc */,
> 				14F271BE18EA3963008C152F /* libbmalloc.a */,
>-				14CC394418EA8743004AFE34 /* libmbmalloc.dylib */,
> 			);
> 			name = Products;
> 			sourceTree = "<group>";
>@@ -552,13 +531,6 @@
> /* End PBXGroup section */
> 
> /* Begin PBXHeadersBuildPhase section */
>-		14CC394218EA8743004AFE34 /* Headers */ = {
>-			isa = PBXHeadersBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> 		14F271BC18EA3963008C152F /* Headers */ = {
> 			isa = PBXHeadersBuildPhase;
> 			buildActionMask = 2147483647;
>@@ -672,24 +644,6 @@
> 			productReference = 0F7EB7EF1F95285300F1ABCB /* testbmalloc */;
> 			productType = "com.apple.product-type.tool";
> 		};
>-		14CC394318EA8743004AFE34 /* mbmalloc */ = {
>-			isa = PBXNativeTarget;
>-			buildConfigurationList = 14CC394518EA8743004AFE34 /* Build configuration list for PBXNativeTarget "mbmalloc" */;
>-			buildPhases = (
>-				14CC394018EA8743004AFE34 /* Sources */,
>-				14CC394118EA8743004AFE34 /* Frameworks */,
>-				14CC394218EA8743004AFE34 /* Headers */,
>-			);
>-			buildRules = (
>-			);
>-			dependencies = (
>-				14CC394E18EA8861004AFE34 /* PBXTargetDependency */,
>-			);
>-			name = mbmalloc;
>-			productName = mbmalloc;
>-			productReference = 14CC394418EA8743004AFE34 /* libmbmalloc.dylib */;
>-			productType = "com.apple.product-type.library.dynamic";
>-		};
> 		14F271BD18EA3963008C152F /* bmalloc */ = {
> 			isa = PBXNativeTarget;
> 			buildConfigurationList = 14F271BF18EA3963008C152F /* Build configuration list for PBXNativeTarget "bmalloc" */;
>@@ -740,7 +694,6 @@
> 			targets = (
> 				0F7EB8501F95504B00F1ABCB /* All */,
> 				14F271BD18EA3963008C152F /* bmalloc */,
>-				14CC394318EA8743004AFE34 /* mbmalloc */,
> 				0F7EB7EE1F95285300F1ABCB /* testbmalloc */,
> 			);
> 		};
>@@ -755,14 +708,6 @@
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>-		14CC394018EA8743004AFE34 /* Sources */ = {
>-			isa = PBXSourcesBuildPhase;
>-			buildActionMask = 2147483647;
>-			files = (
>-				1448C30018F3754600502839 /* mbmalloc.cpp in Sources */,
>-			);
>-			runOnlyForDeploymentPostprocessing = 0;
>-		};
> 		14F271BA18EA3963008C152F /* Sources */ = {
> 			isa = PBXSourcesBuildPhase;
> 			buildActionMask = 2147483647;
>@@ -810,11 +755,6 @@
> 			target = 14F271BD18EA3963008C152F /* bmalloc */;
> 			targetProxy = 0F7EB8551F95505400F1ABCB /* PBXContainerItemProxy */;
> 		};
>-		14CC394E18EA8861004AFE34 /* PBXTargetDependency */ = {
>-			isa = PBXTargetDependency;
>-			target = 14F271BD18EA3963008C152F /* bmalloc */;
>-			targetProxy = 14CC394D18EA8861004AFE34 /* PBXContainerItemProxy */;
>-		};
> /* End PBXTargetDependency section */
> 
> /* Begin XCBuildConfiguration section */
>@@ -880,13 +820,6 @@
> 			};
> 			name = Production;
> 		};
>-		14202F1118F37C15006C37DB /* Production */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = 14B650C918F3A04200751968 /* mbmalloc.xcconfig */;
>-			buildSettings = {
>-			};
>-			name = Production;
>-		};
> 		145F684A179DC45F00D65598 /* Debug */ = {
> 			isa = XCBuildConfiguration;
> 			baseConfigurationReference = 14B650C718F39F4800751968 /* DebugRelease.xcconfig */;
>@@ -905,20 +838,6 @@
> 			};
> 			name = Release;
> 		};
>-		14CC394618EA8743004AFE34 /* Debug */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = 14B650C918F3A04200751968 /* mbmalloc.xcconfig */;
>-			buildSettings = {
>-			};
>-			name = Debug;
>-		};
>-		14CC394718EA8743004AFE34 /* Release */ = {
>-			isa = XCBuildConfiguration;
>-			baseConfigurationReference = 14B650C918F3A04200751968 /* mbmalloc.xcconfig */;
>-			buildSettings = {
>-			};
>-			name = Release;
>-		};
> 		14F271C018EA3963008C152F /* Debug */ = {
> 			isa = XCBuildConfiguration;
> 			baseConfigurationReference = 14B650C618F39F4800751968 /* bmalloc.xcconfig */;
>@@ -966,16 +885,6 @@
> 			defaultConfigurationIsVisible = 0;
> 			defaultConfigurationName = Production;
> 		};
>-		14CC394518EA8743004AFE34 /* Build configuration list for PBXNativeTarget "mbmalloc" */ = {
>-			isa = XCConfigurationList;
>-			buildConfigurations = (
>-				14CC394618EA8743004AFE34 /* Debug */,
>-				14CC394718EA8743004AFE34 /* Release */,
>-				14202F1118F37C15006C37DB /* Production */,
>-			);
>-			defaultConfigurationIsVisible = 0;
>-			defaultConfigurationName = Production;
>-		};
> 		14F271BF18EA3963008C152F /* Build configuration list for PBXNativeTarget "bmalloc" */ = {
> 			isa = XCConfigurationList;
> 			buildConfigurations = (
>diff --git a/Source/bmalloc/bmalloc/mbmalloc.cpp b/Source/bmalloc/bmalloc/mbmalloc.cpp
>deleted file mode 100644
>index 4ca3d3e9682..00000000000
>--- a/Source/bmalloc/bmalloc/mbmalloc.cpp
>+++ /dev/null
>@@ -1,63 +0,0 @@
>-/*
>- * Copyright (C) 2014 Apple Inc. All rights reserved.
>- *
>- * Redistribution and use in source and binary forms, with or without
>- * modification, are permitted provided that the following conditions
>- * are met:
>- * 1. Redistributions of source code must retain the above copyright
>- *    notice, this list of conditions and the following disclaimer.
>- * 2. Redistributions in binary form must reproduce the above copyright
>- *    notice, this list of conditions and the following disclaimer in the
>- *    documentation and/or other materials provided with the distribution.
>- *
>- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
>- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
>- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
>- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
>- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
>- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
>- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
>- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
>- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
>- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
>- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
>- */
>-
>-#include "bmalloc.h"
>-
>-#include "BExport.h"
>-
>-extern "C" {
>-
>-BEXPORT void* mbmalloc(size_t);
>-BEXPORT void* mbmemalign(size_t, size_t);
>-BEXPORT void mbfree(void*, size_t);
>-BEXPORT void* mbrealloc(void*, size_t, size_t);
>-BEXPORT void mbscavenge();
>-    
>-void* mbmalloc(size_t size)
>-{
>-    return bmalloc::api::malloc(size);
>-}
>-
>-void* mbmemalign(size_t alignment, size_t size)
>-{
>-    return bmalloc::api::memalign(alignment, size);
>-}
>-
>-void mbfree(void* p, size_t)
>-{
>-    bmalloc::api::free(p);
>-}
>-
>-void* mbrealloc(void* p, size_t, size_t size)
>-{
>-    return bmalloc::api::realloc(p, size);
>-}
>-
>-void mbscavenge()
>-{
>-    bmalloc::api::scavenge();
>-}
>-
>-} // extern "C"

Actions: View | Formatted Diff | Diff

Attachments on bug 185997: 341331