Skip to content
This repository was archived by the owner on Jul 2, 2019. It is now read-only.

Commit b38f70a

Browse files
peffgitster
authored andcommitted
diff_filespec: reorder is_binary field
The middle of the diff_filespec struct contains a mixture of ints, shorts, and bit-fields, followed by a pointer. On an x86-64 system with an LP64 or LLP64 data model (i.e., most of them), the integers and flags end up being padded out by 41 bits to put the pointer at an 8-byte boundary. After the pointer, we have the "int is_binary" field, which is only 32 bits. We end up wasting another 32 bits to pad the struct size up to a multiple of 64 bits. We can move the is_binary field before the pointer, which lets the compiler store it where we used to have padding. This shrinks the top padding to only 9 bits (from the bit-fields), and eliminates the bottom padding entirely, dropping the struct size from 88 to 80 bytes. On a 32-bit system, there is no benefit, but nor should there be any harm (we only need 4-byte alignment there, so we were already using only 9 bits of padding). Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 428d52a commit b38f70a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diffcore.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ struct diff_filespec {
4545
#define DIRTY_SUBMODULE_MODIFIED 2
4646
unsigned is_stdin : 1;
4747
unsigned has_more_entries : 1; /* only appear in combined diff */
48-
struct userdiff_driver *driver;
4948
/* data should be considered "binary"; -1 means "don't know yet" */
5049
int is_binary;
50+
struct userdiff_driver *driver;
5151
};
5252

5353
extern struct diff_filespec *alloc_filespec(const char *);

0 commit comments

Comments
 (0)