Address PR feedback.

diff --git a/src/jit/lir.cpp b/src/jit/lir.cpp
index a616323181ce4ea835839aa5eef5daaca4e07e6d..4d0a7691fb1a877c20e0a019f9c16dd4bdda202d 100644 (file)
--- a/src/jit/lir.cpp
+++ b/src/jit/lir.cpp
@@ -1573,8 +1573,11 @@ bool LIR::Range::CheckLIR(Compiler* compiler, bool checkUnusedValues) const
             AliasSet::NodeInfo operandInfo(compiler, operand);
             if (operandInfo.IsLclVarRead())
             {
-                int count = 0;
-                if (unconsumedLclVarReads.TryRemove(operandInfo.LclNum(), &count) && count > 1)
+                int count;
+                const bool removed = unconsumedLclVarReads.TryRemove(operandInfo.LclNum(), &count);
+                assert(removed);
+
+                if (count > 1)
                 {
                     unconsumedLclVarReads.AddOrUpdate(operandInfo.LclNum(), count - 1);
                 }
@@ -1582,20 +1585,15 @@ bool LIR::Range::CheckLIR(Compiler* compiler, bool checkUnusedValues) const
         }
 
         AliasSet::NodeInfo nodeInfo(compiler, node);
-
-        bool unused;
-        if (nodeInfo.IsLclVarRead() && !unusedDefs.TryGetValue(node, &unused))
+        if (nodeInfo.IsLclVarRead() && !unusedDefs.Contains(node))
         {
             int count = 0;
             unconsumedLclVarReads.TryGetValue(nodeInfo.LclNum(), &count);
             unconsumedLclVarReads.AddOrUpdate(nodeInfo.LclNum(), count + 1);
         }
 
-        if (nodeInfo.IsLclVarWrite())
-        {
-            int unused;
-            assert(!unconsumedLclVarReads.TryGetValue(nodeInfo.LclNum(), &unused));
-        }
+        // If this node is a lclVar write, it must be to a lclVar that does not have an outstanding read.
+        assert(!nodeInfo.IsLclVarWrite() || !unconsumedLclVarReads.Contains(nodeInfo.LclNum()));
     }
 
     return true;

diff --git a/src/jit/smallhash.h b/src/jit/smallhash.h
index b9681ded6f598ce0bdc8ee5bccfa735a61d0d073..65c5eeda65ed5f5fb8d82113d3a5cc1822fd6597 100644 (file)
--- a/src/jit/smallhash.h
+++ b/src/jit/smallhash.h
@@ -579,6 +579,21 @@ public:
         *value = m_buckets[index].m_value;
         return true;
     }
+
+    //------------------------------------------------------------------------
+    // HashTableBase::Contains: returns true if a key exists in the table and
+    //                          false otherwise.
+    //
+    // Arguments:
+    //    key   - The key to find from the table.
+    //
+    // Returns:
+    //    True if the key was found in the table; false otherwise.
+    bool Contains(const TKey& key) const
+    {
+        unsigned unused, index;
+        return TryGetBucket(TKeyInfo::GetHashCode(key), key, &unused, &index);
+    }
 };
 
 //------------------------------------------------------------------------