<!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>[203758] 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/203758">203758</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-07-26 18:23:53 -0700 (Tue, 26 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>rollout <a href="http://trac.webkit.org/projects/webkit/changeset/203666">r203666</a>
https://bugs.webkit.org/show_bug.cgi?id=160226
Unreviewed rollout.
* b3/B3BasicBlock.h:
(JSC::B3::BasicBlock::successorBlock):
* b3/B3LowerToAir.cpp:
(JSC::B3::Air::LowerToAir::createGenericCompare):
* b3/B3LowerToAir.h:
* b3/air/AirArg.cpp:
(JSC::B3::Air::Arg::isRepresentableAs):
(JSC::B3::Air::Arg::usesTmp):
* b3/air/AirArg.h:
(JSC::B3::Air::Arg::isRepresentableAs):
(JSC::B3::Air::Arg::asNumber):
(JSC::B3::Air::Arg::castToType): Deleted.
* b3/air/AirCode.h:
(JSC::B3::Air::Code::size):
(JSC::B3::Air::Code::at):
* b3/air/AirOpcode.opcodes:
* b3/air/AirValidate.h:
* b3/air/opcode_generator.rb:
* b3/testb3.cpp:
(JSC::B3::compileAndRun):
(JSC::B3::testSomeEarlyRegister):
(JSC::B3::zero):
(JSC::B3::run):
(JSC::B3::lowerToAirForTesting): Deleted.
(JSC::B3::testBranchBitAndImmFusion): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAircpp">trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3B3LowerToAirh">trunk/Source/JavaScriptCore/b3/B3LowerToAir.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirArgcpp">trunk/Source/JavaScriptCore/b3/air/AirArg.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirArgh">trunk/Source/JavaScriptCore/b3/air/AirArg.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirCodeh">trunk/Source/JavaScriptCore/b3/air/AirCode.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirOpcodeopcodes">trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airAirValidateh">trunk/Source/JavaScriptCore/b3/air/AirValidate.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3airopcode_generatorrb">trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb</a></li>
<li><a href="#trunkSourceJavaScriptCoreb3testb3cpp">trunk/Source/JavaScriptCore/b3/testb3.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -1,3 +1,36 @@
</span><ins>+2016-07-26 Saam Barati <sbarati@apple.com>
+
+ rollout r203666
+ https://bugs.webkit.org/show_bug.cgi?id=160226
+
+ Unreviewed rollout.
+
+ * b3/B3BasicBlock.h:
+ (JSC::B3::BasicBlock::successorBlock):
+ * b3/B3LowerToAir.cpp:
+ (JSC::B3::Air::LowerToAir::createGenericCompare):
+ * b3/B3LowerToAir.h:
+ * b3/air/AirArg.cpp:
+ (JSC::B3::Air::Arg::isRepresentableAs):
+ (JSC::B3::Air::Arg::usesTmp):
+ * b3/air/AirArg.h:
+ (JSC::B3::Air::Arg::isRepresentableAs):
+ (JSC::B3::Air::Arg::asNumber):
+ (JSC::B3::Air::Arg::castToType): Deleted.
+ * b3/air/AirCode.h:
+ (JSC::B3::Air::Code::size):
+ (JSC::B3::Air::Code::at):
+ * b3/air/AirOpcode.opcodes:
+ * b3/air/AirValidate.h:
+ * b3/air/opcode_generator.rb:
+ * b3/testb3.cpp:
+ (JSC::B3::compileAndRun):
+ (JSC::B3::testSomeEarlyRegister):
+ (JSC::B3::zero):
+ (JSC::B3::run):
+ (JSC::B3::lowerToAirForTesting): Deleted.
+ (JSC::B3::testBranchBitAndImmFusion): Deleted.
+
</ins><span class="cx"> 2016-07-26 Caitlin Potter <caitp@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Object.getOwnPropertyDescriptors should not add undefined props to result
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAircpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.cpp 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -1330,43 +1330,22 @@
</span><span class="cx"> Value* left = value->child(0);
</span><span class="cx"> Value* right = value->child(1);
</span><span class="cx">
</span><del>- bool hasRightConst;
- int64_t rightConst;
- Arg rightImm;
- Arg rightImm64;
</del><ins>+ // FIXME: We don't actually have to worry about leftImm.
+ // https://bugs.webkit.org/show_bug.cgi?id=150954
</ins><span class="cx">
</span><del>- hasRightConst = right->hasInt();
- if (hasRightConst) {
- rightConst = right->asInt();
- rightImm = bitImm(right);
- rightImm64 = bitImm64(right);
- }
</del><ins>+ Arg leftImm = imm(left);
+ Arg rightImm = imm(right);
</ins><span class="cx">
</span><del>- auto tryTestLoadImm = [&] (Arg::Width width, Arg::Signedness signedness, B3::Opcode loadOpcode) -> Inst {
- if (!hasRightConst)
- return Inst();
- // Signed loads will create high bits, so if the immediate has high bits
- // then we cannot proceed. Consider BitAnd(Load8S(ptr), 0x101). This cannot
- // be turned into testb (ptr), $1, since if the high bit within that byte
- // was set then it would be extended to include 0x100. The handling below
- // won't anticipate this, so we need to catch it here.
- if (signedness == Arg::Signed
- && !Arg::isRepresentableAs(width, Arg::Unsigned, rightConst))
- return Inst();
-
- // FIXME: If this is unsigned then we can chop things off of the immediate.
- // This might make the immediate more legal. Perhaps that's a job for
- // strength reduction?
-
- if (rightImm) {
</del><ins>+ auto tryTestLoadImm = [&] (Arg::Width width, B3::Opcode loadOpcode) -> Inst {
+ if (rightImm && rightImm.isRepresentableAs(width, Arg::Unsigned)) {
</ins><span class="cx"> if (Inst result = tryTest(width, loadPromise(left, loadOpcode), rightImm)) {
</span><span class="cx"> commitInternal(left);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (rightImm64) {
- if (Inst result = tryTest(width, loadPromise(left, loadOpcode), rightImm64)) {
- commitInternal(left);
</del><ins>+ if (leftImm && leftImm.isRepresentableAs(width, Arg::Unsigned)) {
+ if (Inst result = tryTest(width, leftImm, loadPromise(right, loadOpcode))) {
+ commitInternal(right);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1376,28 +1355,24 @@
</span><span class="cx"> if (canCommitInternal) {
</span><span class="cx"> // First handle test's that involve fewer bits than B3's type system supports.
</span><span class="cx">
</span><del>- if (Inst result = tryTestLoadImm(Arg::Width8, Arg::Unsigned, Load8Z))
</del><ins>+ if (Inst result = tryTestLoadImm(Arg::Width8, Load8Z))
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (Inst result = tryTestLoadImm(Arg::Width8, Arg::Signed, Load8S))
</del><ins>+ if (Inst result = tryTestLoadImm(Arg::Width8, Load8S))
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (Inst result = tryTestLoadImm(Arg::Width16, Arg::Unsigned, Load16Z))
</del><ins>+ if (Inst result = tryTestLoadImm(Arg::Width16, Load16Z))
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- if (Inst result = tryTestLoadImm(Arg::Width16, Arg::Signed, Load16S))
</del><ins>+ if (Inst result = tryTestLoadImm(Arg::Width16, Load16S))
</ins><span class="cx"> return result;
</span><span class="cx">
</span><del>- // This allows us to use a 32-bit test for 64-bit BitAnd if the immediate is
- // representable as an unsigned 32-bit value. The logic involved is the same
- // as if we were pondering using a 32-bit test for
- // BitAnd(SExt(Load(ptr)), const), in the sense that in both cases we have
- // to worry about high bits. So, we use the "Signed" version of this helper.
- if (Inst result = tryTestLoadImm(Arg::Width32, Arg::Signed, Load))
- return result;
</del><ins>+ // Now handle test's that involve a load and an immediate. Note that immediates
+ // are 32-bit, and we want zero-extension. Hence, the immediate form is compiled
+ // as a 32-bit test. Note that this spits on the grave of inferior endians, such
+ // as the big one.
</ins><span class="cx">
</span><del>- // This is needed to handle 32-bit test for arbitrary 32-bit immediates.
- if (Inst result = tryTestLoadImm(width, Arg::Unsigned, Load))
</del><ins>+ if (Inst result = tryTestLoadImm(Arg::Width32, Load))
</ins><span class="cx"> return result;
</span><span class="cx">
</span><span class="cx"> // Now handle test's that involve a load.
</span><span class="lines">@@ -1416,23 +1391,30 @@
</span><span class="cx">
</span><span class="cx"> // Now handle test's that involve an immediate and a tmp.
</span><span class="cx">
</span><del>- if (hasRightConst) {
- if ((width == Arg::Width32 && rightConst == 0xffffffff)
- || (width == Arg::Width64 && rightConst == -1)) {
</del><ins>+ if (leftImm) {
+ if ((width == Arg::Width32 && leftImm.value() == 0xffffffff)
+ || (width == Arg::Width64 && leftImm.value() == -1)) {
+ ArgPromise argPromise = tmpPromise(right);
+ if (Inst result = tryTest(width, argPromise, argPromise))
+ return result;
+ }
+ if (leftImm.isRepresentableAs<uint32_t>()) {
+ if (Inst result = tryTest(Arg::Width32, leftImm, tmpPromise(right)))
+ return result;
+ }
+ }
+
+ if (rightImm) {
+ if ((width == Arg::Width32 && rightImm.value() == 0xffffffff)
+ || (width == Arg::Width64 && rightImm.value() == -1)) {
</ins><span class="cx"> ArgPromise argPromise = tmpPromise(left);
</span><span class="cx"> if (Inst result = tryTest(width, argPromise, argPromise))
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><del>- if (isRepresentableAs<uint32_t>(rightConst)) {
</del><ins>+ if (rightImm.isRepresentableAs<uint32_t>()) {
</ins><span class="cx"> if (Inst result = tryTest(Arg::Width32, tmpPromise(left), rightImm))
</span><span class="cx"> return result;
</span><del>- if (Inst result = tryTest(Arg::Width32, tmpPromise(left), rightImm64))
- return result;
</del><span class="cx"> }
</span><del>- if (Inst result = tryTest(width, tmpPromise(left), rightImm))
- return result;
- if (Inst result = tryTest(width, tmpPromise(left), rightImm64))
- return result;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Finally, just do tmp's.
</span><span class="lines">@@ -1450,37 +1432,37 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Arg::isValidBitImmForm(-1)) {
</del><ins>+ if (Arg::isValidImmForm(-1)) {
</ins><span class="cx"> if (canCommitInternal && value->as<MemoryValue>()) {
</span><span class="cx"> // Handle things like Branch(Load8Z(value))
</span><span class="cx">
</span><del>- if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8Z), Arg::bitImm(-1))) {
</del><ins>+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8Z), Arg::imm(-1))) {
</ins><span class="cx"> commitInternal(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8S), Arg::bitImm(-1))) {
</del><ins>+ if (Inst result = tryTest(Arg::Width8, loadPromise(value, Load8S), Arg::imm(-1))) {
</ins><span class="cx"> commitInternal(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16Z), Arg::bitImm(-1))) {
</del><ins>+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16Z), Arg::imm(-1))) {
</ins><span class="cx"> commitInternal(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16S), Arg::bitImm(-1))) {
</del><ins>+ if (Inst result = tryTest(Arg::Width16, loadPromise(value, Load16S), Arg::imm(-1))) {
</ins><span class="cx"> commitInternal(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Inst result = tryTest(width, loadPromise(value), Arg::bitImm(-1))) {
</del><ins>+ if (Inst result = tryTest(width, loadPromise(value), Arg::imm(-1))) {
</ins><span class="cx"> commitInternal(value);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (Inst result = test(width, resCond, tmpPromise(value), Arg::bitImm(-1)))
</del><ins>+ if (Inst result = test(width, resCond, tmpPromise(value), Arg::imm(-1)))
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3B3LowerToAirh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/B3LowerToAir.h (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/B3LowerToAir.h 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/B3LowerToAir.h 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 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">@@ -35,7 +35,7 @@
</span><span class="cx">
</span><span class="cx"> // This lowers the current B3 procedure to an Air code.
</span><span class="cx">
</span><del>-JS_EXPORT_PRIVATE void lowerToAir(Procedure&);
</del><ins>+void lowerToAir(Procedure&);
</ins><span class="cx">
</span><span class="cx"> } } // namespace JSC::B3
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirArgcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirArg.cpp (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirArg.cpp 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/AirArg.cpp 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -57,7 +57,31 @@
</span><span class="cx">
</span><span class="cx"> bool Arg::isRepresentableAs(Width width, Signedness signedness) const
</span><span class="cx"> {
</span><del>- return isRepresentableAs(width, signedness, value());
</del><ins>+ switch (signedness) {
+ case Signed:
+ switch (width) {
+ case Width8:
+ return isRepresentableAs<int8_t>();
+ case Width16:
+ return isRepresentableAs<int16_t>();
+ case Width32:
+ return isRepresentableAs<int32_t>();
+ case Width64:
+ return isRepresentableAs<int64_t>();
+ }
+ case Unsigned:
+ switch (width) {
+ case Width8:
+ return isRepresentableAs<uint8_t>();
+ case Width16:
+ return isRepresentableAs<uint16_t>();
+ case Width32:
+ return isRepresentableAs<uint32_t>();
+ case Width64:
+ return isRepresentableAs<uint64_t>();
+ }
+ }
+ ASSERT_NOT_REACHED();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Arg::usesTmp(Air::Tmp tmp) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirArgh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirArg.h (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirArg.h 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/AirArg.h 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -793,66 +793,8 @@
</span><span class="cx"> {
</span><span class="cx"> return B3::isRepresentableAs<T>(value());
</span><span class="cx"> }
</span><del>-
- static bool isRepresentableAs(Width width, Signedness signedness, int64_t value)
- {
- switch (signedness) {
- case Signed:
- switch (width) {
- case Width8:
- return B3::isRepresentableAs<int8_t>(value);
- case Width16:
- return B3::isRepresentableAs<int16_t>(value);
- case Width32:
- return B3::isRepresentableAs<int32_t>(value);
- case Width64:
- return B3::isRepresentableAs<int64_t>(value);
- }
- case Unsigned:
- switch (width) {
- case Width8:
- return B3::isRepresentableAs<uint8_t>(value);
- case Width16:
- return B3::isRepresentableAs<uint16_t>(value);
- case Width32:
- return B3::isRepresentableAs<uint32_t>(value);
- case Width64:
- return B3::isRepresentableAs<uint64_t>(value);
- }
- }
- ASSERT_NOT_REACHED();
- }
</del><span class="cx">
</span><span class="cx"> bool isRepresentableAs(Width, Signedness) const;
</span><del>-
- static int64_t castToType(Width width, Signedness signedness, int64_t value)
- {
- switch (signedness) {
- case Signed:
- switch (width) {
- case Width8:
- return static_cast<int8_t>(value);
- case Width16:
- return static_cast<int16_t>(value);
- case Width32:
- return static_cast<int32_t>(value);
- case Width64:
- return static_cast<int64_t>(value);
- }
- case Unsigned:
- switch (width) {
- case Width8:
- return static_cast<uint8_t>(value);
- case Width16:
- return static_cast<uint16_t>(value);
- case Width32:
- return static_cast<uint32_t>(value);
- case Width64:
- return static_cast<uint64_t>(value);
- }
- }
- ASSERT_NOT_REACHED();
- }
</del><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> T asNumber() const
</span><span class="lines">@@ -1358,11 +1300,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Arg::Kind);
-JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Arg::Role);
-JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Arg::Type);
-JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Arg::Width);
-JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Arg::Signedness);
</del><ins>+void printInternal(PrintStream&, JSC::B3::Air::Arg::Kind);
+void printInternal(PrintStream&, JSC::B3::Air::Arg::Role);
+void printInternal(PrintStream&, JSC::B3::Air::Arg::Type);
+void printInternal(PrintStream&, JSC::B3::Air::Arg::Width);
+void printInternal(PrintStream&, JSC::B3::Air::Arg::Signedness);
</ins><span class="cx">
</span><span class="cx"> template<typename T> struct DefaultHash;
</span><span class="cx"> template<> struct DefaultHash<JSC::B3::Air::Arg> {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirCodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirCode.h (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirCode.h 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/AirCode.h 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> // Recomputes predecessors and deletes unreachable blocks.
</span><span class="cx"> void resetReachability();
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void dump(PrintStream&) const;
</del><ins>+ void dump(PrintStream&) const;
</ins><span class="cx">
</span><span class="cx"> unsigned size() const { return m_blocks.size(); }
</span><span class="cx"> BasicBlock* at(unsigned index) const { return m_blocks[index].get(); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirOpcodeopcodes"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/AirOpcode.opcodes 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -675,24 +675,23 @@
</span><span class="cx"> x86: RelCond, Index, Tmp
</span><span class="cx">
</span><span class="cx"> BranchTest8 U:G:32, U:G:8, U:G:8 /branch
</span><del>- x86: ResCond, Addr, BitImm
- x86: ResCond, Index, BitImm
</del><ins>+ x86: ResCond, Addr, Imm
+ x86: ResCond, Index, Imm
</ins><span class="cx">
</span><span class="cx"> BranchTest32 U:G:32, U:G:32, U:G:32 /branch
</span><span class="cx"> ResCond, Tmp, Tmp
</span><span class="cx"> ResCond, Tmp, BitImm
</span><del>- x86: ResCond, Addr, BitImm
- x86: ResCond, Index, BitImm
</del><ins>+ x86: ResCond, Addr, Imm
+ x86: ResCond, Index, Imm
</ins><span class="cx">
</span><span class="cx"> # Warning: forms that take an immediate will sign-extend their immediate. You probably want
</span><span class="cx"> # BranchTest32 in most cases where you use an immediate.
</span><span class="cx"> 64: BranchTest64 U:G:32, U:G:64, U:G:64 /branch
</span><span class="cx"> ResCond, Tmp, Tmp
</span><del>- arm: ResCond, Tmp, BitImm64
- x86: ResCond, Tmp, BitImm
- x86: ResCond, Addr, BitImm
</del><ins>+ ResCond, Tmp, BitImm64
+ x86: ResCond, Addr, Imm
</ins><span class="cx"> x86: ResCond, Addr, Tmp
</span><del>- x86: ResCond, Index, BitImm
</del><ins>+ x86: ResCond, Index, Imm
</ins><span class="cx">
</span><span class="cx"> BranchDouble U:G:32, U:F:64, U:F:64 /branch
</span><span class="cx"> DoubleCond, Tmp, Tmp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airAirValidateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/AirValidate.h (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/AirValidate.h 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/AirValidate.h 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015 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">@@ -32,7 +32,7 @@
</span><span class="cx">
</span><span class="cx"> class Code;
</span><span class="cx">
</span><del>-JS_EXPORT_PRIVATE void validate(Code&, const char* dumpBefore = nullptr);
</del><ins>+void validate(Code&, const char* dumpBefore = nullptr);
</ins><span class="cx">
</span><span class="cx"> } } } // namespace JSC::B3::Air
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3airopcode_generatorrb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/air/opcode_generator.rb 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx">
</span><span class="cx"> outp.puts "namespace WTF {"
</span><span class="cx"> outp.puts "class PrintStream;"
</span><del>- outp.puts "JS_EXPORT_PRIVATE void printInternal(PrintStream&, JSC::B3::Air::Opcode);"
</del><ins>+ outp.puts "void printInternal(PrintStream&, JSC::B3::Air::Opcode);"
</ins><span class="cx"> outp.puts "} // namespace WTF"
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreb3testb3cpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/b3/testb3.cpp (203757 => 203758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-07-27 00:45:47 UTC (rev 203757)
+++ trunk/Source/JavaScriptCore/b3/testb3.cpp 2016-07-27 01:23:53 UTC (rev 203758)
</span><span class="lines">@@ -135,22 +135,6 @@
</span><span class="cx"> return invoke<T>(*compile(procedure), arguments...);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void lowerToAirForTesting(Procedure& proc)
-{
- proc.resetReachability();
-
- if (shouldBeVerbose())
- dataLog("B3 before lowering:\n", proc);
-
- validate(proc);
- lowerToAir(proc);
-
- if (shouldBeVerbose())
- dataLog("Air after lowering:\n", proc.code());
-
- Air::validate(proc.code());
-}
-
</del><span class="cx"> template<typename Type>
</span><span class="cx"> struct Operand {
</span><span class="cx"> const char* name;
</span><span class="lines">@@ -12827,48 +12811,6 @@
</span><span class="cx"> run(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void testBranchBitAndImmFusion(
- B3::Opcode valueModifier, Type valueType, int64_t constant,
- Air::Opcode expectedOpcode, Air::Arg::Kind firstKind)
-{
- // Currently this test should pass on all CPUs. But some CPUs may not support this fused
- // instruction. It's OK to skip this test on those CPUs.
-
- Procedure proc;
-
- BasicBlock* root = proc.addBlock();
- BasicBlock* one = proc.addBlock();
- BasicBlock* two = proc.addBlock();
-
- Value* left = root->appendNew<ArgumentRegValue>(proc, Origin(), GPRInfo::argumentGPR0);
-
- if (valueModifier != Identity) {
- if (MemoryValue::accepts(valueModifier))
- left = root->appendNew<MemoryValue>(proc, valueModifier, valueType, Origin(), left);
- else
- left = root->appendNew<Value>(proc, valueModifier, valueType, Origin(), left);
- }
-
- root->appendNew<Value>(
- proc, Branch, Origin(),
- root->appendNew<Value>(
- proc, BitAnd, Origin(), left,
- root->appendIntConstant(proc, Origin(), valueType, constant)));
- root->setSuccessors(FrequentedBlock(one), FrequentedBlock(two));
-
- one->appendNew<Value>(proc, Oops, Origin());
- two->appendNew<Value>(proc, Oops, Origin());
-
- lowerToAirForTesting(proc);
-
- // The first basic block must end in a BranchTest64(resCond, tmp, bitImm).
- Air::Inst terminal = proc.code()[0]->last();
- CHECK_EQ(terminal.opcode, expectedOpcode);
- CHECK_EQ(terminal.args[0].kind(), Air::Arg::ResCond);
- CHECK_EQ(terminal.args[1].kind(), firstKind);
- CHECK(terminal.args[2].kind() == Air::Arg::BitImm || terminal.args[2].kind() == Air::Arg::BitImm64);
-}
-
</del><span class="cx"> // Make sure the compiler does not try to optimize anything out.
</span><span class="cx"> NEVER_INLINE double zero()
</span><span class="cx"> {
</span><span class="lines">@@ -14282,17 +14224,6 @@
</span><span class="cx">
</span><span class="cx"> RUN(testSomeEarlyRegister());
</span><span class="cx">
</span><del>- RUN(testBranchBitAndImmFusion(Identity, Int64, 1, Air::BranchTest32, Air::Arg::Tmp));
- RUN(testBranchBitAndImmFusion(Identity, Int64, 0xff, Air::BranchTest32, Air::Arg::Tmp));
- RUN(testBranchBitAndImmFusion(Trunc, Int32, 1, Air::BranchTest32, Air::Arg::Tmp));
- RUN(testBranchBitAndImmFusion(Trunc, Int32, 0xff, Air::BranchTest32, Air::Arg::Tmp));
- if (isX86()) {
- RUN(testBranchBitAndImmFusion(Load8S, Int32, 1, Air::BranchTest8, Air::Arg::Addr));
- RUN(testBranchBitAndImmFusion(Load8Z, Int32, 1, Air::BranchTest8, Air::Arg::Addr));
- RUN(testBranchBitAndImmFusion(Load, Int32, 1, Air::BranchTest32, Air::Arg::Addr));
- RUN(testBranchBitAndImmFusion(Load, Int64, 1, Air::BranchTest32, Air::Arg::Addr));
- }
-
</del><span class="cx"> if (tasks.isEmpty())
</span><span class="cx"> usage();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>