<!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>[200568] trunk/Source</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/200568">200568</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-08 21:55:34 -0700 (Sun, 08 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[COCOA] Disable HAVE_DTRACE at build time
https://bugs.webkit.org/show_bug.cgi?id=157433
<rdar://problem/26148841>
Reviewed by Mark Lam.
Source/JavaScriptCore:
Drop DTRACE-related code from JSC since it is very old and seems
unused.
* JavaScriptCore.xcodeproj/project.pbxproj:
* PlatformMac.cmake:
* heap/Heap.cpp:
(JSC::Heap::collectImpl): Deleted.
(JSC::Heap::didFinishCollection): Deleted.
* profiler/ProfileGenerator.cpp:
(JSC::ProfileGenerator::willExecute): Deleted.
(JSC::ProfileGenerator::didExecute): Deleted.
* runtime/Tracing.d: Removed.
* runtime/Tracing.h: Removed.
Source/WTF:
Disable HAVE_DTRACE on COCOA since it is mostly unused and has a performance
impact, at least on iOS.
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformMaccmake">trunk/Source/JavaScriptCore/PlatformMac.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp">trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCMessageRecordercpp">trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessViewGestureControllercpp">trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreruntimeTracingd">trunk/Source/JavaScriptCore/runtime/Tracing.d</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTracingh">trunk/Source/JavaScriptCore/runtime/Tracing.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-08 Chris Dumez <cdumez@apple.com>
+
+ [COCOA] Disable HAVE_DTRACE at build time
+ https://bugs.webkit.org/show_bug.cgi?id=157433
+ <rdar://problem/26148841>
+
+ Reviewed by Mark Lam.
+
+ Drop DTRACE-related code from JSC since it is very old and seems
+ unused.
+
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * PlatformMac.cmake:
+ * heap/Heap.cpp:
+ (JSC::Heap::collectImpl): Deleted.
+ (JSC::Heap::didFinishCollection): Deleted.
+ * profiler/ProfileGenerator.cpp:
+ (JSC::ProfileGenerator::willExecute): Deleted.
+ (JSC::ProfileGenerator::didExecute): Deleted.
+ * runtime/Tracing.d: Removed.
+ * runtime/Tracing.h: Removed.
+
</ins><span class="cx"> 2016-05-07 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Add JSC options bytecodeRangeToJITCompile and jitWhitelist.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> buildConfigurationList = 65FB3F7709D11EBD00F49DEB /* Build configuration list for PBXAggregateTarget "Derived Sources" */;
</span><span class="cx"> buildPhases = (
</span><span class="cx"> 65FB3F6509D11E9100F49DEB /* Generate Derived Sources */,
</span><del>- 5D35DEE10C7C140B008648B2 /* Generate DTrace header */,
</del><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><span class="cx"> );
</span><span class="lines">@@ -1183,7 +1182,6 @@
</span><span class="cx"> 53917E7B1B7906FA000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = 53917E7A1B7906E4000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h */; };
</span><span class="cx"> 539FB8BA1C99DA7C00940FA1 /* JSArrayInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 539FB8B91C99DA7C00940FA1 /* JSArrayInlines.h */; };
</span><span class="cx"> 53F6BF6D1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 5D53726F0E1C54880021E549 /* Tracing.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D53726E0E1C54880021E549 /* Tracing.h */; };
</del><span class="cx"> 5D5D8AD10E0D0EBE00F9C692 /* libedit.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */; };
</span><span class="cx"> 5DBB151B131D0B310056AD36 /* testapi.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 14D857740A4696C80032146C /* testapi.js */; };
</span><span class="cx"> 5DBB1525131D0BD70056AD36 /* minidom.js in Copy Support Script */ = {isa = PBXBuildFile; fileRef = 1412110D0A48788700480255 /* minidom.js */; };
</span><span class="lines">@@ -3326,9 +3324,6 @@
</span><span class="cx"> 53F256E11B87E28000B4B768 /* JSTypedArrayViewPrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSTypedArrayViewPrototype.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 53F6BF6C1C3F060A00F41E5D /* InternalFunctionAllocationProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InternalFunctionAllocationProfile.h; sourceTree = "<group>"; };
</span><span class="cx"> 593D43CCA0BBE06D89C59707 /* MapDataInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapDataInlines.h; sourceTree = "<group>"; };
</span><del>- 5D53726D0E1C546B0021E549 /* Tracing.d */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Tracing.d; sourceTree = "<group>"; };
- 5D53726E0E1C54880021E549 /* Tracing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tracing.h; sourceTree = "<group>"; };
- 5D53727D0E1C55EC0021E549 /* TracingDtrace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TracingDtrace.h; sourceTree = "<group>"; };
</del><span class="cx"> 5D5D8AD00E0D0EBE00F9C692 /* libedit.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libedit.dylib; path = /usr/lib/libedit.dylib; sourceTree = "<absolute>"; };
</span><span class="cx"> 5DAFD6CB146B686300FBEFB4 /* JSC.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = JSC.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5DDDF44614FEE72200B4FB4D /* LLIntDesiredOffsets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LLIntDesiredOffsets.h; path = LLIntOffsets/LLIntDesiredOffsets.h; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="lines">@@ -5405,7 +5400,6 @@
</span><span class="cx"> 996B73121BD9FA2C00331B84 /* StringIteratorPrototype.lut.h */,
</span><span class="cx"> 996B73131BD9FA2C00331B84 /* SymbolConstructor.lut.h */,
</span><span class="cx"> 996B73141BD9FA2C00331B84 /* SymbolPrototype.lut.h */,
</span><del>- 5D53727D0E1C55EC0021E549 /* TracingDtrace.h */,
</del><span class="cx"> 65A946141C8E9F6F00A7209A /* YarrCanonicalizeUnicode.cpp */,
</span><span class="cx"> );
</span><span class="cx"> name = "Derived Sources";
</span><span class="lines">@@ -6000,8 +5994,6 @@
</span><span class="cx"> 0FA2C17917D7CF84009D015F /* TestRunnerUtils.cpp */,
</span><span class="cx"> 0FA2C17A17D7CF84009D015F /* TestRunnerUtils.h */,
</span><span class="cx"> 0F55989717C86C5600A1E543 /* ToNativeFromValue.h */,
</span><del>- 5D53726D0E1C546B0021E549 /* Tracing.d */,
- 5D53726E0E1C54880021E549 /* Tracing.h */,
</del><span class="cx"> 0F2B66D817B6B5AB00A7AE3F /* TypedArrayAdaptors.h */,
</span><span class="cx"> 0F2B66D917B6B5AB00A7AE3F /* TypedArrayController.cpp */,
</span><span class="cx"> 0F2B66DA17B6B5AB00A7AE3F /* TypedArrayController.h */,
</span><span class="lines">@@ -8043,7 +8035,6 @@
</span><span class="cx"> 2684D4381C00161C0081D663 /* AirLiveness.h in Headers */,
</span><span class="cx"> 0F55989817C86C5800A1E543 /* ToNativeFromValue.h in Headers */,
</span><span class="cx"> 0F2D4DE919832DAC007D4B19 /* ToThisStatus.h in Headers */,
</span><del>- 5D53726F0E1C54880021E549 /* Tracing.h in Headers */,
</del><span class="cx"> 0F952ABD1B487A7700C367C5 /* TrackedReferences.h in Headers */,
</span><span class="cx"> 0F2B670617B6B5AB00A7AE3F /* TypedArrayAdaptors.h in Headers */,
</span><span class="cx"> 0F338E131BF0276C0013C88F /* B3OpaqueByproducts.h in Headers */,
</span><span class="lines">@@ -8445,22 +8436,6 @@
</span><span class="cx"> shellPath = /bin/sh;
</span><span class="cx"> shellScript = "# Touch Info.plist to let Xcode know it needs to copy it into the built product\nif [[ \"${CONFIGURATION}\" != \"Production\" ]]; then\n touch \"$SRCROOT/Info.plist\";\nfi;\n";
</span><span class="cx"> };
</span><del>- 5D35DEE10C7C140B008648B2 /* Generate DTrace header */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "$(SRCROOT)/runtime/Tracing.d",
- );
- name = "Generate DTrace header";
- outputPaths = (
- "$(BUILT_PRODUCTS_DIR)/DerivedSources/JavaScriptCore/TracingDtrace.h",
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "set -e\n\nTRACING_D=\"$SRCROOT/runtime/Tracing.d\";\nTRACING_H=\"$BUILT_PRODUCTS_DIR/DerivedSources/JavaScriptCore/TracingDtrace.h\";\n\nif [[ \"$TRACING_D\" -nt \"$TRACING_H\" ]];\nthen\n\tdtrace -h -o \"$TRACING_H\" -s \"$TRACING_D\";\nfi;\n";
- };
</del><span class="cx"> 5D5D8ABF0E0D0B0300F9C692 /* Create /usr/local/bin/jsc symlink */ = {
</span><span class="cx"> isa = PBXShellScriptBuildPhase;
</span><span class="cx"> buildActionMask = 2147483647;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformMaccmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformMac.cmake (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/PlatformMac.cmake 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -23,21 +23,11 @@
</span><span class="cx"> ${SECURITY_LIBRARY}
</span><span class="cx"> )
</span><span class="cx">
</span><del>-add_custom_command(
- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
- DEPENDS ${JAVASCRIPTCORE_DIR}/runtime/Tracing.d
- WORKING_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}
- COMMAND dtrace -h -o "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h" -s "${JAVASCRIPTCORE_DIR}/runtime/Tracing.d"
- VERBATIM)
-
</del><span class="cx"> list(APPEND JavaScriptCore_INCLUDE_DIRECTORIES
</span><span class="cx"> ${WTF_DIR}
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/disassembler/udis86
</span><span class="cx"> ${JAVASCRIPTCORE_DIR}/icu
</span><span class="cx"> )
</span><del>-list(APPEND JavaScriptCore_HEADERS
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/TracingDtrace.h
-)
</del><span class="cx">
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> #include "JSVirtualMachineInternal.h"
</span><span class="cx"> #include "SamplingProfiler.h"
</span><span class="cx"> #include "ShadowChicken.h"
</span><del>-#include "Tracing.h"
</del><span class="cx"> #include "TypeProfilerLog.h"
</span><span class="cx"> #include "UnlinkedCodeBlock.h"
</span><span class="cx"> #include "VM.h"
</span><span class="lines">@@ -1148,7 +1147,6 @@
</span><span class="cx"> ASSERT(vm()->currentThreadIsHoldingAPILock());
</span><span class="cx"> RELEASE_ASSERT(vm()->atomicStringTable() == wtfThreadData().atomicStringTable());
</span><span class="cx"> ASSERT(m_isSafeToCollect);
</span><del>- JAVASCRIPTCORE_GC_BEGIN();
</del><span class="cx"> RELEASE_ASSERT(m_operationInProgress == NoOperation);
</span><span class="cx">
</span><span class="cx"> suspendCompilerThreads();
</span><span class="lines">@@ -1175,7 +1173,6 @@
</span><span class="cx"> m_verifier->gatherLiveObjects(HeapVerifier::Phase::AfterMarking);
</span><span class="cx"> m_verifier->verify(HeapVerifier::Phase::AfterMarking);
</span><span class="cx"> }
</span><del>- JAVASCRIPTCORE_GC_MARKED();
</del><span class="cx">
</span><span class="cx"> if (vm()->typeProfiler())
</span><span class="cx"> vm()->typeProfiler()->invalidateTypeSetCache();
</span><span class="lines">@@ -1480,7 +1477,6 @@
</span><span class="cx">
</span><span class="cx"> RELEASE_ASSERT(m_operationInProgress == EdenCollection || m_operationInProgress == FullCollection);
</span><span class="cx"> m_operationInProgress = NoOperation;
</span><del>- JAVASCRIPTCORE_GC_END();
</del><span class="cx">
</span><span class="cx"> for (auto* observer : m_observers)
</span><span class="cx"> observer->didGarbageCollect(operation);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -35,7 +35,6 @@
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "Profile.h"
</span><span class="cx"> #include "StackVisitor.h"
</span><del>-#include "Tracing.h"
</del><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -135,12 +134,6 @@
</span><span class="cx">
</span><span class="cx"> void ProfileGenerator::willExecute(ExecState* callerCallFrame, const CallIdentifier& callIdentifier)
</span><span class="cx"> {
</span><del>- if (JAVASCRIPTCORE_PROFILE_WILL_EXECUTE_ENABLED()) {
- CString name = callIdentifier.functionName().utf8();
- CString url = callIdentifier.url().utf8();
- JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber(), callIdentifier.columnNumber());
- }
-
</del><span class="cx"> if (!m_origin)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -166,12 +159,6 @@
</span><span class="cx">
</span><span class="cx"> void ProfileGenerator::didExecute(ExecState* callerCallFrame, const CallIdentifier& callIdentifier)
</span><span class="cx"> {
</span><del>- if (JAVASCRIPTCORE_PROFILE_DID_EXECUTE_ENABLED()) {
- CString name = callIdentifier.functionName().utf8();
- CString url = callIdentifier.url().utf8();
- JAVASCRIPTCORE_PROFILE_DID_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber(), callIdentifier.columnNumber());
- }
-
</del><span class="cx"> if (!m_origin)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTracingd"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/Tracing.d (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Tracing.d 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/runtime/Tracing.d 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -1,40 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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.
- */
-
-provider JavaScriptCore
-{
- probe gc__begin();
- probe gc__marked();
- probe gc__end();
-
- probe profile__will_execute(int, char*, char*, int, int);
- probe profile__did_execute(int, char*, char*, int, int);
-};
-
-#pragma D attributes Unstable/Unstable/Common provider JavaScriptCore provider
-#pragma D attributes Private/Private/Unknown provider JavaScriptCore module
-#pragma D attributes Private/Private/Unknown provider JavaScriptCore function
-#pragma D attributes Unstable/Unstable/Common provider JavaScriptCore name
-#pragma D attributes Unstable/Unstable/Common provider JavaScriptCore args
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTracingh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/runtime/Tracing.h (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Tracing.h 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/JavaScriptCore/runtime/Tracing.h 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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.
- */
-
-#ifndef Tracing_h
-#define Tracing_h
-
-#if HAVE(DTRACE)
-#include "TracingDtrace.h"
-#else
-
-#define JAVASCRIPTCORE_GC_BEGIN()
-#define JAVASCRIPTCORE_GC_BEGIN_ENABLED() 0
-
-#define JAVASCRIPTCORE_GC_END()
-#define JAVASCRIPTCORE_GC_END_ENABLED() 0
-
-#define JAVASCRIPTCORE_GC_MARKED()
-#define JAVASCRIPTCORE_GC_MARKED_ENABLED() 0
-
-#define JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(arg0, arg1, arg2, arg3, arg4)
-#define JAVASCRIPTCORE_PROFILE_WILL_EXECUTE_ENABLED() 0
-
-#define JAVASCRIPTCORE_PROFILE_DID_EXECUTE(arg0, arg1, arg2, arg3, arg4)
-#define JAVASCRIPTCORE_PROFILE_DID_EXECUTE_ENABLED() 0
-
-#endif
-
-#endif // Tracing_h
</del></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/WTF/ChangeLog 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-05-08 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><ins>+ [COCOA] Disable HAVE_DTRACE at build time
+ https://bugs.webkit.org/show_bug.cgi?id=157433
+ <rdar://problem/26148841>
+
+ Reviewed by Mark Lam.
+
+ Disable HAVE_DTRACE on COCOA since it is mostly unused and has a performance
+ impact, at least on iOS.
+
+ * wtf/Platform.h:
+
+2016-05-08 Chris Dumez <cdumez@apple.com>
+
</ins><span class="cx"> [Bindings] Simplify [RequiresExistingAtomicString] IDL extended attribute handling
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=157465
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/WTF/wtf/Platform.h 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> #define USE_NETWORK_CFDATA_ARRAY_CALLBACK 1
</span><span class="cx"> #define ENABLE_USER_MESSAGE_HANDLERS 1
</span><span class="cx"> #define HAVE_OUT_OF_PROCESS_LAYER_HOSTING 1
</span><del>-#define HAVE_DTRACE 1
</del><ins>+#define HAVE_DTRACE 0
</ins><span class="cx">
</span><span class="cx"> #if !PLATFORM(WATCHOS) && !PLATFORM(APPLETV)
</span><span class="cx"> #define HAVE_AVKIT 1
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCMessageRecordercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/WebKit2/Platform/IPC/MessageRecorder.cpp 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "MessageRecorder.h"
</span><span class="cx">
</span><ins>+#if HAVE(DTRACE)
+
</ins><span class="cx"> #include "Connection.h"
</span><span class="cx"> #include "MessageDecoder.h"
</span><span class="cx"> #include "MessageEncoder.h"
</span><span class="lines">@@ -114,3 +116,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span><ins>+
+#endif // HAVE(DTRACE)
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessViewGestureControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp (200567 => 200568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-05-09 02:37:57 UTC (rev 200567)
+++ trunk/Source/WebKit2/UIProcess/ViewGestureController.cpp 2016-05-09 04:55:34 UTC (rev 200568)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import "WebPageProxy.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <wtf/MathExtras.h>
</span><ins>+#import <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>