https://gcc.gnu.org/bugzilla/show_bug.cgi?id=114026

--- Comment #3 from GCC Commits <cvs-commit at gcc dot gnu.org> ---
The master branch has been updated by Gaius Mulley <ga...@gcc.gnu.org>:

https://gcc.gnu.org/g:161a67b2bee84d8fd5ab7711e411f76221c1ea52

commit r14-9116-g161a67b2bee84d8fd5ab7711e411f76221c1ea52
Author: Gaius Mulley <gaiusm...@gmail.com>
Date:   Wed Feb 21 16:21:05 2024 +0000

    PR modula2/114026 Incorrect location during for loop type checking

    If a for loop contains an incompatible type expression between the
    designator and the second expression then the location
    used when generating the error message is set to token 0.
    The bug is fixed by extending the range checking
    InitForLoopBeginRangeCheck.  The range checking is processed after
    all types, constants have been resolved (and converted into gcc
    trees).  The range check will check for assignment compatibility
    between des and expr1, expression compatibility between des and expr2.
    Separate token positions for des, exp1, expr2 and by are stored in the
    Range record and used to create virtual tokens if they are on the same
    source line.

    gcc/m2/ChangeLog:

            PR modula2/114026
            * gm2-compiler/M2GenGCC.mod (Import): Remove DisplayQuadruples.
            Remove DisplayQuadList.
            (MixTypesBinary): Replace check with overflowCheck.
            New variable typeChecking.
            Use GenQuadOTypetok to retrieve typeChecking.
            Use typeChecking to suppress error message.
            * gm2-compiler/M2LexBuf.def (MakeVirtual2Tok): New procedure
            function.
            * gm2-compiler/M2LexBuf.mod (MakeVirtualTok): Improve comment.
            (MakeVirtual2Tok): New procedure function.
            * gm2-compiler/M2Quads.def (GetQuadOTypetok): New procedure.
            * gm2-compiler/M2Quads.mod (QuadFrame): New field CheckType.
            (PutQuadO): Rewrite using PutQuadOType.
            (PutQuadOType): New procedure.
            (GetQuadOTypetok): New procedure.
            (BuildPseudoBy): Rewrite.
            (BuildForToByDo): Remove type checking.
            Add parameters e2, e2tok, BySym, bytok to
            InitForLoopBeginRange.
            Push the RangeId.
            (BuildEndFor): Pop the RangeId.
            Use GenQuadOTypetok to generate AddOp without type checking.
            Call PutRangeForIncrement with the RangeId and IncQuad.
            (GenQuadOtok): Rewrite using GenQuadOTypetok.
            (GenQuadOTypetok): New procedure.
            * gm2-compiler/M2Range.def (InitForLoopBeginRangeCheck):
            Rename d as des, e as expr.
            Add expr1, expr1tok, expr2, expr2tok, byconst, byconsttok
            parameters.
            (PutRangeForIncrement): New procedure.
            * gm2-compiler/M2Range.mod (Import): MakeVirtual2Tok.
            (Range): Add expr2, byconst, destok, exprtok, expr2tok,
            incrementquad.
            (InitRange): Initialize expr2 to NulSym.
            Initialize byconst to NulSym.
            Initialize tokenNo, destok, exprtok, expr2tok, byconst to
            UnknownTokenNo.
            Initialize incrementquad to 0.
            (PutRangeForIncrement): New procedure.
            (PutRangeDesExpr2): New procedure.
            (InitForLoopBeginRangeCheck): Rewrite.
            (ForLoopBeginTypeCompatible): New procedure function.
            (CodeForLoopBegin): Call ForLoopBeginTypeCompatible and
            only code the for loop assignment if all the type checks
            succeed.

    gcc/testsuite/ChangeLog:

            PR modula2/114026
            * gm2/extensions/run/pass/callingc10.mod: New test.
            * gm2/extensions/run/pass/callingc11.mod: New test.
            * gm2/extensions/run/pass/callingc9.mod: New test.
            * gm2/extensions/run/pass/strconst.def: New test.
            * gm2/pim/fail/forloop.mod: New test.
            * gm2/pim/pass/forloop2.mod: New test.

    Signed-off-by: Gaius Mulley <gaiusm...@gmail.com>

Reply via email to