Skip to content

Commit f71354f

Browse files
author
Gaius Mulley
committed
PR-108135 Modula2 meets clang (remove dead code and bugfix m2.flex)
These patches fix warnings (and a bug) discovered by clang. The patch set looks longer than the changes as pge and mc needed to be rebuilt (due to a change in the gcc/m2/gm2-libs/DynamicString.mod library). gcc/m2/ChangeLog: * gm2-gcc/m2statement.cc (gm2_gimplify_function_node): Remove. * gm2-libs/DynamicStrings.mod (Equal): Remove dead code. * m2.flex (<COMMENT>"<*"): Add {} for else statement. * m2pp.cc (hextree): Add conditional #ifdef DEBUGGING. * mc-boot/GDynamicStrings.c: Rebuild. * pge-boot/GDynamicStrings.c: Rebuild. * pge-boot/GFIO.c: Rebuild. * pge-boot/GIndexing.c: Rebuild. * pge-boot/GM2EXCEPTION.c: Rebuild. * pge-boot/GM2RTS.c: Rebuild. * pge-boot/GNameKey.c: Rebuild. * pge-boot/GPushBackInput.c: Rebuild. * pge-boot/GRTExceptions.c: Rebuild. * pge-boot/GStdIO.c: Rebuild. * pge-boot/GSymbolKey.c: Rebuild. * pge-boot/GSysStorage.c: Rebuild. Signed-off-by: Gaius Mulley <[email protected]>
1 parent 99ea0d7 commit f71354f

File tree

16 files changed

+164
-131
lines changed

16 files changed

+164
-131
lines changed

‎gcc/m2/gm2-gcc/m2statement.cc‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,6 @@ m2statement_BuildStartFunctionCode (location_t location, tree fndecl,
8484
DECL_DECLARED_INLINE_P (fndecl) = 0; /* isinline; */
8585
}
8686

87-
static void
88-
gm2_gimplify_function_node (tree fndecl)
89-
{
90-
/* Convert all nested functions to GIMPLE now. We do things in this
91-
order so that items like VLA sizes are expanded properly in the
92-
context of the correct function. */
93-
struct cgraph_node *cgn;
94-
95-
dump_function (TDI_original, fndecl);
96-
gimplify_function_tree (fndecl);
97-
98-
cgn = cgraph_node::get_create (fndecl);
99-
for (cgn = first_nested_function (cgn);
100-
cgn != NULL; cgn = next_nested_function (cgn))
101-
gm2_gimplify_function_node (cgn->decl);
102-
}
103-
10487
/* BuildEndFunctionCode - generates the function epilogue. */
10588

10689
void

‎gcc/m2/gm2-libs/DynamicStrings.mod‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,14 +1215,6 @@ BEGIN
12151215
i := 0 ;
12161216
Assert (a^.contents.len = b^.contents.len) ;
12171217
WHILE i<a^.contents.len DO
1218-
IF a^.contents.buf[i] # a^.contents.buf[i]
1219-
THEN
1220-
HALT
1221-
END ;
1222-
IF b^.contents.buf[i] # b^.contents.buf[i]
1223-
THEN
1224-
HALT
1225-
END ;
12261218
IF a^.contents.buf[i] # b^.contents.buf[i]
12271219
THEN
12281220
RETURN FALSE

‎gcc/m2/m2.flex‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,9 @@ extern void yylex (void);
131131
pushLine();
132132
skippos();
133133
BEGIN COMMENT1;
134-
} else
134+
} else {
135135
updatepos(); skippos();
136+
}
136137
}
137138
<COMMENT>\n.* { consumeLine(); }
138139
<COMMENT>. { updatepos(); skippos(); }

‎gcc/m2/m2pp.cc‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,7 @@ m2pp_types (pretty *s)
547547
}
548548
}
549549

550+
#ifdef DEBUGGING
550551
/* hextree displays the critical fields for function, block and
551552
bind_expr trees in raw hex. */
552553

@@ -607,6 +608,7 @@ hextree (tree t)
607608
killPretty (state);
608609
}
609610
}
611+
#endif
610612

611613
/* translation produce a pseudo implementation module from the tree t. */
612614

