Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
109 changes: 87 additions & 22 deletions src/Sema.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -38581,7 +38581,7 @@ pub fn resolveNavPtrModifiers(
};
}

pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
pub fn analyzeMemoizedState(sema: *Sema, block: *Block, simple_src: LazySrcLoc, builtin_namespace: InternPool.NamespaceIndex, stage: InternPool.MemoizedStateStage) CompileError!bool {
const pt = sema.pt;
const zcu = pt.zcu;
const ip = &zcu.intern_pool;
Expand All@@ -38596,38 +38596,47 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin
.nested => |nested| access: {
const parent_ty: Type = .fromInterned(zcu.builtin_decl_values.get(nested[0]));
const parent_ns = parent_ty.getNamespace(zcu).unwrap() orelse {
return sema.fail(block, src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
return sema.fail(block, simple_src, "std.builtin.{s} is not a container type", .{@tagName(nested[0])});
};
break :access .{ parent_ns, "std.builtin." ++ @tagName(nested[0]), nested[1] };
},
};

const name_nts = try ip.getOrPutString(gpa, pt.tid, name, .no_embedded_nulls);
const result = try sema.namespaceLookupVal(block, src, parent_ns, name_nts) orelse
return sema.fail(block, src, "{s} missing {s}", .{ parent_name, name });
const nav = try sema.namespaceLookup(block, simple_src, parent_ns, name_nts) orelse
return sema.fail(block, simple_src, "{s} missing {s}", .{ parent_name, name });

const val = try sema.resolveConstDefinedValue(block, src, result, null);
const src: LazySrcLoc = .{
.base_node_inst = ip.getNav(nav).srcInst(ip),
.offset = .nodeOffset(0),
};

switch (builtin_decl.kind()) {
.type => if (val.typeOf(zcu).zigTypeTag(zcu) != .type) {
const result = try sema.analyzeNavVal(block, src, nav);

const uncoerced_val = try sema.resolveConstDefinedValue(block, src, result, null);
const maybe_lazy_val: Value = switch (builtin_decl.kind()) {
.type => if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .type) {
return sema.fail(block, src, "{s}.{s} is not a type", .{ parent_name, name });
} else {
try val.toType().resolveFully(pt);
} else val: {
try uncoerced_val.toType().resolveFully(pt);
break :val uncoerced_val;
},
.func => if (val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
},
.string => {
const ty = val.typeOf(zcu);
if (!ty.isSinglePointer(zcu) or
!ty.isConstPtr(zcu) or
ty.childType(zcu).zigTypeTag(zcu) != .array or
ty.childType(zcu).childType(zcu).toIntern() != .u8_type)
{
return sema.fail(block, src, "{s}.{s} is not a valid string", .{ parent_name, name });
.func => val: {
if (try sema.getExpectedBuiltinFnType(src, builtin_decl)) |func_ty| {
const coerced = try sema.coerce(block, func_ty, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
}
if (uncoerced_val.typeOf(zcu).zigTypeTag(zcu) != .@"fn") {
return sema.fail(block, src, "{s}.{s} is not a function", .{ parent_name, name });
}
break :val uncoerced_val;
},
}
.string => val: {
const coerced = try sema.coerce(block, .slice_const_u8, Air.internedToRef(uncoerced_val.toIntern()), src);
break :val .fromInterned(coerced.toInterned().?);
},
};
const val = try sema.resolveLazyValue(maybe_lazy_val);

const prev = zcu.builtin_decl_values.get(builtin_decl);
if (val.toIntern() != prev) {
Expand All@@ -38639,7 +38648,7 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

if (stage == .panic) {
// We use `getBuiltinType` because this is from an earlier stage.
const stack_trace_ty = try sema.getBuiltinType(src, .StackTrace);
const stack_trace_ty = try sema.getBuiltinType(simple_src, .StackTrace);
const ptr_stack_trace_ty = try pt.singleMutPtrType(stack_trace_ty);
const opt_ptr_stack_trace_ty = try pt.optionalType(ptr_stack_trace_ty.toIntern());
const null_stack_trace = try pt.intern(.{ .opt = .{
Expand All@@ -38654,3 +38663,59 @@ pub fn analyzeMemoizedState(sema: *Sema, block: *Block, src: LazySrcLoc, builtin

return any_changed;
}

/// Given that `decl.kind() == .func`, get the type expected of the function if necessary.
/// If this will be type checked by `Sema` anyway, this function may return `null`. In
/// particular, generic functions should return `null`, as `Sema` will necessarily check
/// them at instantiation time. Returning non-null is necessary only when backends can emit
/// calls to the function, as is the case with the panic handler.
fn getExpectedBuiltinFnType(sema: *Sema, src: LazySrcLoc, decl: Zcu.BuiltinDecl) CompileError!?Type {
const pt = sema.pt;
return switch (decl) {
// `fn ([]const u8, ?*StackTrace, ?usize) noreturn`
.@"Panic.call" => try pt.funcType(.{
.param_types = &.{
.slice_const_u8_type,
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
(try pt.optionalType(.usize_type)).toIntern(),
},
.return_type = .noreturn_type,
}),

// `fn (?*StackTrace, anyerror) noreturn`
.@"Panic.unwrapError" => try pt.funcType(.{
.param_types = &.{
(try pt.optionalType(
(try pt.singleMutPtrType(
try sema.getBuiltinType(src, .StackTrace),
)).toIntern(),
)).toIntern(),
.anyerror_type,
},
.return_type = .noreturn_type,
}),

// `fn (usize, usize) noreturn`
.@"Panic.outOfBounds",
.@"Panic.startGreaterThanEnd",
=> try pt.funcType(.{
.param_types = &.{ .usize_type, .usize_type },
.return_type = .noreturn_type,
}),

// Generic functions, so calls are necessarily validated by Sema
.@"Panic.sentinelMismatch",
.@"Panic.inactiveUnionField",
=> null,

// Other functions called exclusively by Sema
.returnError,
=> null,

else => unreachable,
};
}
10 changes: 6 additions & 4 deletions src/codegen/llvm.zig
Original file line numberDiff line numberDiff line change
Expand Up@@ -5754,10 +5754,12 @@ pub const FuncGen = struct {
const o = fg.ng.object;
const zcu = o.pt.zcu;
const ip = &zcu.intern_pool;
const panic_msg_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(panic_msg_val != .none);
const msg_len = Value.fromInterned(panic_msg_val).typeOf(zcu).childType(zcu).arrayLen(zcu);
const msg_ptr = try o.lowerValue(panic_msg_val);
const msg_len: u64, const msg_ptr: Builder.Constant = msg: {
const str_val = zcu.builtin_decl_values.get(panic_id.toBuiltin());
assert(str_val != .none);
const slice = ip.indexToKey(str_val).slice;
break :msg .{ Value.fromInterned(slice.len).toUnsignedInt(zcu), try o.lowerValue(slice.ptr) };
};
const null_opt_addr_global = try fg.resolveNullOptUsize();
const target = zcu.getTarget();
const llvm_usize = try o.lowerType(Type.usize);
Expand Down
28 changes: 28 additions & 0 deletions test/cases/compile_errors/bad_panic_signature.zig
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
pub const Panic = struct {
pub const call = badPanicSignature;
pub const sentinelMismatch = std.debug.FormattedPanic.sentinelMismatch;
pub const unwrapError = std.debug.FormattedPanic.unwrapError;
pub const outOfBounds = std.debug.FormattedPanic.outOfBounds;
pub const startGreaterThanEnd = std.debug.FormattedPanic.startGreaterThanEnd;
pub const inactiveUnionField = std.debug.FormattedPanic.inactiveUnionField;
pub const messages = std.debug.FormattedPanic.messages;
};

fn badPanicSignature(msg: []const u8, bad1: usize, bad2: void) noreturn {
_ = msg;
_ = bad1;
_ = bad2;
@trap();
}

export fn foo(a: u8) void {
@setRuntimeSafety(true);
_ = a + 1; // safety check to reference the panic handler
}

const std = @import("std");

// error
//
// :2:9: error: expected type 'fn ([]const u8, ?*builtin.StackTrace, ?usize) noreturn', found 'fn ([]const u8, usize, void) noreturn'
// :2:9: note: parameter 1 'usize' cannot cast into '?*builtin.StackTrace'