11972 resync smatch

@@ -136,11 +136,11 @@
         }
 
         // Do a quick skip in case entire blocks from b1 are
         // already less than smallest element in b2.
         while (b1->nr == 0 ||
-               cmp (PTR_ENTRY(b1, b1->nr - 1), PTR_ENTRY(b2,0)) < 0) {
+               cmp (PTR_ENTRY_NOTAG(b1, b1->nr - 1), PTR_ENTRY_NOTAG(b2,0)) < 0) {
                 // printf ("Skipping whole block.\n");
                 BEEN_THERE('H');
                 b1 = b1->next;
                 if (--n == 0) {
                         BEEN_THERE('I');

@@ -147,12 +147,12 @@
                         return newhead; 
                 }
         }
 
         while (1) {
-                const void *d1 = PTR_ENTRY(b1,i1);
-                const void *d2 = PTR_ENTRY(b2,i2);
+                const void *d1 = PTR_ENTRY_NOTAG(b1,i1);
+                const void *d2 = PTR_ENTRY_NOTAG(b2,i2);
 
                 assert (i1 >= 0 && i1 < b1->nr);
                 assert (i2 >= 0 && i2 < b2->nr);
                 assert (b1 != b2);
                 assert (n > 0);