Changeset ecfd758 for tests/exceptions/virtual-cast.cfa

Timestamp:

Apr 9, 2021, 2:11:43 PM (10 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

arm-eh, jacob/cs343-translation, master, new-ast-unique-expr

Children:

b91bfde

Parents:

e07b589

Message:

Major exception update, seperating type-ids from virtual tables. The major interface changes are done. There is a regression of ?Cancelled(T) to Some?Cancelled. There is some bits of code for the new verion of the ?Cancelled(T) interface already there. Not connected yet but I just reached the limit of what I wanted to do in one commit and then spent over a day cleaning up, so it will replace Some?Cancelled in a future commit.

File:

• tests/exceptions/virtual-cast.cfa (modified) (4 diffs)

tests/exceptions/virtual-cast.cfa

@@ -12 +12 @@
 #include <assert.h>
 
+
+
+// Hand defined alpha virtual type:
+struct __cfatid_struct_alpha {
+        __cfa__parent_vtable const * parent;
+};
+
+__attribute__(( section(".gnu.linkonce.__cfatid_alpha") ))
+struct __cfatid_struct_alpha __cfatid_alpha = {
+        (__cfa__parent_vtable *)0,
+};
+
 struct alpha_vtable {
-        alpha_vtable const * const parent;
+        struct __cfatid_struct_alpha const * const __cfavir_typeid;
         char (*code)(void);
 };
@@ -27 +39 @@
 
 
+// Hand defined beta virtual type:
+struct __cfatid_struct_beta {
+        __cfatid_struct_alpha const * parent;
+};
+
+__attribute__(( section(".gnu.linkonce.__cfatid_beta") ))
+struct __cfatid_struct_beta __cfatid_beta = {
+        &__cfatid_alpha,
+};
+
 struct beta_vtable {
-        alpha_vtable const * const parent;
+        struct __cfatid_struct_beta const * const __cfavir_typeid;
         char (*code)(void);
 };
@@ -42 +64 @@
 
 
+// Hand defined gamma virtual type:
+struct __cfatid_struct_gamma {
+        __cfatid_struct_beta const * parent;
+};
+
+__attribute__(( section(".gnu.linkonce.__cfatid_gamma") ))
+struct __cfatid_struct_gamma __cfatid_gamma = {
+        &__cfatid_beta,
+};
+
 struct gamma_vtable {
-        beta_vtable const * const parent;
+        struct __cfatid_struct_gamma const * const __cfavir_typeid;
         char (*code)(void);
 };
@@ -57 +89 @@
 
 extern "C" {
-        alpha_vtable _alpha_vtable_instance = { 0, ret_a };
-        beta_vtable _beta_vtable_instance = { &_alpha_vtable_instance, ret_b };
-        gamma_vtable _gamma_vtable_instance = { &_beta_vtable_instance, ret_g };
+        alpha_vtable _alpha_vtable_instance = { &__cfatid_alpha, ret_a };
+        beta_vtable _beta_vtable_instance = { &__cfatid_beta, ret_b };
+        gamma_vtable _gamma_vtable_instance = { &__cfatid_gamma, ret_g };
 }