Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-28 16:11:29 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[flang] Avoid crash case in provenance mapping

Browse Source 
When a contiguous range of a cooked character stream is being
mapped to a range of source provenance, the code was assuming
that the "end()" position of the input range -- being the character
immediately after the range -- would also follow the range's
source provenance.  This isn't always the case.

Modify the code to work with the true last character of the
input range (at end()-1) and to also cope with cases when that
last position truly maps to an earlier provenance, which can happen
when the prescanner has inserted a space into the cooked character
stream.

Differential Revision: https://reviews.llvm.org/D121124
This commit is contained in:
Peter Klausler 2022-02-18 11:15:08 -08:00
parent 0c0636f782
commit d7ea6068e5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flang/lib/Parser/provenance.cpp
View File

@ -435,11 +435,15 @@ std::optional<ProvenanceRange> CookedSource::GetProvenanceRange(
return std::nullopt;
}
ProvenanceRange first{provenanceMap_.Map(cookedRange.begin() - &data_[0])};
if (cookedRange.size() <= first.size()) {
if (cookedRange.size() <= first.size()) { // always true when empty
return first.Prefix(cookedRange.size());
}
ProvenanceRange last{provenanceMap_.Map(cookedRange.end() - &data_[0])};
return {ProvenanceRange{first.start(), last.start() - first.start()}};
ProvenanceRange last{provenanceMap_.Map(cookedRange.end() - 1 - &data_[0])};
if (first.start() <= last.start()) {
return {ProvenanceRange{first.start(), last.start() - first.start() + 1}};
} else {
return std::nullopt;
}
}
std::optional<CharBlock> CookedSource::GetCharBlock(