‎gcc/m2/mc-boot/GDynamicStrings.c‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,16 +1874,6 @@ extern "C" unsigned int DynamicStrings_Equal (DynamicStrings_String a, DynamicSt
18741874
Assertion_Assert (a->contents.len == b->contents.len);
18751875
while (i < a->contents.len)
18761876
{
1877-
if (a->contents.buf.array[i] != a->contents.buf.array[i])
1878-
{
1879-
M2RTS_HALT (-1);
1880-
__builtin_unreachable ();
1881-
}
1882-
if (b->contents.buf.array[i] != b->contents.buf.array[i])
1883-
{
1884-
M2RTS_HALT (-1);
1885-
__builtin_unreachable ();
1886-
}
18871877
if (a->contents.buf.array[i] != b->contents.buf.array[i])
18881878
{
18891879
return FALSE;
@@ -1920,7 +1910,7 @@ extern "C" unsigned int DynamicStrings_EqualCharStar (DynamicStrings_String s, v
19201910
t = DynamicStrings_InitStringCharStar (a);
19211911
if (TraceOn)
19221912
{
1923-
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1258, (const char *) "EqualCharStar", 13);
1913+
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
19241914
}
19251915
t = AddToGarbage (t, s);
19261916
if (DynamicStrings_Equal (t, s))
@@ -1958,7 +1948,7 @@ extern "C" unsigned int DynamicStrings_EqualArray (DynamicStrings_String s, cons
19581948
t = DynamicStrings_InitString ((const char *) a, _a_high);
19591949
if (TraceOn)
19601950
{
1961-
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1288, (const char *) "EqualArray", 10);
1951+
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
19621952
}
19631953
t = AddToGarbage (t, s);
19641954
if (DynamicStrings_Equal (t, s))
@@ -1996,7 +1986,7 @@ extern "C" DynamicStrings_String DynamicStrings_Mult (DynamicStrings_String s, u
19961986
}
19971987
if (TraceOn)
19981988
{
1999-
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1320, (const char *) "Mult", 4);
1989+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
20001990
}
20011991
return s;
20021992
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2075,7 +2065,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
20752065
AddDebugInfo (t->contents.next);
20762066
if (TraceOn)
20772067
{
2078-
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1388, (const char *) "Slice", 5);
2068+
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1380, (const char *) "Slice", 5);
20792069
}
20802070
}
20812071
t = t->contents.next;
@@ -2093,7 +2083,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
20932083
}
20942084
if (TraceOn)
20952085
{
2096-
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1405, (const char *) "Slice", 5);
2086+
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
20972087
}
20982088
return d;
20992089
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2221,7 +2211,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveComment (DynamicStrings_St
22212211
}
22222212
if (TraceOn)
22232213
{
2224-
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1517, (const char *) "RemoveComment", 13);
2214+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
22252215
}
22262216
return s;
22272217
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2246,7 +2236,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePrefix (DynamicString
22462236
s = DynamicStrings_Slice (s, (int ) (i), 0);
22472237
if (TraceOn)
22482238
{
2249-
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1629, (const char *) "RemoveWhitePrefix", 17);
2239+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
22502240
}
22512241
return s;
22522242
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2271,7 +2261,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePostfix (DynamicStrin
22712261
s = DynamicStrings_Slice (s, 0, i+1);
22722262
if (TraceOn)
22732263
{
2274-
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1651, (const char *) "RemoveWhitePostfix", 18);
2264+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
22752265
}
22762266
return s;
22772267
/* static analysis guarentees a RETURN statement will be used before here. */

‎gcc/m2/pge-boot/GDynamicStrings.c‎

