<!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>[168649] trunk/Source/JavaScriptCore</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/168649">168649</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-12 15:21:16 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/168642">r168642</a>.
https://bugs.webkit.org/show_bug.cgi?id=132839
Broke ARM build (Requested by jpfau on #webkit).
Reverted changeset:
"[Win] Enum type with value zero is compatible with void*,
potential cause of crashes."
https://bugs.webkit.org/show_bug.cgi?id=132772
http://trac.webkit.org/changeset/168642</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh">trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp">trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitAssemblyHelperscpp">trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITInlinesh">trunk/Source/JavaScriptCore/jit/JITInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITPropertyAccesscpp">trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitThunkGeneratorscpp">trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-12 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r168642.
+ https://bugs.webkit.org/show_bug.cgi?id=132839
+
+ Broke ARM build (Requested by jpfau on #webkit).
+
+ Reverted changeset:
+
+ "[Win] Enum type with value zero is compatible with void*,
+ potential cause of crashes."
+ https://bugs.webkit.org/show_bug.cgi?id=132772
+ http://trac.webkit.org/changeset/168642
+
</ins><span class="cx"> 2014-05-12 peavo@outlook.com <peavo@outlook.com>
</span><span class="cx">
</span><span class="cx"> [Win] Enum type with value zero is compatible with void*, potential cause of crashes.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -1121,9 +1121,9 @@
</span><span class="cx"> m_assembler.baseIndexTransferFloat(ARMAssembler::LoadDouble, dest, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><del>- move(TrustedImm32(reinterpret_cast<ARMWord>(address.m_value)), ARMRegisters::S0);
</del><ins>+ move(TrustedImm32(reinterpret_cast<ARMWord>(address)), ARMRegisters::S0);
</ins><span class="cx"> m_assembler.doubleDtrUp(ARMAssembler::LoadDouble, dest, ARMRegisters::S0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1142,9 +1142,9 @@
</span><span class="cx"> m_assembler.baseIndexTransferFloat(ARMAssembler::StoreDouble, src, address.base, address.index, static_cast<int>(address.scale), address.offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><del>- move(TrustedImm32(reinterpret_cast<ARMWord>(address.m_value)), ARMRegisters::S0);
</del><ins>+ move(TrustedImm32(reinterpret_cast<ARMWord>(address)), ARMRegisters::S0);
</ins><span class="cx"> m_assembler.dataTransferFloat(ARMAssembler::StoreDouble, src, ARMRegisters::S0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARM64h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARM64.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -1310,9 +1310,9 @@
</span><span class="cx"> m_assembler.ldr<64>(dest, address.base, memoryTempRegister);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><del>- moveToCachedReg(address, m_cachedMemoryTempRegister);
</del><ins>+ moveToCachedReg(TrustedImmPtr(address), m_cachedMemoryTempRegister);
</ins><span class="cx"> m_assembler.ldr<64>(dest, memoryTempRegister, ARM64Registers::zr);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1378,9 +1378,9 @@
</span><span class="cx"> m_assembler.str<64>(src, address.base, memoryTempRegister);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><del>- moveToCachedReg(address, m_cachedMemoryTempRegister);
</del><ins>+ moveToCachedReg(TrustedImmPtr(address), m_cachedMemoryTempRegister);
</ins><span class="cx"> m_assembler.str<64>(src, memoryTempRegister, ARM64Registers::zr);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerARMv7h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerARMv7.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -875,9 +875,9 @@
</span><span class="cx"> m_assembler.vmov(dest, src);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><del>- move(address, addressTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addressTempRegister);
</ins><span class="cx"> m_assembler.vldr(dest, addressTempRegister, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -911,9 +911,9 @@
</span><span class="cx"> m_assembler.fsts(ARMRegisters::asSingle(src), base, offset);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><del>- move(address, addressTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addressTempRegister);
</ins><span class="cx"> storeDouble(src, addressTempRegister);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerMIPSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerMIPS.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -2268,7 +2268,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> #if WTF_MIPS_ISA(1)
</span><span class="cx"> /*
</span><span class="lines">@@ -2276,7 +2276,7 @@
</span><span class="cx"> lwc1 dest, 0(addrTemp)
</span><span class="cx"> lwc1 dest+1, 4(addrTemp)
</span><span class="cx"> */
</span><del>- move(address, addrTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addrTempRegister);
</ins><span class="cx"> m_assembler.lwc1(dest, addrTempRegister, 0);
</span><span class="cx"> m_assembler.lwc1(FPRegisterID(dest + 1), addrTempRegister, 4);
</span><span class="cx"> #else
</span><span class="lines">@@ -2284,7 +2284,7 @@
</span><span class="cx"> li addrTemp, address
</span><span class="cx"> ldc1 dest, 0(addrTemp)
</span><span class="cx"> */
</span><del>- move(address, addrTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addrTempRegister);
</ins><span class="cx"> m_assembler.ldc1(dest, addrTempRegister, 0);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -2406,14 +2406,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><span class="cx"> #if WTF_MIPS_ISA(1)
</span><del>- move(address, addrTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addrTempRegister);
</ins><span class="cx"> m_assembler.swc1(src, addrTempRegister, 0);
</span><span class="cx"> m_assembler.swc1(FPRegisterID(src + 1), addrTempRegister, 4);
</span><span class="cx"> #else
</span><del>- move(address, addrTempRegister);
</del><ins>+ move(TrustedImmPtr(address), addrTempRegister);
</ins><span class="cx"> m_assembler.sdc1(src, addrTempRegister, 0);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerSH4h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -1155,10 +1155,10 @@
</span><span class="cx"> releaseScratch(scr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> RegisterID scr = claimScratch();
</span><del>- move(address, scr);
</del><ins>+ move(TrustedImmPtr(address), scr);
</ins><span class="cx"> m_assembler.fmovsReadrminc(scr, (FPRegisterID)(dest + 1));
</span><span class="cx"> m_assembler.fmovsReadrm(scr, dest);
</span><span class="cx"> releaseScratch(scr);
</span><span class="lines">@@ -1204,10 +1204,10 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><span class="cx"> RegisterID scr = claimScratch();
</span><del>- m_assembler.loadConstant(reinterpret_cast<uint32_t>(const_cast<void*>(address.m_value)) + 8, scr);
</del><ins>+ m_assembler.loadConstant(reinterpret_cast<uint32_t>(const_cast<void*>(address)) + 8, scr);
</ins><span class="cx"> m_assembler.fmovsWriterndec(src, scr);
</span><span class="cx"> m_assembler.fmovsWriterndec((FPRegisterID)(src + 1), scr);
</span><span class="cx"> releaseScratch(scr);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86h"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -123,11 +123,11 @@
</span><span class="cx"> m_assembler.addsd_mr(address.m_ptr, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void storeDouble(FPRegisterID src, TrustedImmPtr address)
</del><ins>+ void storeDouble(FPRegisterID src, const void* address)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isSSE2Present());
</span><del>- ASSERT(address.m_value);
- m_assembler.movsd_rm(src, address.m_value);
</del><ins>+ ASSERT(address);
+ m_assembler.movsd_rm(src, address);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void convertInt32ToDouble(AbsoluteAddress src, FPRegisterID dest)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreassemblerMacroAssemblerX86Commonh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -448,7 +448,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(src != dst);
</span><span class="cx"> static const double negativeZeroConstant = -0.0;
</span><del>- loadDouble(TrustedImmPtr(&negativeZeroConstant), dst);
</del><ins>+ loadDouble(&negativeZeroConstant, dst);
</ins><span class="cx"> m_assembler.andnpd_rr(src, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -456,7 +456,7 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(src != dst);
</span><span class="cx"> static const double negativeZeroConstant = -0.0;
</span><del>- loadDouble(TrustedImmPtr(&negativeZeroConstant), dst);
</del><ins>+ loadDouble(&negativeZeroConstant, dst);
</ins><span class="cx"> m_assembler.xorpd_rr(src, dst);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -684,13 +684,13 @@
</span><span class="cx"> m_assembler.movsd_rr(src, dest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void loadDouble(TrustedImmPtr address, FPRegisterID dest)
</del><ins>+ void loadDouble(const void* address, FPRegisterID dest)
</ins><span class="cx"> {
</span><span class="cx"> #if CPU(X86)
</span><span class="cx"> ASSERT(isSSE2Present());
</span><del>- m_assembler.movsd_mr(address.m_value, dest);
</del><ins>+ m_assembler.movsd_mr(address, dest);
</ins><span class="cx"> #else
</span><del>- move(address, scratchRegister);
</del><ins>+ move(TrustedImmPtr(address), scratchRegister);
</ins><span class="cx"> loadDouble(scratchRegister, dest);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJITcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -553,7 +553,7 @@
</span><span class="cx"> m_jit.move(TrustedImm32(JSValue::BooleanTag), plan.gpr());
</span><span class="cx"> break;
</span><span class="cx"> case SetDoubleConstant:
</span><del>- m_jit.loadDouble(TrustedImmPtr(addressOfDoubleConstant(plan.node())), plan.fpr());
</del><ins>+ m_jit.loadDouble(addressOfDoubleConstant(plan.node()), plan.fpr());
</ins><span class="cx"> break;
</span><span class="cx"> #endif
</span><span class="cx"> case Load32Tag:
</span><span class="lines">@@ -2254,12 +2254,12 @@
</span><span class="cx"> static const double zero = 0;
</span><span class="cx"> static const double byteMax = 255;
</span><span class="cx"> static const double half = 0.5;
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&zero), scratch);
</del><ins>+ jit.loadDouble(&zero, scratch);
</ins><span class="cx"> MacroAssembler::Jump tooSmall = jit.branchDouble(MacroAssembler::DoubleLessThanOrEqualOrUnordered, source, scratch);
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&byteMax), scratch);
</del><ins>+ jit.loadDouble(&byteMax, scratch);
</ins><span class="cx"> MacroAssembler::Jump tooBig = jit.branchDouble(MacroAssembler::DoubleGreaterThan, source, scratch);
</span><span class="cx">
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&half), scratch);
</del><ins>+ jit.loadDouble(&half, scratch);
</ins><span class="cx"> // FIXME: This should probably just use a floating point round!
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=72054
</span><span class="cx"> jit.addDouble(source, scratch);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGSpeculativeJIT32_64cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/dfg/DFGSpeculativeJIT32_64.cpp 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -836,7 +836,7 @@
</span><span class="cx"> if (edge->hasConstant()) {
</span><span class="cx"> RELEASE_ASSERT(isNumberConstant(edge.node()));
</span><span class="cx"> FPRReg fpr = fprAllocate();
</span><del>- m_jit.loadDouble(TrustedImmPtr(addressOfDoubleConstant(edge.node())), fpr);
</del><ins>+ m_jit.loadDouble(addressOfDoubleConstant(edge.node()), fpr);
</ins><span class="cx"> m_fprs.retain(fpr, virtualRegister, SpillOrderConstant);
</span><span class="cx"> info.fillDouble(*m_stream, fpr);
</span><span class="cx"> return fpr;
</span><span class="lines">@@ -3126,7 +3126,7 @@
</span><span class="cx"> JSValueRegs(), use, SpecFullRealNumber,
</span><span class="cx"> m_jit.branchDouble(MacroAssembler::DoubleNotEqualOrUnordered, opFPR, opFPR));
</span><span class="cx">
</span><del>- m_jit.storeDouble(opFPR, TrustedImmPtr(reinterpret_cast<char*>(buffer + operandIdx)));
</del><ins>+ m_jit.storeDouble(opFPR, reinterpret_cast<char*>(buffer + operandIdx));
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case ALL_INT32_INDEXING_TYPES: {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitAssemblyHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/jit/AssemblyHelpers.cpp 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> {
</span><span class="cx"> MacroAssembler::Jump notNaN = branchDouble(DoubleEqual, fpr, fpr);
</span><span class="cx"> static const double NaN = PNaN;
</span><del>- loadDouble(TrustedImmPtr(&NaN), fpr);
</del><ins>+ loadDouble(&NaN, fpr);
</ins><span class="cx"> notNaN.link(this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITInlines.h (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITInlines.h 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/jit/JITInlines.h 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_codeBlock->isConstantRegisterIndex(index)) {
</span><span class="cx"> WriteBarrier<Unknown>& inConstantPool = m_codeBlock->constantRegister(index);
</span><del>- loadDouble(TrustedImmPtr(&inConstantPool), value);
</del><ins>+ loadDouble(&inConstantPool, value);
</ins><span class="cx"> } else
</span><span class="cx"> loadDouble(addressFor(index), value);
</span><span class="cx"> }
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_codeBlock->isConstantRegisterIndex(index)) {
</span><span class="cx"> WriteBarrier<Unknown>& inConstantPool = m_codeBlock->constantRegister(index);
</span><del>- loadDouble(TrustedImmPtr(&inConstantPool), value);
</del><ins>+ loadDouble(&inConstantPool, value);
</ins><span class="cx"> } else
</span><span class="cx"> loadDouble(addressFor(index), value);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITPropertyAccesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/jit/JITPropertyAccess.cpp 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -1240,7 +1240,7 @@
</span><span class="cx">
</span><span class="cx"> Jump notNaN = branchDouble(DoubleEqual, fpRegT0, fpRegT0);
</span><span class="cx"> static const double NaN = PNaN;
</span><del>- loadDouble(TrustedImmPtr(&NaN), fpRegT0);
</del><ins>+ loadDouble(&NaN, fpRegT0);
</ins><span class="cx"> notNaN.link(this);
</span><span class="cx">
</span><span class="cx"> #if USE(JSVALUE64)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitThunkGeneratorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp (168648 => 168649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2014-05-12 22:19:35 UTC (rev 168648)
+++ trunk/Source/JavaScriptCore/jit/ThunkGenerators.cpp 2014-05-12 22:21:16 UTC (rev 168649)
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> SpecializedThunkJIT::Jump intResult;
</span><span class="cx"> SpecializedThunkJIT::JumpList doubleResult;
</span><span class="cx"> if (jit.supportsFloatingPointTruncate()) {
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&zeroConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.loadDouble(&zeroConstant, SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> doubleResult.append(jit.branchDouble(MacroAssembler::DoubleEqual, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><span class="cx"> SpecializedThunkJIT::JumpList slowPath;
</span><span class="cx"> // Handle the negative doubles in the slow path for now.
</span><span class="lines">@@ -796,12 +796,12 @@
</span><span class="cx"> SpecializedThunkJIT::Jump intResult;
</span><span class="cx"> SpecializedThunkJIT::JumpList doubleResult;
</span><span class="cx"> if (jit.supportsFloatingPointTruncate()) {
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&zeroConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.loadDouble(&zeroConstant, SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> doubleResult.append(jit.branchDouble(MacroAssembler::DoubleEqual, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><span class="cx"> SpecializedThunkJIT::JumpList slowPath;
</span><span class="cx"> // Handle the negative doubles in the slow path for now.
</span><span class="cx"> slowPath.append(jit.branchDouble(MacroAssembler::DoubleLessThanOrUnordered, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&halfConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.loadDouble(&halfConstant, SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> jit.addDouble(SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1);
</span><span class="cx"> slowPath.append(jit.branchTruncateDoubleToInt32(SpecializedThunkJIT::fpRegT1, SpecializedThunkJIT::regT0));
</span><span class="cx"> intResult = jit.jump();
</span><span class="lines">@@ -869,7 +869,7 @@
</span><span class="cx"> if (!jit.supportsFloatingPoint())
</span><span class="cx"> return MacroAssemblerCodeRef::createSelfManagedCodeRef(vm->jitStubs->ctiNativeCall(vm));
</span><span class="cx">
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&oneConstant), SpecializedThunkJIT::fpRegT1);
</del><ins>+ jit.loadDouble(&oneConstant, SpecializedThunkJIT::fpRegT1);
</ins><span class="cx"> jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
</span><span class="cx"> MacroAssembler::Jump nonIntExponent;
</span><span class="cx"> jit.loadInt32Argument(1, SpecializedThunkJIT::regT0, nonIntExponent);
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx">
</span><span class="cx"> if (jit.supportsFloatingPointSqrt()) {
</span><span class="cx"> nonIntExponent.link(&jit);
</span><del>- jit.loadDouble(MacroAssembler::TrustedImmPtr(&negativeHalfConstant), SpecializedThunkJIT::fpRegT3);
</del><ins>+ jit.loadDouble(&negativeHalfConstant, SpecializedThunkJIT::fpRegT3);
</ins><span class="cx"> jit.loadDoubleArgument(1, SpecializedThunkJIT::fpRegT2, SpecializedThunkJIT::regT0);
</span><span class="cx"> jit.appendFailure(jit.branchDouble(MacroAssembler::DoubleLessThanOrEqual, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1));
</span><span class="cx"> jit.appendFailure(jit.branchDouble(MacroAssembler::DoubleNotEqualOrUnordered, SpecializedThunkJIT::fpRegT2, SpecializedThunkJIT::fpRegT3));
</span></span></pre>
</div>
</div>
</body>
</html>