From 0b2aec1164ded516b6f862849e34693b9bb039e8 Mon Sep 17 00:00:00 2001 From: Ayke van Laethem Date: Tue, 25 Apr 2023 16:45:55 +0200 Subject: [PATCH] runtime: improve panic message when heap allocating in an interrupt The old message may have been confusing. With the new message, it should be more clear that we mean a _heap_ allocation. --- builder/sizes_test.go | 6 +++--- src/runtime/gc_blocks.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builder/sizes_test.go b/builder/sizes_test.go index b987ba19..1035a669 100644 --- a/builder/sizes_test.go +++ b/builder/sizes_test.go @@ -41,9 +41,9 @@ func TestBinarySize(t *testing.T) { // This is a small number of very diverse targets that we want to test. tests := []sizeTest{ // microcontrollers - {"hifive1b", "examples/echo", 4612, 276, 0, 2252}, - {"microbit", "examples/serial", 2724, 384, 8, 2256}, - {"wioterminal", "examples/pininterrupt", 6159, 1477, 116, 6816}, + {"hifive1b", "examples/echo", 4612, 280, 0, 2252}, + {"microbit", "examples/serial", 2724, 388, 8, 2256}, + {"wioterminal", "examples/pininterrupt", 6159, 1481, 116, 6816}, // TODO: also check wasm. Right now this is difficult, because // wasm binaries are run through wasm-opt and therefore the diff --git a/src/runtime/gc_blocks.go b/src/runtime/gc_blocks.go index 7aaff89c..01031ac8 100644 --- a/src/runtime/gc_blocks.go +++ b/src/runtime/gc_blocks.go @@ -278,7 +278,7 @@ func alloc(size uintptr, layout unsafe.Pointer) unsafe.Pointer { } if interrupt.In() { - runtimePanicAt(returnAddress(0), "alloc in interrupt") + runtimePanicAt(returnAddress(0), "heap alloc in interrupt") } gcTotalAlloc += uint64(size)