Lines changed: 16 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1217,7 +1217,7 @@ static void ConcatContents (DynamicStrings_Contents *c, const char *a_, unsigned
12171217
(*c).next->contents.next = NULL;
12181218
ConcatContents (&(*c).next->contents, (const char *) a, _a_high, h, o);
12191219
AddDebugInfo ((*c).next);
1220-
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 722, (const char *) "ConcatContents", 14);
1220+
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 722, (const char *) "ConcatContents", 14);
12211221
}
12221222
else
12231223
{
@@ -1315,7 +1315,7 @@ static void ConcatContentsAddress (DynamicStrings_Contents *c, void * a, unsigne
13151315
AddDebugInfo ((*c).next);
13161316
if (TraceOn)
13171317
{
1318-
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 917, (const char *) "ConcatContentsAddress", 21);
1318+
(*c).next = AssignDebug ((*c).next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 917, (const char *) "ConcatContentsAddress", 21);
13191319
}
13201320
}
13211321
else
@@ -1540,7 +1540,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitString (const char *a_, unsi
15401540
AddDebugInfo (s);
15411541
if (TraceOn)
15421542
{
1543-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 758, (const char *) "InitString", 10);
1543+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 758, (const char *) "InitString", 10);
15441544
}
15451545
return s;
15461546
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -1643,7 +1643,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringCharStar (void * a)
16431643
AddDebugInfo (s);
16441644
if (TraceOn)
16451645
{
1646-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 957, (const char *) "InitStringCharStar", 18);
1646+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 957, (const char *) "InitStringCharStar", 18);
16471647
}
16481648
return s;
16491649
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -1668,7 +1668,7 @@ extern "C" DynamicStrings_String DynamicStrings_InitStringChar (char ch)
16681668
s = DynamicStrings_InitString ((const char *) &a.array[0], 1);
16691669
if (TraceOn)
16701670
{
1671-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 977, (const char *) "InitStringChar", 14);
1671+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 977, (const char *) "InitStringChar", 14);
16721672
}
16731673
return s;
16741674
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -1826,7 +1826,7 @@ extern "C" DynamicStrings_String DynamicStrings_Dup (DynamicStrings_String s)
18261826
s = DynamicStrings_Assign (DynamicStrings_InitString ((const char *) "", 0), s);
18271827
if (TraceOn)
18281828
{
1829-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1173, (const char *) "Dup", 3);
1829+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1173, (const char *) "Dup", 3);
18301830
}
18311831
return s;
18321832
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -1848,7 +1848,7 @@ extern "C" DynamicStrings_String DynamicStrings_Add (DynamicStrings_String a, Dy
18481848
a = DynamicStrings_ConCat (DynamicStrings_ConCat (DynamicStrings_InitString ((const char *) "", 0), a), b);
18491849
if (TraceOn)
18501850
{
1851-
a = AssignDebug (a, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1193, (const char *) "Add", 3);
1851+
a = AssignDebug (a, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1193, (const char *) "Add", 3);
18521852
}
18531853
return a;
18541854
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -1877,16 +1877,6 @@ extern "C" unsigned int DynamicStrings_Equal (DynamicStrings_String a, DynamicSt
18771877
Assertion_Assert (a->contents.len == b->contents.len);
18781878
while (i < a->contents.len)
18791879
{
1880-
if (a->contents.buf.array[i] != a->contents.buf.array[i])
1881-
{
1882-
M2RTS_HALT (-1);
1883-
__builtin_unreachable ();
1884-
}
1885-
if (b->contents.buf.array[i] != b->contents.buf.array[i])
1886-
{
1887-
M2RTS_HALT (-1);
1888-
__builtin_unreachable ();
1889-
}
18901880
if (a->contents.buf.array[i] != b->contents.buf.array[i])
18911881
{
18921882
return FALSE;
@@ -1923,7 +1913,7 @@ extern "C" unsigned int DynamicStrings_EqualCharStar (DynamicStrings_String s, v
19231913
t = DynamicStrings_InitStringCharStar (a);
19241914
if (TraceOn)
19251915
{
1926-
t = AssignDebug (t, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1258, (const char *) "EqualCharStar", 13);
1916+
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1250, (const char *) "EqualCharStar", 13);
19271917
}
19281918
t = AddToGarbage (t, s);
19291919
if (DynamicStrings_Equal (t, s))
@@ -1961,7 +1951,7 @@ extern "C" unsigned int DynamicStrings_EqualArray (DynamicStrings_String s, cons
19611951
t = DynamicStrings_InitString ((const char *) a, _a_high);
19621952
if (TraceOn)
19631953
{
1964-
t = AssignDebug (t, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1288, (const char *) "EqualArray", 10);
1954+
t = AssignDebug (t, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1280, (const char *) "EqualArray", 10);
19651955
}
19661956
t = AddToGarbage (t, s);
19671957
if (DynamicStrings_Equal (t, s))
@@ -1999,7 +1989,7 @@ extern "C" DynamicStrings_String DynamicStrings_Mult (DynamicStrings_String s, u
19991989
}
20001990
if (TraceOn)
20011991
{
2002-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1320, (const char *) "Mult", 4);
1992+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1312, (const char *) "Mult", 4);
20031993
}
20041994
return s;
20051995
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2078,7 +2068,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
20782068
AddDebugInfo (t->contents.next);
20792069
if (TraceOn)
20802070
{
2081-
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1388, (const char *) "Slice", 5);
2071+
t->contents.next = AssignDebug (t->contents.next, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1380, (const char *) "Slice", 5);
20822072
}
20832073
}
20842074
t = t->contents.next;
@@ -2096,7 +2086,7 @@ extern "C" DynamicStrings_String DynamicStrings_Slice (DynamicStrings_String s,
20962086
}
20972087
if (TraceOn)
20982088
{
2099-
d = AssignDebug (d, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1405, (const char *) "Slice", 5);
2089+
d = AssignDebug (d, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1397, (const char *) "Slice", 5);
21002090
}
21012091
return d;
21022092
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2224,7 +2214,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveComment (DynamicStrings_St
22242214
}
22252215
if (TraceOn)
22262216
{
2227-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1517, (const char *) "RemoveComment", 13);
2217+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1509, (const char *) "RemoveComment", 13);
22282218
}
22292219
return s;
22302220
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2249,7 +2239,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePrefix (DynamicString
22492239
s = DynamicStrings_Slice (s, (int ) (i), 0);
22502240
if (TraceOn)
22512241
{
2252-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1629, (const char *) "RemoveWhitePrefix", 17);
2242+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1621, (const char *) "RemoveWhitePrefix", 17);
22532243
}
22542244
return s;
22552245
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2274,7 +2264,7 @@ extern "C" DynamicStrings_String DynamicStrings_RemoveWhitePostfix (DynamicStrin
22742264
s = DynamicStrings_Slice (s, 0, i+1);
22752265
if (TraceOn)
22762266
{
2277-
s = AssignDebug (s, (const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 1651, (const char *) "RemoveWhitePostfix", 18);
2267+
s = AssignDebug (s, (const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 1643, (const char *) "RemoveWhitePostfix", 18);
22782268
}
22792269
return s;
22802270
/* static analysis guarentees a RETURN statement will be used before here. */
@@ -2643,7 +2633,7 @@ extern "C" DynamicStrings_String DynamicStrings_PopAllocationExemption (unsigned
26432633
{
26442634
stop ();
26452635
/* writeString ("mismatched number of PopAllocation's compared to PushAllocation's") */
2646-
M2RTS_Halt ((const char *) "../../gcc-git-devel-modula2/gcc/m2/gm2-libs/DynamicStrings.mod", 62, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
2636+
M2RTS_Halt ((const char *) "../../gcc-read-write/gcc/m2/gm2-libs/DynamicStrings.mod", 55, 176, (const char *) "PopAllocationExemption", 22, (const char *) "mismatched number of PopAllocation's compared to PushAllocation's", 65);
26472637
}
26482638
else
26492639
{

‎gcc/m2/pge-boot/GFIO.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ static FIO_File GetNextFreeDescriptor (void)
558558
return f; /* create new slot */
559559
}
560560
}
561-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
561+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
562562
__builtin_unreachable ();
563563
}
564564

@@ -2269,7 +2269,7 @@ extern "C" void * FIO_getFileName (FIO_File f)
22692269
return fd->name.address;
22702270
}
22712271
}
2272-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
2272+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
22732273
__builtin_unreachable ();
22742274
}
22752275

