| author |  Matthew Lugg <mlugg@mlugg.co.uk> 2024-10-07 07:33:46+01:00 |
| committer | Matthew Lugg <mlugg@mlugg.co.uk> 2024-10-07 07:42:17+01:00 |
| log | 95857d6b2180c1bc1009a0ebb173ba66d44c34f7 |
| tree | 70cf160373d67ad8ed5d46af78d91f5bc6bb5aaf |
| parent | 36243567e610808834147218fa791cbaab535941 |
| signature |  Commit is signed but in an unrecognized format. |
Sema: add missing runtime value validation to global mutable variables
Resolves: #203652 files changed, 13 insertions(+), 1 deletions(-)
src- test
- cases
- compile_errors
src/Sema.zig+6-1
| ... | @@ -2274,15 +2274,20 @@ pub fn resolveFinalDeclValue( | ... | @@ -2274,15 +2274,20 @@ pub fn resolveFinalDeclValue( |
| 2274 | src: LazySrcLoc, | 2274 | src: LazySrcLoc, |
| 2275 | air_ref: Air.Inst.Ref, | 2275 | air_ref: Air.Inst.Ref, |
| 2276 | ) CompileError!Value { | 2276 | ) CompileError!Value { |
| 2277 | const zcu = sema.pt.zcu; | ||
| 2278 | |||
| 2277 | const val = try sema.resolveValueAllowVariables(air_ref) orelse { | 2279 | const val = try sema.resolveValueAllowVariables(air_ref) orelse { |
| 2278 | return sema.failWithNeededComptime(block, src, .{ | 2280 | return sema.failWithNeededComptime(block, src, .{ |
| 2279 | .needed_comptime_reason = "global variable initializer must be comptime-known", | 2281 | .needed_comptime_reason = "global variable initializer must be comptime-known", |
| 2280 | }); | 2282 | }); |
| 2281 | }; | 2283 | }; |
| 2282 | if (val.isGenericPoison()) return error.GenericPoison; | 2284 | if (val.isGenericPoison()) return error.GenericPoison; |
| 2283 | if (val.canMutateComptimeVarState(sema.pt.zcu)) { | 2285 | |
| 2286 | const init_val: Value = if (val.getVariable(zcu)) |v| .fromInterned(v.init) else val; | ||
| 2287 | if (init_val.canMutateComptimeVarState(zcu)) { | ||
| 2284 | return sema.fail(block, src, "global variable contains reference to comptime var", .{}); | 2288 | return sema.fail(block, src, "global variable contains reference to comptime var", .{}); |
| 2285 | } | 2289 | } |
| 2290 | |||
| 2286 | return val; | 2291 | return val; |
| 2287 | } | 2292 | } |
| 2288 | 2293 |
test/cases/compile_errors/comptime_var_referenced_by_decl.zig+7
| ... | @@ -38,6 +38,12 @@ export const g: *const *const u32 = g: { | ... | @@ -38,6 +38,12 @@ export const g: *const *const u32 = g: { |
| 38 | break :g &aggregate[0]; | 38 | break :g &aggregate[0]; |
| 39 | }; | 39 | }; |
| 40 | 40 | ||
| 41 | // Mutable globals should have the same restrictions as const globals. | ||
| 42 | export var h: *[1]u32 = h: { | ||
| 43 | var x: [1]u32 = .{123}; | ||
| 44 | break :h &x; | ||
| 45 | }; | ||
| 46 | |||
| 41 | // error | 47 | // error |
| 42 | // | 48 | // |
| 43 | // :1:27: error: global variable contains reference to comptime var | 49 | // :1:27: error: global variable contains reference to comptime var |
| ... | @@ -47,3 +53,4 @@ export const g: *const *const u32 = g: { | ... | @@ -47,3 +53,4 @@ export const g: *const *const u32 = g: { |
| 47 | // :22:24: error: global variable contains reference to comptime var | 53 | // :22:24: error: global variable contains reference to comptime var |
| 48 | // :28:33: error: global variable contains reference to comptime var | 54 | // :28:33: error: global variable contains reference to comptime var |
| 49 | // :34:40: error: global variable contains reference to comptime var | 55 | // :34:40: error: global variable contains reference to comptime var |
| 56 | // :42:28: error: global variable contains reference to comptime var |