Remove a few likely()'s

diff --git a/src/hb-ot-layout-common-private.hh b/src/hb-ot-layout-common-private.hh
index fb07161..75cbc64 100644 (file)
--- a/src/hb-ot-layout-common-private.hh
+++ b/src/hb-ot-layout-common-private.hh
@@ -284,7 +284,7 @@ struct Lookup
     TRACE_SANITIZE ();
     /* Real sanitize of the subtables is done by GSUB/GPOS/... */
     if (!(context->check_struct (this)
-       && likely (subTable.sanitize (context)))) return false;
+       && subTable.sanitize (context))) return false;
     if (unlikely (lookupFlag & LookupFlag::UseMarkFilteringSet))
     {
       USHORT &markFilteringSet = StructAfter<USHORT> (subTable);

diff --git a/src/hb-ot-layout-gpos-private.hh b/src/hb-ot-layout-gpos-private.hh
index f028245..04b156f 100644 (file)
--- a/src/hb-ot-layout-gpos-private.hh
+++ b/src/hb-ot-layout-gpos-private.hh
@@ -633,7 +633,7 @@ struct PairPosFormat1
 
     if (!(context->check_struct (this)
        && coverage.sanitize (context, this)
-       && likely (pairSet.sanitize (context, this, len1 + len2)))) return false;
+       && pairSet.sanitize (context, this, len1 + len2))) return false;
 
     if (!(valueFormat1.has_device () || valueFormat2.has_device ())) return true;
 
@@ -1092,7 +1092,7 @@ struct MarkBasePosFormat1
         && markCoverage.sanitize (context, this)
        && baseCoverage.sanitize (context, this)
        && markArray.sanitize (context, this)
-       && likely (baseArray.sanitize (context, this, (unsigned int) classCount));
+       && baseArray.sanitize (context, this, (unsigned int) classCount);
   }
 
   private:
@@ -1215,7 +1215,7 @@ struct MarkLigPosFormat1
         && markCoverage.sanitize (context, this)
        && ligatureCoverage.sanitize (context, this)
        && markArray.sanitize (context, this)
-       && likely (ligatureArray.sanitize (context, this, (unsigned int) classCount));
+       && ligatureArray.sanitize (context, this, (unsigned int) classCount);
   }
 
   private:
@@ -1319,7 +1319,7 @@ struct MarkMarkPosFormat1
        && mark1Coverage.sanitize (context, this)
        && mark2Coverage.sanitize (context, this)
        && mark1Array.sanitize (context, this)
-       && likely (mark2Array.sanitize (context, this, (unsigned int) classCount));
+       && mark2Array.sanitize (context, this, (unsigned int) classCount);
   }
 
   private: