diff --git a/lfs.c b/lfs.c index 5ba837a3..ea0abc2b 100644 --- a/lfs.c +++ b/lfs.c @@ -967,41 +967,6 @@ static inline void lfsr_tag_trim2( lower_tag, upper_tag); } -static inline bool lfsr_tag_unavoidable( - lfsr_tag_t alt, lfsr_rid_t weight, - lfsr_srid_t lower_rid, lfsr_srid_t upper_rid, - lfsr_tag_t lower_tag, lfsr_tag_t upper_tag) { - if (lfsr_tag_isgt(alt)) { - return lfsr_tag_follow( - alt, weight, - lower_rid, upper_rid, - lower_rid-1, lower_tag+1); - } else { - return lfsr_tag_follow( - alt, weight, - lower_rid, upper_rid, - upper_rid-1, upper_tag-1); - } -} - -static inline bool lfsr_tag_unavoidable2( - lfsr_tag_t alt, lfsr_rid_t weight, - lfsr_tag_t alt2, lfsr_rid_t weight2, - lfsr_srid_t lower_rid, lfsr_srid_t upper_rid, - lfsr_tag_t lower_tag, lfsr_tag_t upper_tag) { - if (lfsr_tag_isred(alt2)) { - lfsr_tag_trim( - alt2, weight2, - &lower_rid, &upper_rid, - &lower_tag, &upper_tag); - } - - return lfsr_tag_unavoidable( - alt, weight, - lower_rid, upper_rid, - lower_tag, upper_tag); -} - static inline bool lfsr_tag_unreachable( lfsr_tag_t alt, lfsr_rid_t weight, lfsr_srid_t lower_rid, lfsr_srid_t upper_rid, @@ -2980,56 +2945,6 @@ trunk:; } } - // prune? - // b - // .-'| .-'| - // | b // .-'| => .-'| @@ -3067,6 +2982,51 @@ trunk:; lfs_swap32(&jump, &branch_); } + // prune? + // b + // .-'| .-'| + // |