merge default

Author: cfbolz

rpython/jit/metainterp/optimizeopt/bridgeopt.py

@@ -93,7 +93,6 @@ def serialize_optimizer_knowledge(optimizer, numb_state, liveboxes, liveboxes_fr
         triples_struct, triples_array = optimizer.optheap.serialize_optheap(available_boxes)
         # can only encode descrs that have a known index into
         # metainterp_sd.all_descrs
-        triples_struct = [triple for triple in triples_struct if triple[1].descr_index != -1]
         numb_state.append_int(len(triples_struct))
         for box1, descr, box2 in triples_struct:
             descr_index = descr.descr_index

rpython/jit/metainterp/optimizeopt/heap.py

@@ -696,6 +696,8 @@ def optimize_GUARD_NOT_INVALIDATED(self, op):
     def serialize_optheap(self, available_boxes):
         result_getfield = []
         for descr, cf in self.cached_fields.iteritems():
+            if descr.descr_index == -1:
+                continue # not reachable via metainterp_sd.all_descrs
             if cf._lazy_set:
                 continue  # XXX safe default for now
             parent_descr = descr.get_parent_descr()
@@ -715,6 +717,8 @@ def serialize_optheap(self, available_boxes):
                     result_getfield.append((box1, descr, box2))
         result_array = []
         for descr, indexdict in self.cached_arrayitems.iteritems():
+            if descr.descr_index == -1:
+                continue # not reachable via metainterp_sd.all_descrs
             for index, cf in indexdict.iteritems():
                 if cf._lazy_set:
                     continue  # XXX safe default for now

rpython/rlib/rbigint.py

@@ -1482,6 +1482,13 @@ def bit_length(self):
         bits = ovfcheck((i-1) * SHIFT) + msd_bits
         return bits
 
+    @jit.elidable
+    def bit_count(self):
+        res = 0
+        for i in range(self.numdigits()):
+            res = ovfcheck(res + bit_count_digit(self.digit(i)))
+        return res
+
     def gcd(self, other):
         """ Compute the (always positive) greatest common divisor of self and
         other """
@@ -2562,6 +2569,15 @@ def bits_in_digit(d):
     d_bits += ord(BitLengthTable[d])
     return d_bits
 
+
+def bit_count_digit(val):
+    count = 0
+    while val:
+        count += val & 1
+        val >>= 1
+    return count
+
+
 def _truediv_result(result, negate):
     if negate:
         result = -result

rpython/rlib/test/test_rbigint.py

@@ -1579,6 +1579,10 @@ def test_abs_rshift_and_mask(self, x, shift, mask):
         r1 = rx.abs_rshift_and_mask(r_ulonglong(shift), mask)
         assert r1 == (abs(x) >> shift) & mask
 
+    @given(biglongs)
+    def test_bit_count(self, val):
+        assert rbigint.fromlong(val).bit_count() == bin(abs(val)).count("1")
+
 
 @pytest.mark.parametrize(['methname'], [(methodname, ) for methodname in dir(TestHypothesis) if methodname.startswith("test_")])
 def test_hypothesis_small_shift(methname):

rpython/rlib/unicodedata/dawg.py

@@ -408,7 +408,6 @@ def _lookup(packed, s):
     stringpos = 0
     node_offset = 0
     skipped = 0  # keep track of number of final nodes that we skipped
-    false = False
     while stringpos < len(s):
         node_count, final, edge_offset = decode_node(packed, node_offset)
         prev_child_offset = edge_offset