mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 05:44:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

codegen: Use the new frame-pointer fn attributes

Browse source 
no-frame-pointer-elim and no-frame-pointer-elim-non-leaf have been
deprecated for a while in favour of the newer (and clearer)
frame-pointer attribute.

Starting with LLVM10 the old attributes are silently ignored, leading to
no stack traces in debug mode.
This commit is contained in:
LemonBoy 2020-02-07 17:08:21 +01:00
parent 5076f2d4f6
commit 8d6536b50c
2 changed files with 95 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/codegen.cpp
View file

@ -564,8 +564,7 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
add_uwtable_attr(g, llvm_fn); add_uwtable_attr(g, llvm_fn);
addLLVMFnAttr(llvm_fn, "nobuiltin"); addLLVMFnAttr(llvm_fn, "nobuiltin");
if (codegen_have_frame_pointer(g) && fn->fn_inline != FnInlineAlways) { if (codegen_have_frame_pointer(g) && fn->fn_inline != FnInlineAlways) {
ZigLLVMAddFunctionAttr(llvm_fn, "no-frame-pointer-elim", "true"); ZigLLVMAddFunctionAttr(llvm_fn, "frame-pointer", "all");
ZigLLVMAddFunctionAttr(llvm_fn, "no-frame-pointer-elim-non-leaf", nullptr);
} }
if (fn->section_name) { if (fn->section_name) {
LLVMSetSection(llvm_fn, buf_ptr(fn->section_name)); LLVMSetSection(llvm_fn, buf_ptr(fn->section_name));
@ -1128,8 +1127,7 @@ static LLVMValueRef get_add_error_return_trace_addr_fn(CodeGen *g) {
// on any architecture. // on any architecture.
addLLVMArgAttr(fn_val, (unsigned)0, "nonnull"); addLLVMArgAttr(fn_val, (unsigned)0, "nonnull");
if (codegen_have_frame_pointer(g)) { if (codegen_have_frame_pointer(g)) {
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim", "true"); ZigLLVMAddFunctionAttr(fn_val, "frame-pointer", "all");
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim-non-leaf", nullptr);
} }
LLVMBasicBlockRef entry_block = LLVMAppendBasicBlock(fn_val, "Entry"); LLVMBasicBlockRef entry_block = LLVMAppendBasicBlock(fn_val, "Entry");
@ -1206,8 +1204,7 @@ static LLVMValueRef get_return_err_fn(CodeGen *g) {
addLLVMFnAttr(fn_val, "nounwind"); addLLVMFnAttr(fn_val, "nounwind");
add_uwtable_attr(g, fn_val); add_uwtable_attr(g, fn_val);
if (codegen_have_frame_pointer(g)) { if (codegen_have_frame_pointer(g)) {
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim", "true"); ZigLLVMAddFunctionAttr(fn_val, "frame-pointer", "all");
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim-non-leaf", nullptr);
} }
// this is above the ZigLLVMClearCurrentDebugLocation // this is above the ZigLLVMClearCurrentDebugLocation
@ -1290,8 +1287,7 @@ static LLVMValueRef get_safety_crash_err_fn(CodeGen *g) {
addLLVMFnAttr(fn_val, "nounwind"); addLLVMFnAttr(fn_val, "nounwind");
add_uwtable_attr(g, fn_val); add_uwtable_attr(g, fn_val);
if (codegen_have_frame_pointer(g)) { if (codegen_have_frame_pointer(g)) {
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim", "true"); ZigLLVMAddFunctionAttr(fn_val, "frame-pointer", "all");
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim-non-leaf", nullptr);
} }
// Not setting alignment here. See the comment above about // Not setting alignment here. See the comment above about
// "Cannot getTypeInfo() on a type that is unsized!" // "Cannot getTypeInfo() on a type that is unsized!"
@ -4995,8 +4991,7 @@ static LLVMValueRef get_enum_tag_name_function(CodeGen *g, ZigType *enum_type) {
addLLVMFnAttr(fn_val, "nounwind"); addLLVMFnAttr(fn_val, "nounwind");
add_uwtable_attr(g, fn_val); add_uwtable_attr(g, fn_val);
if (codegen_have_frame_pointer(g)) { if (codegen_have_frame_pointer(g)) {
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim", "true"); ZigLLVMAddFunctionAttr(fn_val, "frame-pointer", "all");
ZigLLVMAddFunctionAttr(fn_val, "no-frame-pointer-elim-non-leaf", nullptr);
} }
LLVMBasicBlockRef prev_block = LLVMGetInsertBlock(g->builder); LLVMBasicBlockRef prev_block = LLVMGetInsertBlock(g->builder);

133
test/stack_traces.zig
View file

@ -41,6 +41,21 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ try foo(); \\ try foo();
\\} \\}
; ;
const source_dumpCurrentStackTrace =
\\const std = @import("std");
\\
\\fn bar() void {
\\ std.debug.dumpCurrentStackTrace(@returnAddress());
\\}
\\fn foo() void {
\\ bar();
\\}
\\pub fn main() u8 {
\\ foo();
\\ return 1;
\\}
;
// zig fmt: off // zig fmt: off
switch (builtin.os) { switch (builtin.os) {
.freebsd => { .freebsd => {
@ -49,25 +64,25 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_return, source_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in main (test) \\source.zig:4:5: [address] in main (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in std.start.main (test) \\source.zig:4:5: [address] in std.start.main (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -76,7 +91,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_return, source_try_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in foo (test) \\source.zig:4:5: [address] in foo (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -86,7 +101,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in std.start.main (test) \\source.zig:4:5: [address] in std.start.main (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -96,11 +111,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -109,7 +124,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_try_return_return, source_try_try_return_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in make_error (test) \\source.zig:12:5: [address] in make_error (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -125,7 +140,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in std.start.main (test) \\source.zig:12:5: [address] in std.start.main (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -141,11 +156,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -156,25 +171,25 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_return, source_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in main (test) \\source.zig:4:5: [address] in main (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in std.start.posixCallMainAndExit (test) \\source.zig:4:5: [address] in std.start.posixCallMainAndExit (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -183,7 +198,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_return, source_try_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in foo (test) \\source.zig:4:5: [address] in foo (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -193,7 +208,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in std.start.posixCallMainAndExit (test) \\source.zig:4:5: [address] in std.start.posixCallMainAndExit (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -203,11 +218,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -216,7 +231,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_try_return_return, source_try_try_return_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in make_error (test) \\source.zig:12:5: [address] in make_error (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -232,7 +247,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in std.start.posixCallMainAndExit (test) \\source.zig:12:5: [address] in std.start.posixCallMainAndExit (test)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -248,14 +263,46 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
cases.addCase(
"dumpCurrentStackTrace",
source_dumpCurrentStackTrace,
[_][]const u8{
// debug
\\source.zig:7:8: [address] in foo (test)
\\ bar();
\\ ^
\\source.zig:10:8: [address] in main (test)
\\ foo();
\\ ^
\\start.zig:247:29: [address] in std.start.posixCallMainAndExit (test)
\\ return root.main();
\\ ^
\\start.zig:114:5: [address] in std.start._start (test)
\\ @call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{});
\\ ^
\\
,
// release-safe
\\start.zig:114:5: [address] in std.start._start (test)
\\ @call(.{ .modifier = .never_inline }, posixCallMainAndExit, .{});
\\ ^
\\
,
// release-fast
\\
,
// release-small
\\
},
);
}, },
.macosx => { .macosx => {
cases.addCase( cases.addCase(
@ -263,25 +310,25 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_return, source_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in _main.0 (test.o) \\source.zig:4:5: [address] in _main.0 (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in _main (test.o) \\source.zig:4:5: [address] in _main (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -290,7 +337,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_return, source_try_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in _foo (test.o) \\source.zig:4:5: [address] in _foo (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -300,7 +347,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in _main (test.o) \\source.zig:4:5: [address] in _main (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -310,11 +357,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -323,7 +370,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_try_try_return_return, source_try_try_return_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in _make_error (test.o) \\source.zig:12:5: [address] in _make_error (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -339,7 +386,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-safe // release-safe
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:12:5: [address] in _main (test.o) \\source.zig:12:5: [address] in _main (test.o)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -355,11 +402,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
\\ \\
, ,
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -370,7 +417,7 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
source_return, source_return,
[_][]const u8{ [_][]const u8{
// debug // debug
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\source.zig:4:5: [address] in main (test.obj) \\source.zig:4:5: [address] in main (test.obj)
\\ return error.TheSkyIsFalling; \\ return error.TheSkyIsFalling;
\\ ^ \\ ^
@ -380,11 +427,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
// --disabled-- results in segmenetation fault // --disabled-- results in segmenetation fault
"", "",
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -406,11 +453,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
// --disabled-- results in segmenetation fault // --disabled-- results in segmenetation fault
"", "",
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );
@ -438,11 +485,11 @@ pub fn addCases(cases: *tests.StackTracesContext) void {
// --disabled-- results in segmenetation fault // --disabled-- results in segmenetation fault
"", "",
// release-fast // release-fast
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
, ,
// release-small // release-small
\\error: TheSkyIsFalling \\error: TheSkyIsFalling
\\ \\
}, },
); );