From 3794a32d89632db9b033da433bdaa8f6d83d36e4 Mon Sep 17 00:00:00 2001
From: Daniele Cocca <daniele.cocca@gmail.com>
Date: Wed, 17 Nov 2021 23:36:21 +0000
Subject: [PATCH 1/2] childType: add optional_single_{mut,const}_pointer

---
 src/type.zig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/type.zig b/src/type.zig
index 728ba8ef5f..9bd4e42b0d 100644
--- a/src/type.zig
+++ b/src/type.zig
@@ -2485,6 +2485,8 @@ pub const Type = extern union {
             .vector => ty.castTag(.vector).?.data.elem_type,
             .array => ty.castTag(.array).?.data.elem_type,
             .array_sentinel => ty.castTag(.array_sentinel).?.data.elem_type,
+            .optional_single_mut_pointer,
+            .optional_single_const_pointer,
             .single_const_pointer,
             .single_mut_pointer,
             .many_const_pointer,

From b3f4abbc5a5f0cb0a1b4cf8257f2402854292ed1 Mon Sep 17 00:00:00 2001
From: Daniele Cocca <daniele.cocca@gmail.com>
Date: Wed, 17 Nov 2021 23:43:19 +0000
Subject: [PATCH 2/2] CBE: mark align.zig and error.zig as passing

Newly passing as of 3794a32d89632db9b033da433bdaa8f6d83d36e4.
---
 test/behavior.zig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/behavior.zig b/test/behavior.zig
index bb155a7de4..1436e0c7b7 100644
--- a/test/behavior.zig
+++ b/test/behavior.zig
@@ -2,6 +2,7 @@ const builtin = @import("builtin");
 
 test {
     // Tests that pass for stage1, stage2, and the C backend.
+    _ = @import("behavior/align.zig");
     _ = @import("behavior/basic.zig");
     _ = @import("behavior/bitcast.zig");
     _ = @import("behavior/bool.zig");
@@ -22,6 +23,7 @@ test {
     _ = @import("behavior/cast.zig");
     _ = @import("behavior/defer.zig");
     _ = @import("behavior/enum.zig");
+    _ = @import("behavior/error.zig");
     _ = @import("behavior/hasdecl.zig");
     _ = @import("behavior/hasfield.zig");
     _ = @import("behavior/if.zig");
@@ -42,7 +44,6 @@ test {
 
     if (builtin.object_format != .c) {
         // Tests that pass for stage1 and stage2 but not the C backend.
-        _ = @import("behavior/align.zig");
         _ = @import("behavior/array.zig");
         _ = @import("behavior/atomics.zig");
         _ = @import("behavior/basic_llvm.zig");
@@ -53,7 +54,6 @@ test {
         _ = @import("behavior/bugs/2006.zig");
         _ = @import("behavior/bugs/3112.zig");
         _ = @import("behavior/cast_llvm.zig");
-        _ = @import("behavior/error.zig");
         _ = @import("behavior/eval.zig");
         _ = @import("behavior/floatop.zig");
         _ = @import("behavior/fn.zig");