Changeset aa90b2c

Timestamp:

Oct 11, 2020, 10:29:32 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

8fd0ce3

Parents:

30cf6b0 (diff), 2494720 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc into master

Files:

• libcfa/src/concurrency/io.cfa (modified) (1 diff)
• tests/errors/.expect/completeType.x64.txt (modified) (1 diff)
• tests/errors/.expect/completeType.x86.txt (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -134 +134 @@
                 int ret = 0;
                 if( need_sys_to_submit || need_sys_to_complete ) {
-                        ret = syscall( __NR_io_uring_enter, ring.fd, to_submit, 0, flags, 0p, _NSIG / 8);
+                        ret = syscall( __NR_io_uring_enter, ring.fd, to_submit, 0, flags, (sigset_t *)0p, _NSIG / 8);
                         if( ret < 0 ) {
                                 switch((int)errno) {

tests/errors/.expect/completeType.x64.txt

@@ -132 +132 @@
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _109_0_T (not function type)
-          instance of type _109_0_T (not function type)
+          reference to instance of type _110_0_T (not function type)
+          instance of type _110_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _109_0_T (not function type)
+          _retval__operator_assign: instance of type _110_0_T (not function type)
           ... with attributes:
             Attribute with name: unused

tests/errors/.expect/completeType.x86.txt

@@ -132 +132 @@
 ?=?: pointer to function
         ... with parameters
-          reference to instance of type _108_0_T (not function type)
-          instance of type _108_0_T (not function type)
+          reference to instance of type _109_0_T (not function type)
+          instance of type _109_0_T (not function type)
         ... returning
-          _retval__operator_assign: instance of type _108_0_T (not function type)
+          _retval__operator_assign: instance of type _109_0_T (not function type)
           ... with attributes:
             Attribute with name: unused