Revision d616fbf256ef3102669d450ddadd8469fefcf95c authored by Eric Sunshine on 21 March 2016, 04:35:57 UTC, committed by Junio C Hamano on 21 March 2016, 16:18:07 UTC
Although changes by 5b442c4 (tree-diff: catch integer overflow in combine_diff_path allocation, 2016-02-19) are perfectly valid, they unfortunately trigger an internal compiler error in gcc 4.2.x: combine-diff.c: In function 'diff_tree_combined': combine-diff.c:1391: internal compiler error: Segmentation fault: 11 Experimentation reveals that changing st_add4()'s argument evaluation order is sufficient to sidestep this problem. Although st_add3() does not trigger the compiler bug, for style consistency, change its argument evaluation order to match. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 935de81
File | Mode | Size |
---|---|---|
xdiff.h | -rw-r--r-- | 3.6 KB |
xdiffi.c | -rw-r--r-- | 15.7 KB |
xdiffi.h | -rw-r--r-- | 2.0 KB |
xemit.c | -rw-r--r-- | 6.9 KB |
xemit.h | -rw-r--r-- | 1.2 KB |
xhistogram.c | -rw-r--r-- | 9.0 KB |
xinclude.h | -rw-r--r-- | 1.2 KB |
xmacros.h | -rw-r--r-- | 1.9 KB |
xmerge.c | -rw-r--r-- | 15.1 KB |
xpatience.c | -rw-r--r-- | 9.9 KB |
xprepare.c | -rw-r--r-- | 12.0 KB |
xprepare.h | -rw-r--r-- | 1.1 KB |
xtypes.h | -rw-r--r-- | 1.6 KB |
xutils.c | -rw-r--r-- | 11.0 KB |
xutils.h | -rw-r--r-- | 1.8 KB |
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...