Updated to luajit-build 1.5.4, Zig 0.15.0-dev.565+8e72a2528

Author: thsackos

README.md

@@ -23,7 +23,7 @@ checks in `Debug` and `ReleaseSafe` builds and provides full test coverage of th
 
 ## Zig Version
 
-The `main` branch targets recent builds of Zig's `master` branch (last tested with Zig `0.14.0`).
+The `main` branch targets recent builds of Zig's `master` branch (last tested with Zig `0.15.0-dev.565+8e72a2528`).
 
 ## Installation & Usage
 

build.zig.zon

@@ -1,11 +1,11 @@
 .{
     .name = .luajit,
     .fingerprint = 0xda4bba66d285c19c,
-    .version = "1.5.3",
+    .version = "1.5.4",
     .dependencies = .{
         .luajit_build = .{
-            .url = "git+https://github.com/sackosoft/zig-luajit-build#8bb843189b32ada74741c51b7f88c32f45f5f7f2",
-            .hash = "luajit_build-1.1.3-HFjoU2o7AABpwlsfVuxG9YbpjRYmD4LwVa2WPCod3YKC",
+            .url = "git+https://github.com/sackosoft/zig-luajit-build#d75c20acaa4df39f51187926fa9d98e4e5231064",
+            .hash = "luajit_build-1.1.4-HFjoU14-AACEEcPwP8nRnDSLS3EByuR8u5ZWAXBq08PH",
         },
     },
     .paths = .{

examples/example-01_run-lua/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/example-02_variables/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/example-03_lua-functions/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/example-04_zig-functions/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/example-05_userdata/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/example-06_lua-tables/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1,2 @@
-0.14.0
+0.15.0-dev.565+8e72a2528
+

examples/simple-repl/LAST_TESTED_WITH_ZIG_VERSION.txt

@@ -1 +1 @@
-0.14.0
+0.15.0-dev.565+8e72a2528

src/allocator_adapter.zig

@@ -3,7 +3,8 @@
 
 const std = @import("std");
 
-const max = @alignOf(std.c.max_align_t);
+const max_alignment: std.mem.Alignment = std.mem.Alignment.of(std.c.max_align_t);
+const max_alignment_bytes: usize = std.mem.Alignment.toByteUnits(max_alignment);
 
 pub const AllocationUserdata = struct {
     alloc: std.mem.Allocator,
@@ -14,7 +15,7 @@ pub const AllocFn = fn (
     ptr: ?*anyopaque,
     osize: usize,
     nsize: usize,
-) callconv(.C) ?*align(max) anyopaque;
+) callconv(.C) ?*align(max_alignment_bytes) anyopaque;
 
 /// Memory allocation function used by Lua instances. This functino acts as an adaptor from the C API to the
 /// idiomatic Zig `std.mem.Allocator` type. The implementation provides functionality similar to realloc.
@@ -36,12 +37,12 @@ pub const AllocFn = fn (
 ///
 /// From: `void * (*lua_Alloc) (void *ud, void *ptr, size_t osize, size_t nsize);`
 /// Refer to: https://www.lua.org/manual/5.1/manual.html#lua_Alloc
-pub fn alloc(ud: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*align(max) anyopaque {
+pub fn alloc(ud: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) callconv(.C) ?*align(max_alignment_bytes) anyopaque {
     std.debug.assert(ud != null);
 
     const user_data: *AllocationUserdata = @ptrCast(@alignCast(ud.?));
     const allocator: std.mem.Allocator = user_data.alloc;
-    const aligned_ptr = @as(?[*]align(max) u8, @ptrCast(@alignCast(ptr)));
+    const aligned_ptr = @as(?[*]align(max_alignment_bytes) u8, @ptrCast(@alignCast(ptr)));
     if (aligned_ptr) |p| {
         if (nsize != 0) {
             const old_mem = p[0..osize];
@@ -52,6 +53,6 @@ pub fn alloc(ud: ?*anyopaque, ptr: ?*anyopaque, osize: usize, nsize: usize) call
         return null;
     } else {
         // Malloc case
-        return (allocator.alignedAlloc(u8, max, nsize) catch return null).ptr;
+        return (allocator.alignedAlloc(u8, max_alignment, nsize) catch return null).ptr;
     }
 }