diff --git a/compiler/mips/nlx.lisp b/compiler/mips/nlx.lisp
index cfba49536c03e8d67eef61a02fcac52c2e0cf6ff..d7c4ed998a02cec2e4887abcd2416994bbcb6d6d 100644
--- a/compiler/mips/nlx.lisp
+++ b/compiler/mips/nlx.lisp
@@ -7,11 +7,11 @@
 ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.15 1991/08/19 22:48:31 wlott Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.16 1992/05/21 23:21:11 wlott Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.15 1991/08/19 22:48:31 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/mips/nlx.lisp,v 1.16 1992/05/21 23:21:11 wlott Exp $
 ;;;
 ;;;    This file contains the definitions of VOPs used for non-local exit
 ;;; (throw, lexical exit, etc.)
@@ -180,8 +180,10 @@
   (:temporary (:scs (descriptor-reg)) move-temp)
   (:info label nvals)
   (:save-p :force-to-stack)
+  (:vop-var vop)
   (:generator 30
     (emit-return-pc label)
+    (note-this-location vop :non-local-entry)
     (cond ((zerop nvals))
 	  ((= nvals 1)
 	   (let ((no-values (gen-label)))
@@ -236,8 +238,10 @@
   (:temporary (:scs (descriptor-reg)) temp)
   (:results (new-start) (new-count))
   (:save-p :force-to-stack)
+  (:vop-var vop)
   (:generator 30
     (emit-return-pc label)
+    (note-this-location vop :non-local-entry)
     (let ((loop (gen-label))
 	  (done (gen-label)))
 
diff --git a/compiler/sparc/nlx.lisp b/compiler/sparc/nlx.lisp
index 9b62a377bf45b9f9e67a8f2359f48ee368dfe654..faa010a3f52e10891d4b99d46d3bf2332a1753be 100644
--- a/compiler/sparc/nlx.lisp
+++ b/compiler/sparc/nlx.lisp
@@ -7,7 +7,7 @@
 ;;; Scott Fahlman (FAHLMAN@CMUC). 
 ;;; **********************************************************************
 ;;;
-;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/nlx.lisp,v 1.4 1991/08/31 22:11:00 wlott Exp $
+;;; $Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/sparc/nlx.lisp,v 1.5 1992/05/21 23:22:31 wlott Exp $
 ;;;
 ;;;    This file contains the definitions of VOPs used for non-local exit
 ;;; (throw, lexical exit, etc.)
@@ -176,8 +176,10 @@
   (:temporary (:scs (descriptor-reg)) move-temp)
   (:info label nvals)
   (:save-p :force-to-stack)
+  (:vop-var vop)
   (:generator 30
     (emit-return-pc label)
+    (note-this-location vop :non-local-entry)
     (cond ((zerop nvals))
 	  ((= nvals 1)
 	   (let ((no-values (gen-label)))
@@ -233,8 +235,10 @@
   (:results (result :scs (any-reg) :from (:argument 0))
 	    (num :scs (any-reg) :from (:argument 0)))
   (:save-p :force-to-stack)
+  (:vop-var vop)
   (:generator 30
     (emit-return-pc label)
+    (note-this-location vop :non-local-entry)
     (let ((loop (gen-label))
 	  (done (gen-label)))
 
@@ -268,6 +272,8 @@
   (:save-p :force-to-stack)
   (:results (block) (start) (count))
   (:ignore block start count)
+  (:vop-var vop)
   (:generator 0
-    (emit-return-pc label)))
+    (emit-return-pc label)
+    (note-this-location vop :non-local-entry)))