From 3150920cb4580ffc6a0b2c4b2f9077d789811cb8 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Thu, 6 Dec 2018 15:12:17 +0800 Subject: [PATCH] heap: __builtin_return_address argument has to be a literal value Clang does not accept const int as an argument of __builtin_return_address. Ref LLVM-14 --- components/heap/heap_trace.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/heap/heap_trace.c b/components/heap/heap_trace.c index bb1cc6eda..3c9154ef7 100644 --- a/components/heap/heap_trace.c +++ b/components/heap/heap_trace.c @@ -271,11 +271,14 @@ inline static uint32_t get_ccount(void) return ccount; } +// Caller is 2 stack frames deeper than we care about +#define STACK_OFFSET 2 + #define TEST_STACK(N) do { \ if (STACK_DEPTH == N) { \ return; \ } \ - callers[N] = __builtin_return_address(N+offset); \ + callers[N] = __builtin_return_address(N+STACK_OFFSET); \ if (!esp_ptr_executable(callers[N])) { \ return; \ } \ @@ -288,7 +291,6 @@ inline static uint32_t get_ccount(void) */ static IRAM_ATTR __attribute__((noinline)) void get_call_stack(void **callers) { - const int offset = 2; // Caller is 2 stack frames deeper than we care about bzero(callers, sizeof(void *) * STACK_DEPTH); TEST_STACK(0); TEST_STACK(1);