From: Taylor R Campbell <campbell@mumble.net>
Date: Sat, 19 Jan 2019 23:57:34 +0000 (+0000)
Subject: Allow non-branch in cc_return_address_to_entry_address.
X-Git-Tag: mit-scheme-pucked-10.1.20~11^2~66^2~54
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=ac4fda488ce8952746699763ec323859c2bb27d8;p=mit-scheme.git

Allow non-branch in cc_return_address_to_entry_address.

This happens for trampolines.  Maybe this should be a special case.
---

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 */