Sema: fix merge conflict regarding identifiers matching primitives

2023-01-09 14:51:03 -07:00
parent aa7e65d5ba
commit fb7ca1ad48
1 changed files with 2 additions and 2 deletions
--- a/src/Sema.zig
+++ b/src/Sema.zig
@@ -29337,8 +29337,8 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
        .anyerror,
        .noreturn,
        .@"anyframe",
-        .null,
-        .undefined,
+        .@"null",
+        .@"undefined",
        .atomic_order,
        .atomic_rmw_op,
        .calling_convention,