@@ -2296,7 +2296,7 @@ extern "C" unsigned int FIO_getFileNameLength (FIO_File f)
22962296
return fd->name.size;
22972297
}
22982298
}
2299-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/FIO.def", 25, 1);
2299+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/FIO.def", 25, 1);
23002300
__builtin_unreachable ();
23012301
}
23022302

‎gcc/m2/pge-boot/GIndexing.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ extern "C" unsigned int Indexing_InBounds (Indexing_Index i, unsigned int n)
227227
{
228228
return (n >= i->Low) && (n <= i->High);
229229
}
230-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
230+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
231231
__builtin_unreachable ();
232232
}
233233

@@ -247,7 +247,7 @@ extern "C" unsigned int Indexing_HighIndice (Indexing_Index i)
247247
{
248248
return i->High;
249249
}
250-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
250+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
251251
__builtin_unreachable ();
252252
}
253253

@@ -267,7 +267,7 @@ extern "C" unsigned int Indexing_LowIndice (Indexing_Index i)
267267
{
268268
return i->Low;
269269
}
270-
ReturnException ("../../gcc-git-devel-modula2/gcc/m2/gm2-libs/Indexing.def", 25, 1);
270+
ReturnException ("../../gcc-read-write/gcc/m2/gm2-libs/Indexing.def", 25, 1);
271271
__builtin_unreachable ();
272272
}
273273

0 commit comments

Comments
 (0)