Merge remote-tracking branch 'origin/master' into llvm16

1 files changed, 16 insertions, 8 deletions

diff --git a/src/BuiltinFn.zig b/src/BuiltinFn.zig
index 80eb739185..20edbabe47 100644
--- a/src/BuiltinFn.zig
+++ b/src/BuiltinFn.zig
@@ -28,6 +28,7 @@ pub const Tag = enum {
     cmpxchg_weak,
     compile_error,
     compile_log,
+    const_cast,
     ctz,
     c_undef,
     c_va_arg,
@@ -75,7 +76,6 @@ pub const Tag = enum {
     prefetch,
     ptr_cast,
     ptr_to_int,
-    qual_cast,
     rem,
     return_address,
     select,
@@ -116,6 +116,7 @@ pub const Tag = enum {
     TypeOf,
     union_init,
     Vector,
+    volatile_cast,
 };
 
 pub const MemLocRequirement = enum {
@@ -346,6 +347,13 @@ pub const list = list: {
             },
         },
         .{
+            "@constCast",
+            .{
+                .tag = .const_cast,
+                .param_count = 1,
+            },
+        },
+        .{
             "@ctz",
             .{
                 .tag = .ctz,
@@ -676,13 +684,6 @@ pub const list = list: {
             },
         },
         .{
-            "@qualCast",
-            .{
-                .tag = .qual_cast,
-                .param_count = 2,
-            },
-        },
-        .{
             "@rem",
             .{
                 .tag = .rem,
@@ -964,5 +965,12 @@ pub const list = list: {
                 .param_count = 2,
             },
         },
+        .{
+            "@volatileCast",
+            .{
+                .tag = .volatile_cast,
+                .param_count = 1,
+            },
+        },
     });
 };