Deploying to master from @ gfx-rs/wgpu@1509512 🚀

Author: cwfitzgerald

doc/naga/proc/struct.ConstantEvaluator.html

@@ -8,7 +8,7 @@
 expressions - to the arena. See the <a href="struct.ConstantEvaluator.html#method.try_eval_and_append" title="method naga::proc::ConstantEvaluator::try_eval_and_append"><code>try_eval_and_append</code></a> method for details.</p>
 <p>A <code>ConstantEvaluator</code> also holds whatever information we need to carry out
 that evaluation: types, other constants, and so on.</p>
-</div></details><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-ConstantEvaluator%3C'a%3E" class="impl"><a class="src rightside" href="../../src/naga/proc/constant_evaluator.rs.html#589-2167">source</a><a href="#impl-ConstantEvaluator%3C'a%3E" class="anchor">§</a><h3 class="code-header">impl&lt;'a&gt; <a class="struct" href="struct.ConstantEvaluator.html" title="struct naga::proc::ConstantEvaluator">ConstantEvaluator</a>&lt;'a&gt;</h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.for_wgsl_module" class="method"><a class="src rightside" href="../../src/naga/proc/constant_evaluator.rs.html#594-608">source</a><h4 class="code-header">pub fn <a href="#method.for_wgsl_module" class="fn">for_wgsl_module</a>(
+</div></details><h2 id="implementations" class="section-header">Implementations<a href="#implementations" class="anchor">§</a></h2><div id="implementations-list"><details class="toggle implementors-toggle" open><summary><section id="impl-ConstantEvaluator%3C'a%3E" class="impl"><a class="src rightside" href="../../src/naga/proc/constant_evaluator.rs.html#589-2181">source</a><a href="#impl-ConstantEvaluator%3C'a%3E" class="anchor">§</a><h3 class="code-header">impl&lt;'a&gt; <a class="struct" href="struct.ConstantEvaluator.html" title="struct naga::proc::ConstantEvaluator">ConstantEvaluator</a>&lt;'a&gt;</h3></section></summary><div class="impl-items"><details class="toggle method-toggle" open><summary><section id="method.for_wgsl_module" class="method"><a class="src rightside" href="../../src/naga/proc/constant_evaluator.rs.html#594-608">source</a><h4 class="code-header">pub fn <a href="#method.for_wgsl_module" class="fn">for_wgsl_module</a>(
     module: &amp;'a mut <a class="struct" href="../struct.Module.html" title="struct naga::Module">Module</a>,
     global_expression_kind_tracker: &amp;'a mut <a class="struct" href="struct.ExpressionKindTracker.html" title="struct naga::proc::ExpressionKindTracker">ExpressionKindTracker</a>,
     in_override_ctx: <a class="primitive" href="https://doc.rust-lang.org/nightly/std/primitive.bool.html">bool</a>

doc/src/naga/proc/constant_evaluator.rs.html

@@ -2964,6 +2964,20 @@
 <a href="#2963" id="2963">2963</a>
 <a href="#2964" id="2964">2964</a>
 <a href="#2965" id="2965">2965</a>
+<a href="#2966" id="2966">2966</a>
+<a href="#2967" id="2967">2967</a>
+<a href="#2968" id="2968">2968</a>
+<a href="#2969" id="2969">2969</a>
+<a href="#2970" id="2970">2970</a>
+<a href="#2971" id="2971">2971</a>
+<a href="#2972" id="2972">2972</a>
+<a href="#2973" id="2973">2973</a>
+<a href="#2974" id="2974">2974</a>
+<a href="#2975" id="2975">2975</a>
+<a href="#2976" id="2976">2976</a>
+<a href="#2977" id="2977">2977</a>
+<a href="#2978" id="2978">2978</a>
+<a href="#2979" id="2979">2979</a>
 </pre></div><pre class="rust"><code><span class="kw">use </span>std::iter;
 
 <span class="kw">use </span>arrayvec::ArrayVec;
@@ -4847,6 +4861,20 @@
                             BinaryOperator::Modulo =&gt; a % b,
                             <span class="kw">_ </span>=&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(ConstantEvaluatorError::InvalidBinaryOpArgs),
                         }),
+                        (Literal::AbstractInt(a), Literal::U32(b)) =&gt; {
+                            Literal::AbstractInt(<span class="kw">match </span>op {
+                                BinaryOperator::ShiftLeft =&gt; {
+                                    <span class="kw">if </span>(<span class="kw">if </span>a.is_negative() { !a } <span class="kw">else </span>{ a }).leading_zeros() &lt;= b {
+                                        <span class="kw">return </span><span class="prelude-val">Err</span>(ConstantEvaluatorError::Overflow(
+                                            <span class="string">"&lt;&lt;"</span>.to_string(),
+                                        ));
+                                    }
+                                    a.checked_shl(b).unwrap_or(<span class="number">0</span>)
+                                }
+                                BinaryOperator::ShiftRight =&gt; a.checked_shr(b).unwrap_or(<span class="number">0</span>),
+                                <span class="kw">_ </span>=&gt; <span class="kw">return </span><span class="prelude-val">Err</span>(ConstantEvaluatorError::InvalidBinaryOpArgs),
+                            })
+                        }
                         (Literal::AbstractInt(a), Literal::AbstractInt(b)) =&gt; {
                             Literal::AbstractInt(<span class="kw">match </span>op {
                                 BinaryOperator::Add =&gt; a.checked_add(b).ok_or_else(|| {