From 5e1a86395a959f9902d63c9504cdfc6cd07847a3 Mon Sep 17 00:00:00 2001 From: Brandon Miller Date: Tue, 15 Apr 2025 14:20:58 -0400 Subject: Cast on indexed array assignments in pseudo C/Rust --- lang/rust/pseudorust.cpp | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'lang/rust/pseudorust.cpp') diff --git a/lang/rust/pseudorust.cpp b/lang/rust/pseudorust.cpp index 1aeae158..80858658 100644 --- a/lang/rust/pseudorust.cpp +++ b/lang/rust/pseudorust.cpp @@ -1670,7 +1670,28 @@ void PseudoRustFunction::GetExprText(const HighLevelILInstruction& instr, HighLe } else { - GetExprText(srcExpr, tokens, settings, MemberAndFunctionOperatorPrecedence); + bool castedSrcExpr = false; + if ((!settings || settings->IsOptionSet(ShowTypeCasts)) && srcExpr.operation == HLIL_ARRAY_INDEX) + { + auto arrayIndexExpr = srcExpr.GetSourceExpr(); + if (arrayIndexExpr.operation == HLIL_VAR && + arrayIndexExpr.GetType()->GetChildType()->GetWidth() < instr.size) + { + tokens.Append(TextToken, "*"); + tokens.AppendOpenParen(); + tokens.Append(OperationToken, "&"); + GetExprText(srcExpr, tokens, settings, MemberAndFunctionOperatorPrecedence); + tokens.Append(KeywordToken, " as "); + tokens.Append(TextToken, "*"); + tokens.Append(KeywordToken, "mut "); + AppendSizeToken(instr.size, false, tokens); + tokens.AppendCloseParen(); + castedSrcExpr = true; + } + } + + if (!castedSrcExpr) + GetExprText(srcExpr, tokens, settings, MemberAndFunctionOperatorPrecedence); } AppendFieldTextTokens(srcExpr, fieldOffset, memberIndex, instr.size, tokens, false); -- cgit v1.3.1