<!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>[183548] 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/183548">183548</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-04-29 08:55:54 -0700 (Wed, 29 Apr 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>TypeOf should return SpecStringIdent and the DFG should know this
https://bugs.webkit.org/show_bug.cgi?id=144376

Reviewed by Andreas Kling.
        
Make TypeOf return atomic strings. That's a simple change in SmallStrings.
        
Make the DFG know this and use it for optimization. This makes Switch(TypeOf) a bit less
bad.

* dfg/DFGAbstractInterpreterInlines.h:
(JSC::DFG::AbstractInterpreter&lt;AbstractStateType&gt;::executeEffects):
* dfg/DFGAbstractValue.cpp:
(JSC::DFG::AbstractValue::setType):
* dfg/DFGAbstractValue.h:
(JSC::DFG::AbstractValue::setType):
* dfg/DFGInPlaceAbstractState.cpp:
(JSC::DFG::InPlaceAbstractState::initialize):
* dfg/DFGPredictionPropagationPhase.cpp:
(JSC::DFG::PredictionPropagationPhase::propagate):
* runtime/SmallStrings.cpp:
(JSC::SmallStrings::initialize):
* tests/stress/switch-typeof-indirect.js: Added.
(bar):
(foo):
(test):
* tests/stress/switch-typeof-slightly-indirect.js: Added.
(foo):
(test):
* tests/stress/switch-typeof.js: Added.
(foo):
(test):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh">trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractValuecpp">trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGAbstractValueh">trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.h</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStatecpp">trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp">trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSmallStringscpp">trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoretestsstressswitchtypeofindirectjs">trunk/Source/JavaScriptCore/tests/stress/switch-typeof-indirect.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressswitchtypeofslightlyindirectjs">trunk/Source/JavaScriptCore/tests/stress/switch-typeof-slightly-indirect.js</a></li>
<li><a href="#trunkSourceJavaScriptCoretestsstressswitchtypeofjs">trunk/Source/JavaScriptCore/tests/stress/switch-typeof.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/ChangeLog        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-04-28  Filip Pizlo  &lt;fpizlo@apple.com&gt;
+
+        TypeOf should return SpecStringIdent and the DFG should know this
+        https://bugs.webkit.org/show_bug.cgi?id=144376
+
+        Reviewed by Andreas Kling.
+        
+        Make TypeOf return atomic strings. That's a simple change in SmallStrings.
+        
+        Make the DFG know this and use it for optimization. This makes Switch(TypeOf) a bit less
+        bad.
+
+        * dfg/DFGAbstractInterpreterInlines.h:
+        (JSC::DFG::AbstractInterpreter&lt;AbstractStateType&gt;::executeEffects):
+        * dfg/DFGAbstractValue.cpp:
+        (JSC::DFG::AbstractValue::setType):
+        * dfg/DFGAbstractValue.h:
+        (JSC::DFG::AbstractValue::setType):
+        * dfg/DFGInPlaceAbstractState.cpp:
+        (JSC::DFG::InPlaceAbstractState::initialize):
+        * dfg/DFGPredictionPropagationPhase.cpp:
+        (JSC::DFG::PredictionPropagationPhase::propagate):
+        * runtime/SmallStrings.cpp:
+        (JSC::SmallStrings::initialize):
+        * tests/stress/switch-typeof-indirect.js: Added.
+        (bar):
+        (foo):
+        (test):
+        * tests/stress/switch-typeof-slightly-indirect.js: Added.
+        (foo):
+        (test):
+        * tests/stress/switch-typeof.js: Added.
+        (foo):
+        (test):
+
</ins><span class="cx"> 2015-04-29  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(181868): Windows Live SkyDrive cannot open an excel file
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractInterpreterInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractInterpreterInlines.h        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx">             setConstant(node, jsDoubleNumber(child.asNumber()));
</span><span class="cx">             break;
</span><span class="cx">         }
</span><del>-        forNode(node).setType(forNode(node-&gt;child1()).m_type);
</del><ins>+        forNode(node).setType(m_graph, forNode(node-&gt;child1()).m_type);
</ins><span class="cx">         forNode(node).fixTypeForRepresentation(node);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -370,7 +370,7 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        forNode(node).setType(forNode(node-&gt;child1()).m_type &amp; ~SpecDoubleImpureNaN);
</del><ins>+        forNode(node).setType(m_graph, forNode(node-&gt;child1()).m_type &amp; ~SpecDoubleImpureNaN);
</ins><span class="cx">         forNode(node).fixTypeForRepresentation(node);
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx">     case ValueAdd: {
</span><span class="cx">         ASSERT(node-&gt;binaryUseKind() == UntypedUse);
</span><span class="cx">         clobberWorld(node-&gt;origin.semantic, clobberLimit);
</span><del>-        forNode(node).setType(SpecString | SpecBytecodeNumber);
</del><ins>+        forNode(node).setType(m_graph, SpecString | SpecBytecodeNumber);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -910,7 +910,7 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        forNode(node).set(m_graph, m_graph.m_vm.stringStructure.get());
</del><ins>+        forNode(node).setType(m_graph, SpecStringIdent);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">             
</span><span class="lines">@@ -1009,7 +1009,7 @@
</span><span class="cx">         break;
</span><span class="cx">         
</span><span class="cx">     case StringFromCharCode:
</span><del>-        forNode(node).setType(SpecString);
</del><ins>+        forNode(node).setType(m_graph, SpecString);
</ins><span class="cx">         break;
</span><span class="cx"> 
</span><span class="cx">     case StringCharAt:
</span><span class="lines">@@ -1268,7 +1268,7 @@
</span><span class="cx">         
</span><span class="cx">         clobberWorld(node-&gt;origin.semantic, clobberLimit);
</span><span class="cx">         
</span><del>-        forNode(node).setType((SpecHeapTop &amp; ~SpecCell) | SpecString | SpecCellOther);
</del><ins>+        forNode(node).setType(m_graph, (SpecHeapTop &amp; ~SpecCell) | SpecString | SpecCellOther);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -1315,7 +1315,7 @@
</span><span class="cx">         break;
</span><span class="cx"> 
</span><span class="cx">     case NewArrayWithSize:
</span><del>-        forNode(node).setType(SpecArray);
</del><ins>+        forNode(node).setType(m_graph, SpecArray);
</ins><span class="cx">         break;
</span><span class="cx">         
</span><span class="cx">     case NewTypedArray:
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> 
</span><span class="cx">     case CreateThis: {
</span><span class="cx">         // FIXME: We can fold this to NewObject if the incoming callee is a constant.
</span><del>-        forNode(node).setType(SpecFinalObject);
</del><ins>+        forNode(node).setType(m_graph, SpecFinalObject);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -1402,7 +1402,7 @@
</span><span class="cx">         break;
</span><span class="cx">         
</span><span class="cx">     case CreateClonedArguments:
</span><del>-        forNode(node).setType(SpecObjectOther);
</del><ins>+        forNode(node).setType(m_graph, SpecObjectOther);
</ins><span class="cx">         break;
</span><span class="cx">         
</span><span class="cx">     case NewFunction:
</span><span class="lines">@@ -1420,7 +1420,7 @@
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        forNode(node).setType(SpecFunction);
</del><ins>+        forNode(node).setType(m_graph, SpecFunction);
</ins><span class="cx">         break;
</span><span class="cx">         
</span><span class="cx">     case GetArgumentCount:
</span><span class="lines">@@ -1437,7 +1437,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        forNode(node).setType(SpecObject);
</del><ins>+        forNode(node).setType(m_graph, SpecObject);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -1451,7 +1451,7 @@
</span><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        forNode(node).setType(SpecObject);
</del><ins>+        forNode(node).setType(m_graph, SpecObject);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">         
</span><span class="lines">@@ -1462,7 +1462,7 @@
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        forNode(node).setType(SpecObjectOther);
</del><ins>+        forNode(node).setType(m_graph, SpecObjectOther);
</ins><span class="cx">         break;
</span><span class="cx"> 
</span><span class="cx">     case SkipScope: {
</span><span class="lines">@@ -1471,7 +1471,7 @@
</span><span class="cx">             setConstant(node, *m_graph.freeze(JSValue(jsCast&lt;JSScope*&gt;(child.asCell())-&gt;next())));
</span><span class="cx">             break;
</span><span class="cx">         }
</span><del>-        forNode(node).setType(SpecObjectOther);
</del><ins>+        forNode(node).setType(m_graph, SpecObjectOther);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1874,7 +1874,7 @@
</span><span class="cx">                 break;
</span><span class="cx">             }
</span><span class="cx">         }
</span><del>-        forNode(node).setType(SpecCellOther);
</del><ins>+        forNode(node).setType(m_graph, SpecCellOther);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     
</span><span class="lines">@@ -1997,19 +1997,19 @@
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     case GetPropertyEnumerator: {
</span><del>-        forNode(node).setType(SpecCell);
</del><ins>+        forNode(node).setType(m_graph, SpecCell);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     case GetEnumeratorStructurePname: {
</span><del>-        forNode(node).setType(SpecString | SpecOther);
</del><ins>+        forNode(node).setType(m_graph, SpecString | SpecOther);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     case GetEnumeratorGenericPname: {
</span><del>-        forNode(node).setType(SpecString | SpecOther);
</del><ins>+        forNode(node).setType(m_graph, SpecString | SpecOther);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     case ToIndexString: {
</span><del>-        forNode(node).setType(SpecString);
</del><ins>+        forNode(node).setType(m_graph, SpecString);
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.cpp        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -118,6 +118,24 @@
</span><span class="cx">     assertIsRegistered(graph);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void AbstractValue::setType(Graph&amp; graph, SpeculatedType type)
+{
+    SpeculatedType cellType = type &amp; SpecCell;
+    if (cellType) {
+        if (!(cellType &amp; ~SpecString))
+            m_structure = graph.m_vm.stringStructure.get();
+        else
+            m_structure.makeTop();
+        m_arrayModes = ALL_ARRAY_MODES;
+    } else {
+        m_structure.clear();
+        m_arrayModes = 0;
+    }
+    m_type = type;
+    m_value = JSValue();
+    checkConsistency();
+}
+
</ins><span class="cx"> void AbstractValue::fixTypeForRepresentation(NodeFlags representation)
</span><span class="cx"> {
</span><span class="cx">     if (representation == NodeResultDouble) {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGAbstractValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.h (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.h        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/dfg/DFGAbstractValue.h        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -199,15 +199,15 @@
</span><span class="cx">     void set(Graph&amp;, Structure*);
</span><span class="cx">     void set(Graph&amp;, const StructureSet&amp;);
</span><span class="cx">     
</span><ins>+    // Set this value to represent the given set of types as precisely as possible.
+    void setType(Graph&amp;, SpeculatedType);
+    
+    // As above, but only valid for non-cell types.
</ins><span class="cx">     void setType(SpeculatedType type)
</span><span class="cx">     {
</span><del>-        if (type &amp; SpecCell) {
-            m_structure.makeTop();
-            m_arrayModes = ALL_ARRAY_MODES;
-        } else {
-            m_structure.clear();
-            m_arrayModes = 0;
-        }
</del><ins>+        RELEASE_ASSERT(!(type &amp; SpecCell));
+        m_structure.clear();
+        m_arrayModes = 0;
</ins><span class="cx">         m_type = type;
</span><span class="cx">         m_value = JSValue();
</span><span class="cx">         checkConsistency();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGInPlaceAbstractStatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/dfg/DFGInPlaceAbstractState.cpp        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx">             root-&gt;valuesAtHead.argument(i).setType(SpecBoolean);
</span><span class="cx">             break;
</span><span class="cx">         case FlushedCell:
</span><del>-            root-&gt;valuesAtHead.argument(i).setType(SpecCell);
</del><ins>+            root-&gt;valuesAtHead.argument(i).setType(m_graph, SpecCell);
</ins><span class="cx">             break;
</span><span class="cx">         case FlushedJSValue:
</span><span class="cx">             root-&gt;valuesAtHead.argument(i).makeHeapTop();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoredfgDFGPredictionPropagationPhasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/dfg/DFGPredictionPropagationPhase.cpp        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -379,7 +379,7 @@
</span><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         case TypeOf: {
</span><del>-            changed |= setPrediction(SpecString);
</del><ins>+            changed |= setPrediction(SpecStringIdent);
</ins><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSmallStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp (183547 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp        2015-04-29 15:49:43 UTC (rev 183547)
+++ trunk/Source/JavaScriptCore/runtime/SmallStrings.cpp        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SmallStrings::initialize(VM* vm, JSString*&amp; string, const char* value)
</span><span class="cx"> {
</span><del>-    string = JSString::create(*vm, StringImpl::create(value));
</del><ins>+    string = JSString::create(*vm, Identifier::fromString(vm, value).impl());
</ins><span class="cx">     m_needsToBeVisited = true;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressswitchtypeofindirectjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/switch-typeof-indirect.js (0 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/switch-typeof-indirect.js                                (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/switch-typeof-indirect.js        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+function bar(value) {
+    return typeof value;
+}
+noInline(bar);
+
+function foo(value) {
+    switch (bar(value)) {
+    case &quot;undefined&quot;:
+        return 0;
+    case &quot;object&quot;:
+        return 1;
+    case &quot;function&quot;:
+        return 2;
+    case &quot;boolean&quot;:
+        return 3;
+    case &quot;number&quot;:
+        return 4;
+    case &quot;string&quot;:
+        return 5;
+    default:
+        return 6;
+    }
+}
+
+noInline(foo);
+
+function test(value, expected) {
+    var result = foo(value);
+    if (result != expected)
+        throw &quot;Error: bad type code for &quot; + value + &quot;: &quot; + result + &quot; (expected &quot; + expected + &quot;)&quot;;
+}
+
+for (var i = 0; i &lt; 10000; ++i) {
+    test(void 0, 0);
+    test({}, 1);
+    test(function() { return 42; }, 2);
+    test(true, 3);
+    test(42, 4);
+    test(42.5, 4);
+    test(&quot;hello&quot;, 5);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressswitchtypeofslightlyindirectjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/switch-typeof-slightly-indirect.js (0 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/switch-typeof-slightly-indirect.js                                (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/switch-typeof-slightly-indirect.js        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+function foo(value) {
+    var t = typeof value;
+    if (!t)
+        return -1;
+    switch (t) {
+    case &quot;undefined&quot;:
+        return 0;
+    case &quot;object&quot;:
+        return 1;
+    case &quot;function&quot;:
+        return 2;
+    case &quot;boolean&quot;:
+        return 3;
+    case &quot;number&quot;:
+        return 4;
+    case &quot;string&quot;:
+        return 5;
+    default:
+        return 6;
+    }
+}
+
+noInline(foo);
+
+function test(value, expected) {
+    var result = foo(value);
+    if (result != expected)
+        throw &quot;Error: bad type code for &quot; + value + &quot;: &quot; + result + &quot; (expected &quot; + expected + &quot;)&quot;;
+}
+
+for (var i = 0; i &lt; 10000; ++i) {
+    test(void 0, 0);
+    test({}, 1);
+    test(function() { return 42; }, 2);
+    test(true, 3);
+    test(42, 4);
+    test(42.5, 4);
+    test(&quot;hello&quot;, 5);
+}
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoretestsstressswitchtypeofjs"></a>
<div class="addfile"><h4>Added: trunk/Source/JavaScriptCore/tests/stress/switch-typeof.js (0 => 183548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/tests/stress/switch-typeof.js                                (rev 0)
+++ trunk/Source/JavaScriptCore/tests/stress/switch-typeof.js        2015-04-29 15:55:54 UTC (rev 183548)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+function foo(value) {
+    switch (typeof value) {
+    case &quot;undefined&quot;:
+        return 0;
+    case &quot;object&quot;:
+        return 1;
+    case &quot;function&quot;:
+        return 2;
+    case &quot;boolean&quot;:
+        return 3;
+    case &quot;number&quot;:
+        return 4;
+    case &quot;string&quot;:
+        return 5;
+    default:
+        return 6;
+    }
+}
+
+noInline(foo);
+
+function test(value, expected) {
+    var result = foo(value);
+    if (result != expected)
+        throw &quot;Error: bad type code for &quot; + value + &quot;: &quot; + result + &quot; (expected &quot; + expected + &quot;)&quot;;
+}
+
+for (var i = 0; i &lt; 10000; ++i) {
+    test(void 0, 0);
+    test({}, 1);
+    test(function() { return 42; }, 2);
+    test(true, 3);
+    test(42, 4);
+    test(42.5, 4);
+    test(&quot;hello&quot;, 5);
+}
</ins></span></pre>
</div>
</div>

</body>
</html>