<!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>[168931] branches/safari-538.34.5-branch/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/168931">168931</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-05-16 00:06:34 -0700 (Fri, 16 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/168459">r168459</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreChangeLog">branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoredfgDFGOperationscpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoredfgDFGOperationsh">branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.h</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoredfgDFGWorklistcpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.cpp</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoredfgDFGWorklisth">branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.h</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreheapCodeBlockSetcpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.cpp</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreheapCodeBlockSeth">branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.h</a></li>
<li><a href="#branchessafari538345branchSourceJavaScriptCoreruntimeExecutablecpp">branches/safari-538.34.5-branch/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#branchessafari538345branchSourceWTFChangeLog">branches/safari-538.34.5-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari538345branchSourceWTFwtfAssertionsh">branches/safari-538.34.5-branch/Source/WTF/wtf/Assertions.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari538345branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/ChangeLog 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-05-15 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168459
+
+ 2014-05-07 Filip Pizlo <fpizlo@apple.com>
+
+ Make Executable::clearCode() actually clear all of the entrypoints, and
+ clean up some other FTL-related calling convention stuff.
+ <rdar://problem/16720172>
+
+ Rubber stamped by Mark Hahnenberg.
+
+ * dfg/DFGOperations.cpp:
+ * dfg/DFGOperations.h:
+ * dfg/DFGWorklist.cpp:
+ (JSC::DFG::Worklist::Worklist):
+ (JSC::DFG::Worklist::finishCreation):
+ (JSC::DFG::Worklist::create):
+ (JSC::DFG::ensureGlobalDFGWorklist):
+ (JSC::DFG::ensureGlobalFTLWorklist):
+ * dfg/DFGWorklist.h:
+ * heap/CodeBlockSet.cpp:
+ (JSC::CodeBlockSet::dump):
+ * heap/CodeBlockSet.h:
+ * runtime/Executable.cpp:
+ (JSC::ExecutableBase::clearCode):
+
</ins><span class="cx"> 2014-05-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r168443
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoredfgDFGOperationscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.cpp 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -1286,46 +1286,6 @@
</span><span class="cx"> exec, codeBlock, jitCode->osrEntryBlock.get(), bytecodeIndex, streamIndex);
</span><span class="cx"> return static_cast<char*>(address);
</span><span class="cx"> }
</span><del>-
-// FIXME: Make calls work well. Currently they're a pure regression.
-// https://bugs.webkit.org/show_bug.cgi?id=113621
-EncodedJSValue JIT_OPERATION operationFTLCall(ExecState* exec)
-{
- ExecState* callerExec = exec->callerFrame();
-
- VM* vm = &callerExec->vm();
- NativeCallFrameTracer tracer(vm, callerExec);
-
- JSValue callee = exec->calleeAsValue();
- CallData callData;
- CallType callType = getCallData(callee, callData);
- if (callType == CallTypeNone) {
- vm->throwException(callerExec, createNotAFunctionError(callerExec, callee));
- return JSValue::encode(jsUndefined());
- }
-
- return JSValue::encode(call(callerExec, callee, callType, callData, exec->thisValue(), exec));
-}
-
-// FIXME: Make calls work well. Currently they're a pure regression.
-// https://bugs.webkit.org/show_bug.cgi?id=113621
-EncodedJSValue JIT_OPERATION operationFTLConstruct(ExecState* exec)
-{
- ExecState* callerExec = exec->callerFrame();
-
- VM* vm = &callerExec->vm();
- NativeCallFrameTracer tracer(vm, callerExec);
-
- JSValue callee = exec->calleeAsValue();
- ConstructData constructData;
- ConstructType constructType = getConstructData(callee, constructData);
- if (constructType == ConstructTypeNone) {
- vm->throwException(callerExec, createNotAFunctionError(callerExec, callee));
- return JSValue::encode(jsUndefined());
- }
-
- return JSValue::encode(construct(callerExec, callee, constructType, constructData, exec));
-}
</del><span class="cx"> #endif // ENABLE(FTL_JIT)
</span><span class="cx">
</span><span class="cx"> } // extern "C"
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoredfgDFGOperationsh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.h (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.h 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGOperations.h 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -126,13 +126,6 @@
</span><span class="cx"> char* JIT_OPERATION operationSwitchString(ExecState*, size_t tableIndex, JSString*);
</span><span class="cx"> void JIT_OPERATION operationNotifyWrite(ExecState*, VariableWatchpointSet*, EncodedJSValue);
</span><span class="cx">
</span><del>-#if ENABLE(FTL_JIT)
-// FIXME: Make calls work well. Currently they're a pure regression.
-// https://bugs.webkit.org/show_bug.cgi?id=113621
-EncodedJSValue JIT_OPERATION operationFTLCall(ExecState*) WTF_INTERNAL;
-EncodedJSValue JIT_OPERATION operationFTLConstruct(ExecState*) WTF_INTERNAL;
-#endif // ENABLE(FTL_JIT)
-
</del><span class="cx"> // These operations implement the implicitly called ToInt32 and ToBoolean conversions from ES5.
</span><span class="cx"> // This conversion returns an int32_t within a size_t such that the value is zero extended to fill the register.
</span><span class="cx"> size_t JIT_OPERATION dfgConvertJSValueToInt32(ExecState*, EncodedJSValue) WTF_INTERNAL;
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoredfgDFGWorklistcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.cpp (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.cpp 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -37,8 +37,9 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace DFG {
</span><span class="cx">
</span><del>-Worklist::Worklist()
- : m_numberOfActiveThreads(0)
</del><ins>+Worklist::Worklist(CString worklistName)
+ : m_threadName(toCString(worklistName, " Worker Thread"))
+ , m_numberOfActiveThreads(0)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -60,16 +61,16 @@
</span><span class="cx"> RELEASE_ASSERT(numberOfThreads);
</span><span class="cx"> for (unsigned i = numberOfThreads; i--;) {
</span><span class="cx"> std::unique_ptr<ThreadData> data = std::make_unique<ThreadData>(this);
</span><del>- data->m_identifier = createThread(threadFunction, data.get(), "JSC Compilation Thread");
</del><ins>+ data->m_identifier = createThread(threadFunction, data.get(), m_threadName.data());
</ins><span class="cx"> if (relativePriority)
</span><span class="cx"> changeThreadPriority(data->m_identifier, relativePriority);
</span><span class="cx"> m_threads.append(std::move(data));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<Worklist> Worklist::create(unsigned numberOfThreads, int relativePriority)
</del><ins>+PassRefPtr<Worklist> Worklist::create(CString worklistName, unsigned numberOfThreads, int relativePriority)
</ins><span class="cx"> {
</span><del>- RefPtr<Worklist> result = adoptRef(new Worklist());
</del><ins>+ RefPtr<Worklist> result = adoptRef(new Worklist(worklistName));
</ins><span class="cx"> result->finishCreation(numberOfThreads, relativePriority);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="lines">@@ -405,7 +406,7 @@
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag initializeGlobalWorklistOnceFlag;
</span><span class="cx"> std::call_once(initializeGlobalWorklistOnceFlag, [] {
</span><del>- theGlobalDFGWorklist = Worklist::create(Options::numberOfDFGCompilerThreads(), Options::priorityDeltaOfDFGCompilerThreads()).leakRef();
</del><ins>+ theGlobalDFGWorklist = Worklist::create("DFG Worklist", Options::numberOfDFGCompilerThreads(), Options::priorityDeltaOfDFGCompilerThreads()).leakRef();
</ins><span class="cx"> });
</span><span class="cx"> return theGlobalDFGWorklist;
</span><span class="cx"> }
</span><span class="lines">@@ -421,7 +422,7 @@
</span><span class="cx"> {
</span><span class="cx"> static std::once_flag initializeGlobalWorklistOnceFlag;
</span><span class="cx"> std::call_once(initializeGlobalWorklistOnceFlag, [] {
</span><del>- theGlobalFTLWorklist = Worklist::create(Options::numberOfFTLCompilerThreads(), Options::priorityDeltaOfFTLCompilerThreads()).leakRef();
</del><ins>+ theGlobalFTLWorklist = Worklist::create("FTL Worklist", Options::numberOfFTLCompilerThreads(), Options::priorityDeltaOfFTLCompilerThreads()).leakRef();
</ins><span class="cx"> });
</span><span class="cx"> return theGlobalFTLWorklist;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoredfgDFGWorklisth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.h (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/dfg/DFGWorklist.h 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> ~Worklist();
</span><span class="cx">
</span><del>- static PassRefPtr<Worklist> create(unsigned numberOfThreads, int relativePriority = 0);
</del><ins>+ static PassRefPtr<Worklist> create(CString worklistName, unsigned numberOfThreads, int relativePriority = 0);
</ins><span class="cx">
</span><span class="cx"> void enqueue(PassRefPtr<Plan>);
</span><span class="cx">
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> void dump(PrintStream&) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- Worklist();
</del><ins>+ Worklist(CString worklistName);
</ins><span class="cx"> void finishCreation(unsigned numberOfThreads, int);
</span><span class="cx">
</span><span class="cx"> void runThread(ThreadData*);
</span><span class="lines">@@ -87,7 +87,9 @@
</span><span class="cx"> void removeAllReadyPlansForVM(VM&, Vector<RefPtr<Plan>, 8>&);
</span><span class="cx">
</span><span class="cx"> void dump(const MutexLocker&, PrintStream&) const;
</span><del>-
</del><ins>+
+ CString m_threadName;
+
</ins><span class="cx"> // Used to inform the thread about what work there is left to do.
</span><span class="cx"> Deque<RefPtr<Plan>> m_queue;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoreheapCodeBlockSetcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.cpp (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.cpp 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "CodeBlock.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><span class="cx"> #include "SlotVisitor.h"
</span><ins>+#include <wtf/CommaPrinter.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -157,5 +158,22 @@
</span><span class="cx"> #endif // ENABLE(GGC)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void CodeBlockSet::dump(PrintStream& out) const
+{
+ CommaPrinter comma;
+ out.print("{old = [");
+ for (CodeBlock* codeBlock : m_oldCodeBlocks)
+ out.print(comma, pointerDump(codeBlock));
+ out.print("], new = [");
+ comma = CommaPrinter();
+ for (CodeBlock* codeBlock : m_newCodeBlocks)
+ out.print(comma, pointerDump(codeBlock));
+ out.print("], currentlyExecuting = [");
+ comma = CommaPrinter();
+ for (CodeBlock* codeBlock : m_currentlyExecuting)
+ out.print(comma, pointerDump(codeBlock));
+ out.print("]}");
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoreheapCodeBlockSeth"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.h (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/heap/CodeBlockSet.h 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><ins>+#include <wtf/PrintStream.h>
</ins><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -97,6 +98,8 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
+ void dump(PrintStream&) const;
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void clearMarksForCodeBlocksInRememberedExecutables(const Vector<const JSCell*>&);
</span></span></pre></div>
<a id="branchessafari538345branchSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/JavaScriptCore/runtime/Executable.cpp (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/JavaScriptCore/runtime/Executable.cpp 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/JavaScriptCore/runtime/Executable.cpp 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -57,6 +57,8 @@
</span><span class="cx"> m_jitCodeForConstruct.clear();
</span><span class="cx"> m_jitCodeForCallWithArityCheck = MacroAssemblerCodePtr();
</span><span class="cx"> m_jitCodeForConstructWithArityCheck = MacroAssemblerCodePtr();
</span><ins>+ m_jitCodeForCallWithArityCheckAndPreserveRegs = MacroAssemblerCodePtr();
+ m_jitCodeForConstructWithArityCheckAndPreserveRegs = MacroAssemblerCodePtr();
</ins><span class="cx"> #endif
</span><span class="cx"> m_numParametersForCall = NUM_PARAMETERS_NOT_COMPILED;
</span><span class="cx"> m_numParametersForConstruct = NUM_PARAMETERS_NOT_COMPILED;
</span></span></pre></div>
<a id="branchessafari538345branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WTF/ChangeLog (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WTF/ChangeLog 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/WTF/ChangeLog 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-05-15 Lucas Forschler <lforschler@apple.com>
+
+ Merge r168459
+
+ 2014-05-07 Filip Pizlo <fpizlo@apple.com>
+
+ UNREACHABLE_FOR_PLATFORM() is meant to be a release crash.
+
+ Rubber stamped by Mark Hahnenberg..
+
+ * wtf/Assertions.h:
+ (UNREACHABLE_FOR_PLATFORM):
+
</ins><span class="cx"> 2014-05-06 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> There is no HW_AVAILCPU on FreeBSD, NetBSD, and OpenBSD
</span></span></pre></div>
<a id="branchessafari538345branchSourceWTFwtfAssertionsh"></a>
<div class="modfile"><h4>Modified: branches/safari-538.34.5-branch/Source/WTF/wtf/Assertions.h (168930 => 168931)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-538.34.5-branch/Source/WTF/wtf/Assertions.h 2014-05-16 07:00:56 UTC (rev 168930)
+++ branches/safari-538.34.5-branch/Source/WTF/wtf/Assertions.h 2014-05-16 07:06:34 UTC (rev 168931)
</span><span class="lines">@@ -372,7 +372,7 @@
</span><span class="cx"> #pragma clang diagnostic ignored "-Wmissing-noreturn"
</span><span class="cx"> static inline void UNREACHABLE_FOR_PLATFORM()
</span><span class="cx"> {
</span><del>- ASSERT_NOT_REACHED();
</del><ins>+ CRASH();
</ins><span class="cx"> }
</span><span class="cx"> #pragma clang diagnostic pop
</span><span class="cx"> #else
</span></span></pre>
</div>
</div>
</body>
</html>