<!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>[182938] trunk</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/182938">182938</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-16 18:36:10 -0700 (Thu, 16 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Number.parseInt is not === global parseInt in nightly <a href="http://trac.webkit.org/projects/webkit/changeset/182673">r182673</a>
https://bugs.webkit.org/show_bug.cgi?id=143799
Patch by Jordan Harband <ljharb@gmail.com> on 2015-04-16
Reviewed by Darin Adler.
Source/JavaScriptCore:
Ensuring parseInt === Number.parseInt, per spec
https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.parseint
* runtime/CommonIdentifiers.h:
* runtime/JSGlobalObject.cpp:
(JSC::JSGlobalObject::init):
* runtime/JSGlobalObject.h:
(JSC::JSGlobalObject::parseIntFunction):
* runtime/NumberConstructor.cpp:
(JSC::NumberConstructor::finishCreation):
LayoutTests:
* js/number-constructor-expected.txt:
* js/parseInt-expected.txt:
* js/script-tests/number-constructor.js:
* js/script-tests/parseInt.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsjsnumberconstructorexpectedtxt">trunk/LayoutTests/js/number-constructor-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsparseIntexpectedtxt">trunk/LayoutTests/js/parseInt-expected.txt</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsnumberconstructorjs">trunk/LayoutTests/js/script-tests/number-constructor.js</a></li>
<li><a href="#trunkLayoutTestsjsscripttestsparseIntjs">trunk/LayoutTests/js/script-tests/parseInt.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeCommonIdentifiersh">trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSGlobalObjecth">trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeNumberConstructorcpp">trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/LayoutTests/ChangeLog 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-04-16 Jordan Harband <ljharb@gmail.com>
+
+ Number.parseInt is not === global parseInt in nightly r182673
+ https://bugs.webkit.org/show_bug.cgi?id=143799
+
+ Reviewed by Darin Adler.
+
+ * js/number-constructor-expected.txt:
+ * js/parseInt-expected.txt:
+ * js/script-tests/number-constructor.js:
+ * js/script-tests/parseInt.js:
+
</ins><span class="cx"> 2015-04-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline mouse-cursor-image-set results after r182869
</span></span></pre></div>
<a id="trunkLayoutTestsjsnumberconstructorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/number-constructor-expected.txt (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/number-constructor-expected.txt 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/LayoutTests/js/number-constructor-expected.txt 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -122,6 +122,8 @@
</span><span class="cx"> PASS Number.parseFloat("20000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") is 2e+307
</span><span class="cx"> PASS Number.parseFloat("200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000") is Infinity
</span><span class="cx"> PASS Number.parseFloat(foo) threw exception ReferenceError: Can't find variable: foo.
</span><ins>+PASS Number.parseInt is parseInt
+PASS var numberParseInt = Number.parseInt; parseInt = function () {}; numberParseInt is Number.parseInt
</ins><span class="cx"> PASS Number.parseInt.length is 2
</span><span class="cx"> PASS Number.parseInt("0") is 0
</span><span class="cx"> PASS Number.parseInt("-0") is -0
</span></span></pre></div>
<a id="trunkLayoutTestsjsparseIntexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/parseInt-expected.txt (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/parseInt-expected.txt 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/LayoutTests/js/parseInt-expected.txt 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -3,6 +3,8 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS parseInt.length is 2
+PASS var origParseInt = parseInt; Number.parseInt = function () {}; origParseInt is parseInt
</ins><span class="cx"> PASS parseInt('123') is 123
</span><span class="cx"> PASS parseInt('123x4') is 123
</span><span class="cx"> PASS parseInt('-123') is -123
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsnumberconstructorjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/number-constructor.js (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/number-constructor.js 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/LayoutTests/js/script-tests/number-constructor.js 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -130,6 +130,8 @@
</span><span class="cx"> shouldThrow('Number.parseFloat(foo)');
</span><span class="cx">
</span><span class="cx"> // parseInt
</span><ins>+shouldBe('Number.parseInt', 'parseInt');
+shouldBe('var numberParseInt = Number.parseInt; parseInt = function () {}; numberParseInt', 'Number.parseInt');
</ins><span class="cx"> shouldBe('Number.parseInt.length', '2');
</span><span class="cx"> shouldBe('Number.parseInt("0")', '0');
</span><span class="cx"> shouldBe('Number.parseInt("-0")', '-0');
</span></span></pre></div>
<a id="trunkLayoutTestsjsscripttestsparseIntjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/js/script-tests/parseInt.js (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/js/script-tests/parseInt.js 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/LayoutTests/js/script-tests/parseInt.js 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> description('Tests for the parseInt function.');
</span><span class="cx">
</span><ins>+shouldBe("parseInt.length", "2");
+shouldBe('var origParseInt = parseInt; Number.parseInt = function () {}; origParseInt', 'parseInt');
+
</ins><span class="cx"> // Simple hex & dec integer values.
</span><span class="cx"> shouldBe("parseInt('123')", '123');
</span><span class="cx"> shouldBe("parseInt('123x4')", '123');
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-16 Jordan Harband <ljharb@gmail.com>
+
+ Number.parseInt is not === global parseInt in nightly r182673
+ https://bugs.webkit.org/show_bug.cgi?id=143799
+
+ Reviewed by Darin Adler.
+
+ Ensuring parseInt === Number.parseInt, per spec
+ https://people.mozilla.org/~jorendorff/es6-draft.html#sec-number.parseint
+
+ * runtime/CommonIdentifiers.h:
+ * runtime/JSGlobalObject.cpp:
+ (JSC::JSGlobalObject::init):
+ * runtime/JSGlobalObject.h:
+ (JSC::JSGlobalObject::parseIntFunction):
+ * runtime/NumberConstructor.cpp:
+ (JSC::NumberConstructor::finishCreation):
+
</ins><span class="cx"> 2015-04-16 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Gardening: fix CLOOP build after r182927.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeCommonIdentifiersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/Source/JavaScriptCore/runtime/CommonIdentifiers.h 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -142,6 +142,7 @@
</span><span class="cx"> macro(osrExitSites) \
</span><span class="cx"> macro(osrExits) \
</span><span class="cx"> macro(parse) \
</span><ins>+ macro(parseInt) \
</ins><span class="cx"> macro(postMessage) \
</span><span class="cx"> macro(profiledBytecodes) \
</span><span class="cx"> macro(propertyIsEnumerable) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -154,7 +154,6 @@
</span><span class="cx">
</span><span class="cx"> /* Source for JSGlobalObject.lut.h
</span><span class="cx"> @begin globalObjectTable
</span><del>- parseInt globalFuncParseInt DontEnum|Function 2
</del><span class="cx"> parseFloat globalFuncParseFloat DontEnum|Function 1
</span><span class="cx"> isNaN globalFuncIsNaN DontEnum|Function 1
</span><span class="cx"> isFinite globalFuncIsFinite DontEnum|Function 1
</span><span class="lines">@@ -314,7 +313,10 @@
</span><span class="cx"> m_promisePrototype.set(vm, this, JSPromisePrototype::create(exec, this, JSPromisePrototype::createStructure(vm, this, m_objectPrototype.get())));
</span><span class="cx"> m_promiseStructure.set(vm, this, JSPromise::createStructure(vm, this, m_promisePrototype.get()));
</span><span class="cx"> #endif // ENABLE(PROMISES)
</span><del>-
</del><ins>+
+ m_parseIntFunction.set(vm, this, JSFunction::create(vm, this, 2, vm.propertyNames->parseInt.string(), globalFuncParseInt, NoIntrinsic));
+ putDirectWithoutTransition(vm, vm.propertyNames->parseInt, m_parseIntFunction.get(), DontEnum | Function);
+
</ins><span class="cx"> #define CREATE_PROTOTYPE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
</span><span class="cx"> m_ ## lowerName ## Prototype.set(vm, this, capitalName##Prototype::create(vm, this, capitalName##Prototype::createStructure(vm, this, m_objectPrototype.get()))); \
</span><span class="cx"> m_ ## properName ## Structure.set(vm, this, instanceType::createStructure(vm, this, m_ ## lowerName ## Prototype.get()));
</span><span class="lines">@@ -693,6 +695,7 @@
</span><span class="cx"> visitor.append(&thisObject->m_nullGetterFunction);
</span><span class="cx"> visitor.append(&thisObject->m_nullSetterFunction);
</span><span class="cx">
</span><ins>+ visitor.append(&thisObject->m_parseIntFunction);
</ins><span class="cx"> visitor.append(&thisObject->m_evalFunction);
</span><span class="cx"> visitor.append(&thisObject->m_callFunction);
</span><span class="cx"> visitor.append(&thisObject->m_applyFunction);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSGlobalObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -185,6 +185,8 @@
</span><span class="cx"> WriteBarrier<NullGetterFunction> m_nullGetterFunction;
</span><span class="cx"> WriteBarrier<NullSetterFunction> m_nullSetterFunction;
</span><span class="cx">
</span><ins>+ WriteBarrier<JSFunction> m_parseIntFunction;
+
</ins><span class="cx"> WriteBarrier<JSFunction> m_evalFunction;
</span><span class="cx"> WriteBarrier<JSFunction> m_callFunction;
</span><span class="cx"> WriteBarrier<JSFunction> m_applyFunction;
</span><span class="lines">@@ -392,6 +394,8 @@
</span><span class="cx"> NullGetterFunction* nullGetterFunction() const { return m_nullGetterFunction.get(); }
</span><span class="cx"> NullSetterFunction* nullSetterFunction() const { return m_nullSetterFunction.get(); }
</span><span class="cx">
</span><ins>+ JSFunction* parseIntFunction() const { return m_parseIntFunction.get(); }
+
</ins><span class="cx"> JSFunction* evalFunction() const { return m_evalFunction.get(); }
</span><span class="cx"> JSFunction* callFunction() const { return m_callFunction.get(); }
</span><span class="cx"> JSFunction* applyFunction() const { return m_applyFunction.get(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeNumberConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp (182937 => 182938)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2015-04-17 01:28:45 UTC (rev 182937)
+++ trunk/Source/JavaScriptCore/runtime/NumberConstructor.cpp 2015-04-17 01:36:10 UTC (rev 182938)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> putDirectNativeFunctionWithoutTransition(vm, numberPrototype->globalObject(), Identifier::fromString(&vm, "isNaN"), 1, numberConstructorFuncIsNaN, NoIntrinsic, DontEnum | Function);
</span><span class="cx"> putDirectNativeFunctionWithoutTransition(vm, numberPrototype->globalObject(), Identifier::fromString(&vm, "isSafeInteger"), 1, numberConstructorFuncIsSafeInteger, NoIntrinsic, DontEnum | Function);
</span><span class="cx"> putDirectNativeFunctionWithoutTransition(vm, numberPrototype->globalObject(), Identifier::fromString(&vm, "parseFloat"), 1, globalFuncParseFloat, NoIntrinsic, DontEnum | Function);
</span><del>- putDirectNativeFunctionWithoutTransition(vm, numberPrototype->globalObject(), Identifier::fromString(&vm, "parseInt"), 2, globalFuncParseInt, NoIntrinsic, DontEnum | Function);
</del><ins>+ putDirectWithoutTransition(vm, Identifier::fromString(&vm, "parseInt"), numberPrototype->globalObject()->parseIntFunction(), DontEnum | Function);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ECMA 15.7.1
</span></span></pre>
</div>
</div>
</body>
</html>