Changes in tests/exceptions/virtual-poly.cfa [ecfd758:fd54fef]

File:

• tests/exceptions/virtual-poly.cfa (modified) (7 diffs)

tests/exceptions/virtual-poly.cfa

@@ -8 +8 @@
 #include <assert.h>
 
-
-struct __cfatid_struct_mono_base {
-    __cfa__parent_vtable const * parent;
-};
-
-__attribute__(( section(".gnu.linkonce.__cfatid_mono_base") ))
-struct __cfatid_struct_mono_base __cfatid_mono_base = {
-    (__cfa__parent_vtable *)0,
-};
-
 struct mono_base_vtable {
-        __cfatid_struct_mono_base const * const __cfavir_typeid;
+        mono_base_vtable const * const parent;
 };
 
@@ -27 +17 @@
 
 forall(T)
-struct __cfatid_struct_mono_child {
-    __cfatid_struct_mono_base const * parent;
-};
-
-forall(T)
 struct mono_child_vtable {
-        __cfatid_struct_mono_child(T) const * const __cfavir_typeid;
+        mono_base_vtable const * const parent;
 };
 
@@ -41 +26 @@
 };
 
-__cfatid_struct_mono_child(int) __cfatid_mono_child @= {
-        &__cfatid_mono_base,
-};
-
+mono_base_vtable _mono_base_vtable_instance @= { 0 };
 mono_child_vtable(int) _mono_child_vtable_instance @= {
-        &__cfatid_mono_child,
+        &_mono_base_vtable_instance
 };
 
@@ -55 +37 @@
 }
 
-
-forall(U)
-struct __cfatid_struct_poly_base {
-    __cfa__parent_vtable const * parent;
-};
-
 forall(U)
 struct poly_base_vtable {
-        __cfatid_struct_poly_base(U) const * const __cfavir_typeid;
+        poly_base_vtable(U) const * const parent;
 };
 
@@ -72 +48 @@
 
 forall(V)
-struct __cfatid_struct_poly_child {
-    __cfatid_struct_poly_base(V) const * parent;
-};
-
-forall(V)
 struct poly_child_vtable {
-        __cfatid_struct_poly_child(V) const * const __cfavir_typeid;
+        poly_base_vtable(V) const * const parent;
 };
 
@@ -86 +57 @@
 };
 
-__cfatid_struct_poly_base(int) __cfatid_poly_base @= {
-        (__cfa__parent_vtable *)0,
+poly_base_vtable(int) _poly_base_vtable_instance @= { 0 };
+poly_child_vtable(int) _poly_child_vtable_instance @= {
+        &_poly_base_vtable_instance
 };
-__cfatid_struct_poly_child(int) __cfatid_poly_child = {
-    &__cfatid_poly_base,
+/* Resolver bug keeps me from adding these.
+poly_base_vtable(char) _poly_base_vtable_instance @= { 0 };
+poly_child_vtable(char) _poly_child_vtable_instance @= {
+        &_poly_base_vtable_instance
 };
-poly_child_vtable(int) _poly_child_vtable_instance @= {
-        &__cfatid_poly_child,
-};
+*/
 
 void poly_poly_test() {
@@ -105 +77 @@
         mono_poly_test();
         poly_poly_test();
-        printf( "done\n" );
+        printf( "done\n" );                             // non-empty .expect file
 }