summaryrefslogtreecommitdiff
path: root/libitm/libitm_i.h
diff options
context:
space:
mode:
authortorvald <torvald@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-22 20:56:20 +0000
committertorvald <torvald@138bc75d-0d04-0410-961f-82ee72b054a4>2015-11-22 20:56:20 +0000
commitf7e68284b737222c5f34cd4aa40f31c4bd0f1263 (patch)
treedbf9990236cbe2cf507d8aa797ca2aaede516f99 /libitm/libitm_i.h
parent415293ccb62afe6441a9568b020636cf1a803464 (diff)
libitm: Fix recent changes to allocations log.
libitm/ * libitm_i.h (gtm_alloc_action): Remove union. * testsuite/libitm.c/alloc-1.c: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230727 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libitm/libitm_i.h')
-rw-r--r--libitm/libitm_i.h10
1 files changed, 4 insertions, 6 deletions
diff --git a/libitm/libitm_i.h b/libitm/libitm_i.h
index f01a1ab54e40..4b72348da590 100644
--- a/libitm/libitm_i.h
+++ b/libitm/libitm_i.h
@@ -106,12 +106,10 @@ namespace GTM HIDDEN {
// the template used inside gtm_thread can instantiate.
struct gtm_alloc_action
{
- // Iff free_fn_sz is nonzero, it must be used instead of free_fn.
- union
- {
- void (*free_fn)(void *);
- void (*free_fn_sz)(void *, size_t);
- };
+ // Iff free_fn_sz is nonzero, it must be used instead of free_fn, and vice
+ // versa.
+ void (*free_fn)(void *);
+ void (*free_fn_sz)(void *, size_t);
size_t sz;
// If true, this is an allocation; we discard the log entry on outermost
// commit, and deallocate on abort. If false, this is a deallocation and