<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[269382] trunk/Source/bmalloc</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/269382">269382</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2020-11-04 13:37:05 -0800 (Wed, 04 Nov 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove bmalloc::logVMFailure() and BSoftLinking.h
<https://webkit.org/b/218571>
<rdar://problem/69813381>

Reviewed by Geoffrey Garen.

* PlatformMac.cmake:
* bmalloc.xcodeproj/project.pbxproj:
- Remove BSoftLinking.h from project files.

* bmalloc/Logging.cpp:
* bmalloc/Logging.h:
(bmalloc::logVMFailure): Delete.

* bmalloc/darwin/BSoftLinking.h: Remove.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocPlatformMaccmake">trunk/Source/bmalloc/PlatformMac.cmake</a></li>
<li><a href="#trunkSourcebmallocbmallocLoggingcpp">trunk/Source/bmalloc/bmalloc/Logging.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocLoggingh">trunk/Source/bmalloc/bmalloc/Logging.h</a></li>
<li><a href="#trunkSourcebmallocbmallocxcodeprojprojectpbxproj">trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj</a></li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocbmallocdarwinBSoftLinkingh">trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog   2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/ChangeLog      2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2020-11-04  David Kilzer  <ddkilzer@apple.com>
</span><span class="cx"> 
</span><ins>+        Remove bmalloc::logVMFailure() and BSoftLinking.h
+        <https://webkit.org/b/218571>
+        <rdar://problem/69813381>
+
+        Reviewed by Geoffrey Garen.
+
+        * PlatformMac.cmake:
+        * bmalloc.xcodeproj/project.pbxproj:
+        - Remove BSoftLinking.h from project files.
+
+        * bmalloc/Logging.cpp:
+        * bmalloc/Logging.h:
+        (bmalloc::logVMFailure): Delete.
+
+        * bmalloc/darwin/BSoftLinking.h: Remove.
+
+2020-11-04  David Kilzer  <ddkilzer@apple.com>
+
</ins><span class="cx">         WebKit should remove unused debug variant support
</span><span class="cx">         <https://webkit.org/b/218315>
</span><span class="cx">         <rdar://problem/70785369>
</span></span></pre></div>
<a id="trunkSourcebmallocPlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/PlatformMac.cmake (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/PlatformMac.cmake   2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/PlatformMac.cmake      2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -5,6 +5,5 @@
</span><span class="cx"> )
</span><span class="cx"> 
</span><span class="cx"> list(APPEND bmalloc_PUBLIC_HEADERS
</span><del>-    bmalloc/darwin/BSoftLinking.h
</del><span class="cx">     bmalloc/darwin/MemoryStatusSPI.h
</span><span class="cx"> )
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLoggingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Logging.cpp (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Logging.cpp 2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/bmalloc/Logging.cpp    2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -31,31 +31,8 @@
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if BPLATFORM(IOS_FAMILY)
-#include <CoreFoundation/CoreFoundation.h>
-#include <mach/exception_types.h>
-#include <objc/objc.h>
-#include <unistd.h>
-
-#include "BSoftLinking.h"
-BSOFT_LINK_PRIVATE_FRAMEWORK(CrashReporterSupport);
-BSOFT_LINK_FUNCTION(CrashReporterSupport, SimulateCrash, BOOL, (pid_t pid, mach_exception_data_type_t exceptionCode, CFStringRef description), (pid, exceptionCode, description));
-#endif
-
</del><span class="cx"> namespace bmalloc {
</span><span class="cx"> 
</span><del>-void logVMFailure(size_t vmSize)
-{
-#if BPLATFORM(IOS_FAMILY)
-    const mach_exception_data_type_t kExceptionCode = 0xc105ca11;
-    CFStringRef description = CFStringCreateWithFormat(kCFAllocatorDefault, nullptr, CFSTR("bmalloc failed to mmap %lu bytes"), vmSize);
-    SimulateCrash(getpid(), kExceptionCode, description);
-    CFRelease(description);
-#else
-    BUNUSED_PARAM(vmSize);
-#endif
-}
-
</del><span class="cx"> #if !BUSE(OS_LOG)
</span><span class="cx"> void reportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* format, ...)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocLoggingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Logging.h (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Logging.h   2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/bmalloc/Logging.h      2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -31,8 +31,6 @@
</span><span class="cx"> 
</span><span class="cx"> namespace bmalloc {
</span><span class="cx"> 
</span><del>-BEXPORT void logVMFailure(size_t vmSize);
-
</del><span class="cx"> #if !BUSE(OS_LOG)
</span><span class="cx"> void reportAssertionFailureWithMessage(const char* file, int line, const char* function, const char* format, ...) BATTRIBUTE_PRINTF(4, 5);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocdarwinBSoftLinkingh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h       2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/bmalloc/darwin/BSoftLinking.h  2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -1,66 +0,0 @@
</span><del>-/*
- * Copyright (C) 2007, 2008, 2011-2016 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. AND ITS CONTRIBUTORS ``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 ITS 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.
- */
-
-#ifndef BSoftLinking_h
-#define BSoftLinking_h
-
-#include "BAssert.h"
-#include <dlfcn.h>
-#include <mutex>
-
-#define BSOFT_LINK_PRIVATE_FRAMEWORK(framework) \
-    static void* framework##Library() \
-    { \
-        static void* frameworkLibrary; \
-        static std::once_flag once; \
-        std::call_once(once, [] { \
-            frameworkLibrary = dlopen("/System/Library/PrivateFrameworks/" #framework ".framework/" #framework, RTLD_NOW); \
-            RELEASE_BASSERT_WITH_MESSAGE(frameworkLibrary, "%s", dlerror()); \
-        }); \
-        return frameworkLibrary; \
-    }
-
-#define BSOFT_LINK_FUNCTION(framework, functionName, resultType, parameterDeclarations, parameterNames) \
-    extern "C" { \
-    resultType functionName parameterDeclarations; \
-    } \
-    static resultType init##functionName parameterDeclarations; \
-    static resultType (*softLink##functionName) parameterDeclarations = init##functionName; \
-    \
-    static resultType init##functionName parameterDeclarations \
-    { \
-        static std::once_flag once; \
-        std::call_once(once, [] { \
-            softLink##functionName = (resultType (*) parameterDeclarations) dlsym(framework##Library(), #functionName); \
-            RELEASE_BASSERT_WITH_MESSAGE(softLink##functionName, "%s", dlerror()); \
-        }); \
-        return softLink##functionName parameterNames; \
-    } \
-    \
-    inline resultType functionName parameterDeclarations \
-    { \
-        return softLink##functionName parameterNames; \
-    }
-
-#endif // BSoftLinking_h
</del></span></pre></div>
<a id="trunkSourcebmallocbmallocxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj (269381 => 269382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj   2020-11-04 21:31:51 UTC (rev 269381)
+++ trunk/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj      2020-11-04 21:37:05 UTC (rev 269382)
</span><span class="lines">@@ -126,7 +126,6 @@
</span><span class="cx">          14F271C818EA3990008C152F /* ObjectType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14105E8318E14374003A106E /* ObjectType.cpp */; };
</span><span class="cx">          4426E2801C838EE0008EB042 /* Logging.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4426E27E1C838EE0008EB042 /* Logging.cpp */; };
</span><span class="cx">          4426E2811C838EE0008EB042 /* Logging.h in Headers */ = {isa = PBXBuildFile; fileRef = 4426E27F1C838EE0008EB042 /* Logging.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>-               4426E2831C839547008EB042 /* BSoftLinking.h in Headers */ = {isa = PBXBuildFile; fileRef = 4426E2821C839547008EB042 /* BSoftLinking.h */; };
</del><span class="cx">           52F47249210BA30200B730BB /* MemoryStatusSPI.h in Headers */ = {isa = PBXBuildFile; fileRef = 52F47248210BA2F500B730BB /* MemoryStatusSPI.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">          6599C5CC1EC3F15900A2F7BB /* AvailableMemory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6599C5CA1EC3F15900A2F7BB /* AvailableMemory.cpp */; };
</span><span class="cx">          6599C5CD1EC3F15900A2F7BB /* AvailableMemory.h in Headers */ = {isa = PBXBuildFile; fileRef = 6599C5CB1EC3F15900A2F7BB /* AvailableMemory.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -283,7 +282,6 @@
</span><span class="cx">          14F271BE18EA3963008C152F /* libbmalloc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbmalloc.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx">          4426E27E1C838EE0008EB042 /* Logging.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Logging.cpp; path = bmalloc/Logging.cpp; sourceTree = "<group>"; };
</span><span class="cx">          4426E27F1C838EE0008EB042 /* Logging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Logging.h; path = bmalloc/Logging.h; sourceTree = "<group>"; };
</span><del>-               4426E2821C839547008EB042 /* BSoftLinking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BSoftLinking.h; path = bmalloc/darwin/BSoftLinking.h; sourceTree = "<group>"; };
</del><span class="cx">           52F47248210BA2F500B730BB /* MemoryStatusSPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MemoryStatusSPI.h; path = bmalloc/darwin/MemoryStatusSPI.h; sourceTree = "<group>"; };
</span><span class="cx">          6599C5CA1EC3F15900A2F7BB /* AvailableMemory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AvailableMemory.cpp; path = bmalloc/AvailableMemory.cpp; sourceTree = "<group>"; };
</span><span class="cx">          6599C5CB1EC3F15900A2F7BB /* AvailableMemory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AvailableMemory.h; path = bmalloc/AvailableMemory.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -559,7 +557,6 @@
</span><span class="cx">          4408F2961C9896C40012EC64 /* darwin */ = {
</span><span class="cx">                  isa = PBXGroup;
</span><span class="cx">                  children = (
</span><del>-                               4426E2821C839547008EB042 /* BSoftLinking.h */,
</del><span class="cx">                           52F47248210BA2F500B730BB /* MemoryStatusSPI.h */,
</span><span class="cx">                  );
</span><span class="cx">                  name = darwin;
</span><span class="lines">@@ -592,7 +589,6 @@
</span><span class="cx">                          1448C30118F3754C00502839 /* bmalloc.h in Headers */,
</span><span class="cx">                          0F7EB84D1F9541C700F1ABCB /* BMalloced.h in Headers */,
</span><span class="cx">                          14C919C918FCC59F0028DB43 /* BPlatform.h in Headers */,
</span><del>-                               4426E2831C839547008EB042 /* BSoftLinking.h in Headers */,
</del><span class="cx">                           7939885B2076EEB60074A2E7 /* BulkDecommit.h in Headers */,
</span><span class="cx">                          14DD789C18F48D4A00950702 /* BumpAllocator.h in Headers */,
</span><span class="cx">                          140FA00319CE429C00FFD3C8 /* BumpRange.h in Headers */,
</span></span></pre>
</div>
</div>

</body>
</html>