9745: Do not restrict Field tag in return opcode

AztecProtocol · Nov 12, 2024 · a22da27 · a22da27
1 parent 9e6c19c
commit a22da27
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 2 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp
@@ -3050,7 +3050,6 @@ ReturnDataError AvmTraceBuilder::op_return(uint8_t indirect, uint32_t ret_offset
 
     bool op_valid = tag_match && check_tag(AvmMemoryTag::U32, resolved_ret_size_offset);
     const auto ret_size = static_cast<uint32_t>(unconstrained_read_from_memory(resolved_ret_size_offset));
-    op_valid = op_valid && check_tag_range(AvmMemoryTag::FF, resolved_ret_offset, ret_size);
 
     gas_trace_builder.constrain_gas(clk, OpCode::RETURN, ret_size);
 

diff --git a/yarn-project/simulator/src/avm/opcodes/external_calls.ts b/yarn-project/simulator/src/avm/opcodes/external_calls.ts
@@ -157,7 +157,6 @@ export class Return extends Instruction {
     const returnSize = memory.get(returnSizeOffset).toNumber();
     context.machineState.consumeGas(this.gasCost(returnSize));
 
-    memory.checkTagsRange(TypeTag.FIELD, returnOffset, returnSize);
     const output = memory.getSlice(returnOffset, returnSize).map(word => word.toFr());
 
     context.machineState.return(output);