instead of the maximum physical line number to gigi.
* gcc-interface/trans.c (Sloc_to_locus): Cope with line zero.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@180242
138bc75d-0d04-0410-961f-
82ee72b054a4
+2011-10-20 Eric Botcazou <ebotcazou@adacore.com>
+
+ * back_end.adb (Call_Back_End): Pass the maximum logical line number
+ instead of the maximum physical line number to gigi.
+ * gcc-interface/trans.c (Sloc_to_locus): Cope with line zero.
+
2011-10-16 Tom Tromey <tromey@redhat.com>
Dodji Seketeli <dodji@redhat.com>
return;
end if;
+ -- The back end needs to know the maximum line number that can appear
+ -- in a Sloc, in other words the maximum logical line number.
+
for J in 1 .. Last_Source_File loop
File_Info_Array (J).File_Name := Full_Debug_Name (J);
- File_Info_Array (J).Num_Source_Lines := Num_Source_Lines (J);
+ File_Info_Array (J).Num_Source_Lines :=
+ Nat (Physical_To_Logical (Last_Source_Line (J), J));
end loop;
if Generate_SCIL then
Column_Number column = Get_Column_Number (Sloc);
struct line_map *map = LINEMAPS_ORDINARY_MAP_AT (line_table, file - 1);
+ /* We can have zero if pragma Source_Reference is in effect. */
+ if (line < 1)
+ line = 1;
+
/* Translate the location. */
*locus = linemap_position_for_line_and_column (map, line, column);
}
+2011-10-20 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gnat.dg/source_ref1.adb: New test.
+ * gnat.dg/source_ref2.adb: Likewise.
+
2011-10-19 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/13657
--- /dev/null
+pragma Source_Reference (3, "p1.adb");
+
+procedure Source_Ref1 is
+begin
+ null;
+end;
--- /dev/null
+pragma Source_Reference (1, "p2.adb");
+
+procedure Source_Ref2 is
+pragma Source_Reference (2, "p2.adb");
+begin
+ null;
+end;