[Coverage/SingleSubst] Move hand-written loop to Coverage

src/OT/Layout/Common/CoverageFormat2.hh

@@ -142,12 +142,37 @@ struct CoverageFormat2_4
 	    hb_requires (hb_is_sink_of (IterableOut, hb_codepoint_t))>
   void intersect_set (const hb_set_t &glyphs, IterableOut &intersect_glyphs) const
   {
-    for (const auto& range : rangeRecord)
+    /* Why the second branch is >2x faster I have no idea, but it seems to be. */
+    if (0)
     {
-      hb_codepoint_t last = range.last;
+      for (const auto& range : rangeRecord)
-      for (hb_codepoint_t g = range.first - 1;
+      {
-           glyphs.next (&g) && g <= last;)
+	hb_codepoint_t last = range.last;
-        intersect_glyphs << g;
+	for (hb_codepoint_t g = range.first - 1;
+	     glyphs.next (&g) && g <= last;)
+	  intersect_glyphs << g;
+      }
+    }
+    else
+    {
+      iter_t c_iter;
+      c_iter.init (*this);
+      auto s_iter = hb_iter (glyphs);
+      while (c_iter.__more__ () && s_iter)
+      {
+	hb_codepoint_t cv = c_iter.get_glyph ();
+	hb_codepoint_t sv = *s_iter;
+	if (cv == sv)
+	{
+	  intersect_glyphs << cv;
+	  c_iter.__next__ ();
+	  s_iter++;
+	}
+	else if (cv < sv)
+	  c_iter.__next__ ();
+	else
+	  s_iter++;
+      }
     }
   }
 

src/OT/Layout/GSUB/SingleSubstFormat1.hh

@@ -42,37 +42,13 @@ struct SingleSubstFormat1_3
     hb_codepoint_t d = deltaGlyphID;
     hb_codepoint_t mask = get_mask ();
 
-    if (1)
+    hb_set_t intersection;
-    {
+    (this+coverage).intersect_set (c->parent_active_glyphs (), intersection);
-      /* Somehow this branch is much faster. Can't understand why. */
-      auto c_iter = hb_iter (this+coverage);
-      auto s_iter = hb_iter (c->parent_active_glyphs ());
-      while (c_iter && s_iter)
-      {
-	hb_codepoint_t cv = *c_iter;
-	hb_codepoint_t sv = *s_iter;
-	if (cv == sv)
-	{
-	  c->output->add ((cv + d) & mask);
-	  c_iter++;
-	  s_iter++;
-	}
-	else if (cv < sv)
-	  c_iter++;
-	else
-	  s_iter++;
-      }
-    }
-    else
-    {
-      hb_set_t intersection;
-      (this+coverage).intersect_set (c->parent_active_glyphs (), intersection);
 
-      + hb_iter (intersection)
+    + hb_iter (intersection)
-      | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; })
+    | hb_map ([d, mask] (hb_codepoint_t g) { return (g + d) & mask; })
-      | hb_sink (c->output)
+    | hb_sink (c->output)
-      ;
+    ;
-    }
   }
 
   void closure_lookups (hb_closure_lookups_context_t *c) const {}