Changeset dbae916 for tests

Timestamp:

Mar 14, 2023, 4:21:05 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

1afd9ccb, 360bfe41, 6e6989c

Parents:

5217569 (diff), c19ca4b (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

Location:

tests

Files:

• io/comp_fair.cfa (modified) (1 diff)
• linking/mangling/.expect/anon.txt (added)
• linking/mangling/header.hfa (modified) (1 diff)
• linking/mangling/lib.cfa (modified) (1 diff)
• linking/mangling/main.cfa (modified) (2 diffs)

tests/io/comp_fair.cfa

@@ -29 +29 @@
         barrier & bar;
         int pipe[2];
-
 } globals;
 

tests/linking/mangling/header.hfa

@@ -8 +8 @@
 extern name_but_a_typedefed_t a_typedefed_global;
 
-extern struct /* anonymous */ {
-        int some_int;
-        int some_other_int;
-} a_global_with_no_type;
+// Must be extern C to prevent name mangling.
+extern "C" {
+        extern struct /* anonymous */ {
+                int some_int;
+                int some_other_int;
+        } a_global_with_no_type;
+}

tests/linking/mangling/lib.cfa

@@ -3 +3 @@
 name_but_a_typedefed_t a_typedefed_global;
 
-struct {
-        int some_int;
-        int some_other_int;
-} a_global_with_no_type;
+// Must be extern C to prevent name mangling.
+extern "C" {
+        // This declaration is necessary to create an instance of a_global_with_no_type.
+        // typeof is a trick to get a_global_with_no_type's type because its type is anonymous.
+        // Otherwise C generates conflicting types for a_global_with_no_type in .h and .c
+        // because C uses name equivalence and the two anonymous types cannot have the same name.
+        typeof(a_global_with_no_type) a_global_with_no_type;
+}

tests/linking/mangling/main.cfa

@@ -1 +1 @@
 #include <fstream.hfa>
 
-struct { int a; } test; //purposefully before the include
+static struct { int a; } test; // purposefully before the include to force anonymous name numbering
 
 #include "header.hfa"
@@ -13 +13 @@
 
         sout | "Done!";
-
-        return 0;
 }