<!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>[189314] branches/safari-601-branch</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/189314">189314</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:35:43 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/188311">r188311</a>. rdar://problem/22430509</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoredfgDFGOSREntrycpp">branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGOSREntry.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreftlFTLOSREntrycpp">branches/safari-601-branch/Source/JavaScriptCore/ftl/FTLOSREntry.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreheapConservativeRootscpp">branches/safari-601-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreheapMachineStackMarkercpp">branches/safari-601-branch/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreinterpreterRegisterh">branches/safari-601-branch/Source/JavaScriptCore/interpreter/Register.h</a></li>
<li><a href="#branchessafari601branchSourceWTFwtfCompilerh">branches/safari-601-branch/Source/WTF/wtf/Compiler.h</a></li>
<li><a href="#branchessafari601branchToolsChangeLog">branches/safari-601-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601branchToolsasanasanxcconfig">branches/safari-601-branch/Tools/asan/asan.xcconfig</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari601branchToolsasanwebkitasanignoretxt">branches/safari-601-branch/Tools/asan/webkit-asan-ignore.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-09-03 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188311.
+
+ 2015-08-11 Alexey Proskuryakov <ap@apple.com>
+
+ Make ASan build not depend on asan.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=147840
+ rdar://problem/21093702
+
+ Reviewed by Daniel Bates.
+
+ * dfg/DFGOSREntry.cpp:
+ (JSC::DFG::OSREntryData::dump):
+ (JSC::DFG::prepareOSREntry):
+ * ftl/FTLOSREntry.cpp:
+ (JSC::FTL::prepareOSREntry):
+ * heap/ConservativeRoots.cpp:
+ (JSC::ConservativeRoots::genericAddPointer):
+ (JSC::ConservativeRoots::genericAddSpan):
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::removeThreadIfFound):
+ (JSC::MachineThreads::gatherFromCurrentThread):
+ (JSC::MachineThreads::Thread::captureStack):
+ (JSC::copyMemory):
+ * interpreter/Register.h:
+ (JSC::Register::operator=):
+ (JSC::Register::asanUnsafeJSValue):
+ (JSC::Register::jsValue):
+
+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r188067.
</span><span class="cx">
</span><span class="cx"> 2015-08-06 Filip Pizlo <fpizlo@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoredfgDFGOSREntrycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGOSREntry.cpp (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/dfg/DFGOSREntry.cpp 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -90,6 +90,7 @@
</span><span class="cx"> dumpInContext(out, nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SUPPRESS_ASAN
</ins><span class="cx"> void* prepareOSREntry(ExecState* exec, CodeBlock* codeBlock, unsigned bytecodeIndex)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(JITCode::isOptimizingJIT(codeBlock->jitType()));
</span><span class="lines">@@ -202,33 +203,33 @@
</span><span class="cx"> for (size_t local = 0; local < entry->m_expectedValues.numberOfLocals(); ++local) {
</span><span class="cx"> int localOffset = virtualRegisterForLocal(local).offset();
</span><span class="cx"> if (entry->m_localsForcedDouble.get(local)) {
</span><del>- if (!exec->registers()[localOffset].jsValue().isNumber()) {
</del><ins>+ if (!exec->registers()[localOffset].asanUnsafeJSValue().isNumber()) {
</ins><span class="cx"> if (Options::verboseOSR()) {
</span><span class="cx"> dataLog(
</span><span class="cx"> " OSR failed because variable ", localOffset, " is ",
</span><del>- exec->registers()[localOffset].jsValue(), ", expected number.\n");
</del><ins>+ exec->registers()[localOffset].asanUnsafeJSValue(), ", expected number.\n");
</ins><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (entry->m_localsForcedMachineInt.get(local)) {
</span><del>- if (!exec->registers()[localOffset].jsValue().isMachineInt()) {
</del><ins>+ if (!exec->registers()[localOffset].asanUnsafeJSValue().isMachineInt()) {
</ins><span class="cx"> if (Options::verboseOSR()) {
</span><span class="cx"> dataLog(
</span><span class="cx"> " OSR failed because variable ", localOffset, " is ",
</span><del>- exec->registers()[localOffset].jsValue(), ", expected ",
</del><ins>+ exec->registers()[localOffset].asanUnsafeJSValue(), ", expected ",
</ins><span class="cx"> "machine int.\n");
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- if (!entry->m_expectedValues.local(local).validate(exec->registers()[localOffset].jsValue())) {
</del><ins>+ if (!entry->m_expectedValues.local(local).validate(exec->registers()[localOffset].asanUnsafeJSValue())) {
</ins><span class="cx"> if (Options::verboseOSR()) {
</span><span class="cx"> dataLog(
</span><span class="cx"> " OSR failed because variable ", localOffset, " is ",
</span><del>- exec->registers()[localOffset].jsValue(), ", expected ",
</del><ins>+ exec->registers()[localOffset].asanUnsafeJSValue(), ", expected ",
</ins><span class="cx"> entry->m_expectedValues.local(local), ".\n");
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -280,23 +281,23 @@
</span><span class="cx">
</span><span class="cx"> if (reg.isLocal()) {
</span><span class="cx"> if (entry->m_localsForcedDouble.get(reg.toLocal())) {
</span><del>- *bitwise_cast<double*>(pivot + index) = exec->registers()[reg.offset()].jsValue().asNumber();
</del><ins>+ *bitwise_cast<double*>(pivot + index) = exec->registers()[reg.offset()].asanUnsafeJSValue().asNumber();
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (entry->m_localsForcedMachineInt.get(reg.toLocal())) {
</span><del>- *bitwise_cast<int64_t*>(pivot + index) = exec->registers()[reg.offset()].jsValue().asMachineInt() << JSValue::int52ShiftAmount;
</del><ins>+ *bitwise_cast<int64_t*>(pivot + index) = exec->registers()[reg.offset()].asanUnsafeJSValue().asMachineInt() << JSValue::int52ShiftAmount;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- pivot[index] = exec->registers()[reg.offset()].jsValue();
</del><ins>+ pivot[index] = exec->registers()[reg.offset()].asanUnsafeJSValue();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // 4) Reshuffle those registers that need reshuffling.
</span><span class="cx"> Vector<JSValue> temporaryLocals(entry->m_reshufflings.size());
</span><span class="cx"> for (unsigned i = entry->m_reshufflings.size(); i--;)
</span><del>- temporaryLocals[i] = pivot[VirtualRegister(entry->m_reshufflings[i].fromOffset).toLocal()].jsValue();
</del><ins>+ temporaryLocals[i] = pivot[VirtualRegister(entry->m_reshufflings[i].fromOffset).toLocal()].asanUnsafeJSValue();
</ins><span class="cx"> for (unsigned i = entry->m_reshufflings.size(); i--;)
</span><span class="cx"> pivot[VirtualRegister(entry->m_reshufflings[i].toOffset).toLocal()] = temporaryLocals[i];
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreftlFTLOSREntrycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ftl/FTLOSREntry.cpp (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ftl/FTLOSREntry.cpp 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/ftl/FTLOSREntry.cpp 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC { namespace FTL {
</span><span class="cx">
</span><ins>+SUPPRESS_ASAN
</ins><span class="cx"> void* prepareOSREntry(
</span><span class="cx"> ExecState* exec, CodeBlock* dfgCodeBlock, CodeBlock* entryCodeBlock,
</span><span class="cx"> unsigned bytecodeIndex, unsigned streamIndex)
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx"> dataLog(" Values at entry: ", values, "\n");
</span><span class="cx">
</span><span class="cx"> for (int argument = values.numberOfArguments(); argument--;) {
</span><del>- JSValue valueOnStack = exec->r(virtualRegisterForArgument(argument).offset()).jsValue();
</del><ins>+ JSValue valueOnStack = exec->r(virtualRegisterForArgument(argument).offset()).asanUnsafeJSValue();
</ins><span class="cx"> JSValue reconstructedValue = values.argument(argument);
</span><span class="cx"> if (valueOnStack == reconstructedValue || !argument)
</span><span class="cx"> continue;
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreheapConservativeRootscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/heap/ConservativeRoots.cpp 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename MarkHook>
</span><ins>+SUPPRESS_ASAN
</ins><span class="cx"> void ConservativeRoots::genericAddSpan(void* begin, void* end, MarkHook& markHook)
</span><span class="cx"> {
</span><span class="cx"> if (begin > end) {
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/heap/MachineStackMarker.cpp (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -335,7 +335,8 @@
</span><span class="cx"> delete t;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
+SUPPRESS_ASAN
</ins><span class="cx"> void MachineThreads::gatherFromCurrentThread(ConservativeRoots& conservativeRoots, JITStubRoutineSet& jitStubRoutines, CodeBlockSet& codeBlocks, void* stackOrigin, void* stackTop, RegisterState& calleeSavedRegisters)
</span><span class="cx"> {
</span><span class="cx"> void* registersBegin = &calleeSavedRegisters;
</span><span class="lines">@@ -519,6 +520,7 @@
</span><span class="cx"> return std::make_pair(begin, static_cast<char*>(end) - static_cast<char*>(begin));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SUPPRESS_ASAN
</ins><span class="cx"> static void copyMemory(void* dst, const void* src, size_t size)
</span><span class="cx"> {
</span><span class="cx"> size_t dstAsSize = reinterpret_cast<size_t>(dst);
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreinterpreterRegisterh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/interpreter/Register.h (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/interpreter/Register.h 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/JavaScriptCore/interpreter/Register.h 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> Register(const JSValue&);
</span><span class="cx"> Register& operator=(const JSValue&);
</span><span class="cx"> JSValue jsValue() const;
</span><ins>+ JSValue asanUnsafeJSValue() const;
</ins><span class="cx"> EncodedJSValue encodedJSValue() const;
</span><span class="cx">
</span><span class="cx"> Register& operator=(CallFrame*);
</span><span class="lines">@@ -110,6 +111,12 @@
</span><span class="cx"> return *this;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ // FIXME (rdar://problem/19379214): ASan only needs to be suppressed for Register::jsValue() when called from prepareOSREntry(), but there is currently no way to express this short of adding a separate copy of the function.
+ SUPPRESS_ASAN ALWAYS_INLINE JSValue Register::asanUnsafeJSValue() const
+ {
+ return JSValue::decode(u.value);
+ }
+
</ins><span class="cx"> ALWAYS_INLINE JSValue Register::jsValue() const
</span><span class="cx"> {
</span><span class="cx"> return JSValue::decode(u.value);
</span></span></pre></div>
<a id="branchessafari601branchSourceWTFwtfCompilerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WTF/wtf/Compiler.h (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WTF/wtf/Compiler.h 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Source/WTF/wtf/Compiler.h 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -142,6 +142,12 @@
</span><span class="cx"> #define ASAN_ENABLED 0
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ASAN_ENABLED
+#define SUPPRESS_ASAN __attribute__((no_sanitize_address))
+#else
+#define SUPPRESS_ASAN
+#endif
+
</ins><span class="cx"> /* ==== Compiler-independent macros for various compiler features, in alphabetical order ==== */
</span><span class="cx">
</span><span class="cx"> /* ALWAYS_INLINE */
</span></span></pre></div>
<a id="branchessafari601branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/ChangeLog (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/ChangeLog 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-09-03 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r188311.
+
+ 2015-08-11 Alexey Proskuryakov <ap@apple.com>
+
+ Make ASan build not depend on asan.xcconfig
+ https://bugs.webkit.org/show_bug.cgi?id=147840
+ rdar://problem/21093702
+
+ Reviewed by Daniel Bates.
+
+ * asan/asan.xcconfig:
+ * asan/webkit-asan-ignore.txt: Removed. It's no longer needed, as unsafe functions
+ are now marked in source code.
+
</ins><span class="cx"> 2015-08-26 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r188988.
</span></span></pre></div>
<a id="branchessafari601branchToolsasanasanxcconfig"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Tools/asan/asan.xcconfig (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/asan/asan.xcconfig 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Tools/asan/asan.xcconfig 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> CLANG_ADDRESS_SANITIZER=YES
</span><span class="cx">
</span><del>-ASAN_OTHER_CFLAGS = -fsanitize-blacklist=$(ASAN_IGNORE) -fno-omit-frame-pointer -g;
</del><ins>+ASAN_OTHER_CFLAGS = -fno-omit-frame-pointer -g;
</ins><span class="cx"> ASAN_OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CFLAGS);
</span><span class="cx">
</span><span class="cx"> GCC_ENABLE_OBJC_GC = NO;
</span></span></pre></div>
<a id="branchessafari601branchToolsasanwebkitasanignoretxt"></a>
<div class="delfile"><h4>Deleted: branches/safari-601-branch/Tools/asan/webkit-asan-ignore.txt (189313 => 189314)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Tools/asan/webkit-asan-ignore.txt 2015-09-03 23:34:53 UTC (rev 189313)
+++ branches/safari-601-branch/Tools/asan/webkit-asan-ignore.txt 2015-09-03 23:35:43 UTC (rev 189314)
</span><span class="lines">@@ -1,7 +0,0 @@
</span><del>-fun:*genericAddSpan*
-fun:*gatherFromCurrentThread*ConservativeRoots*
-fun:*DFG*prepareOSREntry*
-# FIXME (rdar://problem/19379214): Register::jsValue() only needs to be blacklisted when
-# called from prepareOSREntry(), but there is currently no way to express this in a blacklist.
-fun:*JSC*Register*jsValue*
-fun:*asanUnsafeMemcpy*
</del></span></pre>
</div>
</div>
</body>
</html>