py/qstr: Sort the first QSTR pool.

amirgon · amirgon · commit 04ba17bff82c · 2022-08-09T23:50:28.000+03:00
Signed-off-by: Amir Gonnen &lt;amirgonnen@gmail.com&gt;
diff --git a/py/makeqstrdata.py b/py/makeqstrdata.py
@@ -374,7 +374,7 @@ def print_qstr_data(qstrs):
     q1_values = [q for q in qstrs.values() if q.order >= 0]
 
     # go through each qstr in pool 0 and print it out. pool0 has special sort.
-    for q in sorted(q0_values, key=lambda x: x.order):
+    for q in sorted(q0_values, key=lambda x: (x.qhash, x.qlen)):
         print('QDEF0(MP_QSTR_%s, %d, %d, "%s")' % (q.ident, q.qhash, q.qlen, q.qdata))
 
     # go through each qstr in pool 1 and print it out. pool1 is regularly sorted.
diff --git a/py/qstr.c b/py/qstr.c
@@ -121,7 +121,7 @@ const qstr_pool_t mp_qstr_special_const_pool = {
     MP_QSTRspecial_const_number_of + 1, // corresponds to number of strings in array just below
     (qstr_hash_t *)mp_qstr_const_hashes0,
     (qstr_len_t *)mp_qstr_const_lengths0,
-    false,                       // special constant qstrs are not sorted
+    true,
     {
         #ifndef NO_QSTR
 #define QDEF0(id, hash, len, str) str,
@@ -245,7 +245,7 @@ qstr qstr_find_strn(const char *str, size_t str_len) {
                     high = mid;
                 } else {
                     low = mid;
-                    if (cmp == 0) {
+                    if (MP_UNLIKELY(cmp == 0)) {
                         while (low > 0 && pool->hashes[low - 1] == str_hash) {
                             low--;
                         }
