• Stefan Beller's avatar
    create_delta_index: simplify condition always evaluating to true · f7466e94
    Stefan Beller authored
    The code sequence  ' (1u << i) < hsize && i < 31 ' is a multi step
    process, whose first step requires that 'i' is already less that 31,
    otherwise the result (1u << i)  is undefined (and  'undef_val < hsize'
    can therefore be assumed to be 'false'), and so the later test  i < 31
    can always be optimized away as dead code ('i' is already less than 31,
    or the short circuit 'and' applies).
    So we need to get rid of that code. One way would be to exchange the
    order of the conditions, so the expression 'i < 31 && (1u << i) < hsize'
    would remove that optimized unstable code already.
    However when checking the previous lines in that function, we can deduce
    that 'hsize' must always be smaller than (1u<<31), since 506049c7
    (fix >4GiB source delta assertion failure), because 'entries' is
    capped at an upper bound of 0xfffffffeU, so 'hsize' contains a maximum
    value of 0x3fffffff, which is smaller than (1u<<31), so the value of
    'i' will never be larger than 31 and we can remove that condition
    Signed-off-by: default avatarStefan Beller <stefanbeller@googlemail.com>
    Acked-by: Micolas Pitre's avatarNicolas Pitre <nico@fluxnic.net>
    Acked-by: Philip Oakley's avatarPhilip Oakley <philipoakley@iee.org>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
diff-delta.c 15.4 KB