move checking for constant ALIEN-INFO into a separate function

[sbcl.git] / src / compiler / x86-64 / call.lisp

diff --git a/src/compiler/x86-64/call.lisp b/src/compiler/x86-64/call.lisp
index b19771d..b1c5395 100644 (file)
--- a/src/compiler/x86-64/call.lisp
+++ b/src/compiler/x86-64/call.lisp
@@ -561,13 +561,13 @@
 ;;; calls. Emit a header for local calls to pop the return address
 ;;; in the right place.
 (defun emit-block-header (start-label trampoline-label fall-thru-p alignp)
-  (when (and fall-thru-p (or trampoline-label alignp))
+  (when (and fall-thru-p trampoline-label)
     (inst jmp start-label))
-  (when alignp
-    (emit-alignment n-lowtag-bits #x90))
   (when trampoline-label
     (emit-label trampoline-label)
     (popw rbp-tn (frame-word-offset return-pc-save-offset)))
+  (when alignp
+    (emit-alignment n-lowtag-bits #x90))
   (emit-label start-label))
 
 ;;; Non-TR local call for a fixed number of values passed according to