From ac4fda488ce8952746699763ec323859c2bb27d8 Mon Sep 17 00:00:00 2001 From: Taylor R Campbell Date: Sat, 19 Jan 2019 23:57:34 +0000 Subject: [PATCH] Allow non-branch in cc_return_address_to_entry_address. This happens for trampolines. Maybe this should be a special case. --- src/microcode/cmpintmd/aarch64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/microcode/cmpintmd/aarch64.c b/src/microcode/cmpintmd/aarch64.c index db565c812..61f267263 100644 --- a/src/microcode/cmpintmd/aarch64.c +++ b/src/microcode/cmpintmd/aarch64.c @@ -93,7 +93,7 @@ cc_return_address_to_entry_address (insn_t * pc) return (pc + (insn & 0x03ffffff)); else /* XXX What if it got branch-tensioned? */ - error_external_return (); + return (pc); } /* Compiled closures */ -- 2.25.1