aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorvald Riegel <triegel@redhat.com>2015-11-22 20:56:20 +0000
committerTorvald Riegel <torvald@gcc.gnu.org>2015-11-22 20:56:20 +0000
commit4f8a3b87f948d472c2aeb1bc9177892c8fc6f113 (patch)
treedbf9990236cbe2cf507d8aa797ca2aaede516f99
parent9b22c1b69ad455177317dd945a5f0d0c5e43d58c (diff)
downloadgcc-4f8a3b87f948d472c2aeb1bc9177892c8fc6f113.zip
gcc-4f8a3b87f948d472c2aeb1bc9177892c8fc6f113.tar.gz
gcc-4f8a3b87f948d472c2aeb1bc9177892c8fc6f113.tar.bz2
libitm: Fix recent changes to allocations log.
libitm/ * libitm_i.h (gtm_alloc_action): Remove union. * testsuite/libitm.c/alloc-1.c: New. From-SVN: r230727
-rw-r--r--libitm/ChangeLog5
-rw-r--r--libitm/libitm_i.h10
-rw-r--r--libitm/testsuite/libitm.c/alloc-1.c17
3 files changed, 26 insertions, 6 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 4be0561..a986e67 100644
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-22 Torvald Riegel <triegel@redhat.com>
+
+ * libitm_i.h (gtm_alloc_action): Remove union.
+ * testsuite/libitm.c/alloc-1.c: New.
+
2015-11-19 Torvald Riegel <triegel@redhat.com>
* testsuite/libitm.c++/eh-5.C: New.
diff --git a/libitm/libitm_i.h b/libitm/libitm_i.h
index f01a1ab..4b72348 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
diff --git a/libitm/testsuite/libitm.c/alloc-1.c b/libitm/testsuite/libitm.c/alloc-1.c
new file mode 100644
index 0000000..49faab5
--- /dev/null
+++ b/libitm/testsuite/libitm.c/alloc-1.c
@@ -0,0 +1,17 @@
+// Test that rolling back allocations works.
+#include <stdlib.h>
+
+void __attribute((transaction_pure,noinline)) dont_optimize(void* p)
+{
+ *(volatile char *) p;
+}
+
+int main()
+{
+ __transaction_atomic {
+ void *p = malloc (23);
+ dont_optimize (p);
+ __transaction_cancel;
+ }
+ return 0;
+}