From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 83C823816EFE; Wed, 8 Jun 2022 12:14:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 83C823816EFE Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] macro-substitute: Do not substitute non-repetition fragments in sub-maps X-Act-Checkin: gcc X-Git-Author: Arthur Cohen X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 6cf9f8c99c5813a23d7cec473fedf00683f409e4 X-Git-Newrev: a498b2c5d6d64c40955b3c13fd6ca8dc72a7bd67 Message-Id: <20220608121456.83C823816EFE@sourceware.org> Date: Wed, 8 Jun 2022 12:14:56 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:14:56 -0000 https://gcc.gnu.org/g:a498b2c5d6d64c40955b3c13fd6ca8dc72a7bd67 commit a498b2c5d6d64c40955b3c13fd6ca8dc72a7bd67 Author: Arthur Cohen Date: Tue Mar 1 15:15:07 2022 +0100 macro-substitute: Do not substitute non-repetition fragments in sub-maps When creating a sub-map for repetitions, we need to be weary of not accessing matched-fragments beyond the vector's size. For example, with the following *fragments* { "e": [1], "es": [2, 3, 10]}, the sub-maps we want to create are the following: { "e": [1], "es": [2]}, { "e": [1], "es": [3]}, { "e": [1], "es": [10]}, Up until this point however, we were trying to access the second index for the "e" metavar when creating the second submap, then the third, and so on... which is obviously outside of the vector's bounds. We can simply check if the metavar only has one match and expand that one in that case. We still need to work on checking that multiple metavars in the same transcriber repetition pattern have the same amount of matched fragments (ie the original vectors of matches in the original map have the same size) Diff: --- gcc/rust/expand/rust-macro-substitute-ctx.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gcc/rust/expand/rust-macro-substitute-ctx.cc b/gcc/rust/expand/rust-macro-substitute-ctx.cc index 8542614fb60..3d07b484134 100644 --- a/gcc/rust/expand/rust-macro-substitute-ctx.cc +++ b/gcc/rust/expand/rust-macro-substitute-ctx.cc @@ -17,8 +17,8 @@ SubstituteCtx::substitute_metavar (std::unique_ptr &metavar) else { // Replace - // We only care about the vector when expanding repetitions. Just access - // the first element of the vector. + // We only care about the vector when expanding repetitions. + // Just access the first element of the vector. // FIXME: Clean this up so it makes more sense auto &frag = it->second[0]; for (size_t offs = frag.token_offset_begin; offs < frag.token_offset_end; @@ -103,7 +103,13 @@ SubstituteCtx::substitute_repetition (size_t pattern_start, size_t pattern_end) for (auto &kv_match : fragments) { std::vector sub_vec; - sub_vec.emplace_back (kv_match.second[i]); + + // FIXME: Hack: If a fragment is not repeated, how does it fit in the + // submap? Do we really want to expand it? Is this normal behavior? + if (kv_match.second.size () == 1) + sub_vec.emplace_back (kv_match.second[0]); + else + sub_vec.emplace_back (kv_match.second[i]); sub_map.insert ({kv_match.first, sub_vec}); } @@ -177,6 +183,7 @@ std::vector> SubstituteCtx::substitute_tokens () { std::vector> replaced_tokens; + rust_debug ("expanding tokens"); for (size_t i = 0; i < macro.size (); i++) {