Sync with upstream

[inform.git] / asm.c

diff --git a/asm.c b/asm.c
index a14493984a1203a2332f2038b7cb425953b7782a..a5444fd589d92f71d0838a53bfb0493b17d3d66a 100644 (file)
--- a/asm.c
+++ b/asm.c
@@ -1,7 +1,7 @@
 /* ------------------------------------------------------------------------- */
 /*   "asm" : The Inform assembler                                            */
 /*                                                                           */
-/* Copyright (c) Graham Nelson 1993 - 2016                                   */
+/* Copyright (c) Graham Nelson 1993 - 2018                                   */
 /*                                                                           */
 /* This file is part of Inform.                                              */
 /*                                                                           */
@@ -1423,9 +1423,8 @@ extern int32 assemble_routine_header(int no_locals,
       stackargs = TRUE;
     }
 
-    if (veneer_mode) routine_starts_line = -1;
-    else routine_starts_line = ErrorReport.line_number
-             + FILE_LINE_SCALE_FACTOR*ErrorReport.file_number;
+    if (veneer_mode) routine_starts_line = blank_brief_location;
+    else routine_starts_line = get_brief_location(&ErrorReport);
 
     if (asm_trace_level > 0)
     {   printf("\n%5d  +%05lx  [ %s ", ErrorReport.line_number,