tests/type_confusion: make Dav1dContext opaque (like it is in dav1d)

Author: kkysen

tests/type_confusion/dav1d.c

@@ -8,6 +8,12 @@ RUN: cat dav1d_call_gates_1.ld | FileCheck --check-prefix=LINKARGS %s
 #define IA2_COMPARTMENT 2
 #include <ia2_compartment_init.inc>
 
+struct Dav1dContext {
+  int field;
+};
+
+const size_t DAV1D_CONTEXT_SIZE = sizeof(Dav1dContext);
+
 /// Allocate memory in dav1d's compartment 2.
 void* dav1d_alloc(const size_t size) {
   return malloc(size);

tests/type_confusion/include/dav1d.h

@@ -2,9 +2,9 @@
 
 #include <stddef.h>
 
-typedef struct {
-  int field;
-} Dav1dContext;
+typedef struct Dav1dContext Dav1dContext;
+
+extern const size_t DAV1D_CONTEXT_SIZE;
 
 typedef struct Dav1dSettings {
   int field;

tests/type_confusion/main.c

@@ -15,7 +15,8 @@ INIT_RUNTIME(2);
 #include <ia2_compartment_init.inc>
 
 Test(type_confusion, normal) {
-  Dav1dContext *c = dav1d_alloc(sizeof(Dav1dContext));
+  // `Dav1dContext` is opaque.
+  Dav1dContext *c = dav1d_alloc(DAV1D_CONTEXT_SIZE);
   Dav1dSettings *settings = dav1d_alloc(sizeof(Dav1dSettings));
   Dav1dPicture *pic = dav1d_alloc(sizeof(Dav1dPicture));
 
@@ -29,8 +30,8 @@ Test(type_confusion, normal) {
 }
 
 Test(type_confusion, uninitialized, .signal = SIGABRT) {
-  Dav1dContext *c = dav1d_alloc(sizeof(Dav1dContext));
-  Dav1dContext *c2 = dav1d_alloc(sizeof(Dav1dContext));
+  Dav1dContext *c = dav1d_alloc(DAV1D_CONTEXT_SIZE);
+  Dav1dContext *c2 = dav1d_alloc(DAV1D_CONTEXT_SIZE);
   Dav1dSettings *settings = dav1d_alloc(sizeof(Dav1dSettings));
   Dav1dPicture *pic = dav1d_alloc(sizeof(Dav1dPicture));
 
@@ -46,7 +47,7 @@ Test(type_confusion, uninitialized, .signal = SIGABRT) {
 }
 
 Test(type_confusion, wrong_type, .signal = SIGABRT) {
-  Dav1dContext *c = dav1d_alloc(sizeof(Dav1dContext));
+  Dav1dContext *c = dav1d_alloc(DAV1D_CONTEXT_SIZE);
   Dav1dSettings *settings = dav1d_alloc(sizeof(Dav1dSettings));
   Dav1dPicture *pic = dav1d_alloc(sizeof(Dav1dPicture));
 
@@ -61,7 +62,7 @@ Test(type_confusion, wrong_type, .signal = SIGABRT) {
 }
 
 Test(type_confusion, null, .signal = SIGABRT) {
-  Dav1dContext *c = dav1d_alloc(sizeof(Dav1dContext));
+  Dav1dContext *c = dav1d_alloc(DAV1D_CONTEXT_SIZE);
   Dav1dSettings *settings = dav1d_alloc(sizeof(Dav1dSettings));
   Dav1dPicture *pic = dav1d_alloc(sizeof(Dav1dPicture));
 
@@ -76,7 +77,7 @@ Test(type_confusion, null, .signal = SIGABRT) {
 }
 
 Test(type_confusion, use_after_free, .signal = SIGABRT) {
-  Dav1dContext *c = dav1d_alloc(sizeof(Dav1dContext));
+  Dav1dContext *c = dav1d_alloc(DAV1D_CONTEXT_SIZE);
   Dav1dSettings *settings = dav1d_alloc(sizeof(Dav1dSettings));
   Dav1dPicture *pic = dav1d_alloc(sizeof(Dav1dPicture));