Merge branch 'odin-lang:master' into union-tag-intrinsics

This commit is contained in:
jakubtomsu
2023-10-25 15:47:39 +02:00
committed by GitHub
2 changed files with 4 additions and 4 deletions

View File

@@ -664,8 +664,10 @@ default_assertion_failure_proc :: proc(prefix, message: string, loc: Source_Code
when ODIN_OS == .Freestanding {
// Do nothing
} else {
print_caller_location(loc)
print_string(" ")
when !ODIN_DISABLE_ASSERT {
print_caller_location(loc)
print_string(" ")
}
print_string(prefix)
if len(message) > 0 {
print_string(": ")

View File

@@ -817,7 +817,6 @@ assert :: proc(condition: bool, message := "", loc := #caller_location) {
}
@builtin
@(disabled=ODIN_DISABLE_ASSERT)
panic :: proc(message: string, loc := #caller_location) -> ! {
p := context.assertion_failure_proc
if p == nil {
@@ -827,7 +826,6 @@ panic :: proc(message: string, loc := #caller_location) -> ! {
}
@builtin
@(disabled=ODIN_DISABLE_ASSERT)
unimplemented :: proc(message := "", loc := #caller_location) -> ! {
p := context.assertion_failure_proc
if p == nil {