admin/revng-revng
1
0
Fork 0
mirror of https://github.com/revng/revng synced 2026-06-21 14:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

FieldAccessReplacement: fix type of array indices

Browse Source 
When emitting the synthesized integer index for an access whose
LinearCombination contains a variable, use the variable's own type
for the constant `[0]` immediate (and for the rest of the index
arithmetic) instead of always using a generic pointer-sized integer.
With model-sized pointers in the picture the two integer widths can
differ, and using the wrong one trips Clift's type checking
downstream.
This commit is contained in:
Pietro Fezzardi
2026-05-08 11:37:09 +02:00
parent 9700f1ab5e
commit 197bdd346d
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/CliftTransforms/FieldAccessReplacement.cpp
+13 -14
View File
@@ -302,9 +302,11 @@ bool Replacement::replace(ExpressionOpInterface PointerToReplace,
// component, we still emit a `imm 0` to represent the access to `[0]`.
if (Access.Index.Constant != 0 or not Access.Index.Variable) {
auto Index = Access.Index.Constant;
auto IntegerType = clift::IntegerType::get(Builder.getContext(),
IntegerKind::Generic,
PointerSize);
auto IntegerType = Access.Index.Variable ?
Access.Index.Variable.getType() :
clift::IntegerType::get(Builder.getContext(),
IntegerKind::Generic,
PointerSize);
FixedIndexValue = Builder.create<ImmediateOp>(PointerToReplaceLoc,
IntegerType,
Index);
@@ -369,22 +371,19 @@ bool Replacement::replace(ExpressionOpInterface PointerToReplace,
or not LeftoverOffset.LinearCombination.empty()) {
// Cast pointer to integer
auto IntegerType = clift::IntegerType::get(Builder.getContext(),
IntegerKind::Generic,
PointerSize);
auto IntPtrType = clift::IntegerType::get(Builder.getContext(),
IntegerKind::Generic,
PointerSize);
CurrentValue = Builder.create<BitCastOp>(PointerToReplaceLoc,
IntegerType,
IntPtrType,
CurrentValue);
// Add base offset
if (!LeftoverOffset.BaseOffset.isZero()) {
auto IntegerType = clift::IntegerType::get(Builder.getContext(),
IntegerKind::Generic,
PointerSize);
auto LeftoverOffsetValue = LeftoverOffset.BaseOffset.getSExtValue();
auto AddOperandValue = Builder.create<ImmediateOp>(PointerToReplaceLoc,
IntegerType,
IntPtrType,
LeftoverOffsetValue);
CurrentValue = Builder.create<AddOp>(PointerToReplaceLoc,
CurrentValue,
@@ -395,12 +394,12 @@ bool Replacement::replace(ExpressionOpInterface PointerToReplace,
for (const auto &Term : LeftoverOffset.LinearCombination) {
// Multiply stride by index
auto IndexValue = Builder.create<ImmediateOp>(PointerToReplaceLoc,
IntegerType,
IntPtrType,
Term.Idx.Constant
.getSExtValue());
auto StrideValue = Builder
.create<ImmediateOp>(PointerToReplaceLoc,
IntegerType,
IntPtrType,
Term.Stride.getSExtValue());
auto StridedValue = Builder.create<clift::MulOp>(PointerToReplaceLoc,
IndexValue,
@@ -411,7 +410,7 @@ bool Replacement::replace(ExpressionOpInterface PointerToReplace,
}
// Cast back to pointer
auto PointerType = PointerType::get(CurrentValue.getType(), PointerSize);
auto PointerType = PointerType::get(IntPtrType, PointerSize);
CurrentValue = Builder.create<BitCastOp>(PointerToReplaceLoc,
PointerType,
CurrentValue);