From: Julian Andres Klode <jak@debian.org>
Date: Sun, 27 Dec 2015 10:50:05 +0000 (+0100)
Subject: ParseDepends: Mark branches for build-dep parsing as unlikely
X-Git-Tag: 1.1.9~12
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/147041626609e95700781bea045f8e8ea18370a3

ParseDepends: Mark branches for build-dep parsing as unlikely

We do not see those branches at all during normal mode of
operation (that is, during cache generation), so tell the
compiler about it.
---

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 121e02cd2..874a94e24 100644
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -609,7 +609,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    // Skip whitespace
    for (;I != Stop && isspace_ascii(*I) != 0; I++);
 
-   if (ParseArchFlags == true)
+   if (unlikely(ParseArchFlags == true))
    {
       string const arch = _config->Find("APT::Architecture");
       APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false);
@@ -669,7 +669,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       for (;I != Stop && isspace_ascii(*I) != 0; I++);
    }
 
-   if (ParseRestrictionsList == true)
+   if (unlikely(ParseRestrictionsList == true))
    {
       // Parse a restrictions formula which is in disjunctive normal form:
       // (foo AND bar) OR (blub AND bla)