@@ -2193,8 +2193,7 @@ pub fn iseq_to_hir(iseq: *const rb_iseq_t) -> Result<Function, ParseError> {
21932193 let id = ID ( get_arg ( pc, 0 ) . as_u64 ( ) ) ;
21942194 let pushval = get_arg ( pc, 2 ) ;
21952195 let exit_id = fun. push_insn ( block, Insn :: Snapshot { state : exit_state } ) ;
2196- let self_val = fun. push_insn ( block, Insn :: PutSelf ) ;
2197- state. stack_push ( fun. push_insn ( block, Insn :: DefinedIvar { self_val, id, pushval, state : exit_id } ) ) ;
2196+ state. stack_push ( fun. push_insn ( block, Insn :: DefinedIvar { self_val : self_param, id, pushval, state : exit_id } ) ) ;
21982197 }
21992198 YARVINSN_opt_getconstant_path => {
22002199 let ic = get_arg ( pc, 0 ) . as_ptr ( ) ;
@@ -3029,9 +3028,8 @@ mod tests {
30293028 " ) ;
30303029 assert_method_hir_with_opcode ( "test" , YARVINSN_definedivar , expect ! [ [ r#"
30313030 fn test:
3032- bb0():
3033- v2:BasicObject = PutSelf
3034- v3:BasicObject = DefinedIvar v2, :@foo
3031+ bb0(v0:BasicObject):
3032+ v3:BasicObject = DefinedIvar v0, :@foo
30353033 Return v3
30363034 "# ] ] ) ;
30373035 }
@@ -3043,14 +3041,13 @@ mod tests {
30433041 " ) ;
30443042 assert_method_hir_with_opcode ( "test" , YARVINSN_defined , expect ! [ [ r#"
30453043 fn test:
3046- bb0():
3047- v1:NilClassExact = Const Value(nil)
3048- v2:BasicObject = Defined constant, v1
3049- v3:BasicObject = PutSelf
3050- v4:BasicObject = Defined func, v3
3044+ bb0(v0:BasicObject):
3045+ v2:NilClassExact = Const Value(nil)
3046+ v3:BasicObject = Defined constant, v2
3047+ v4:BasicObject = Defined func, v0
30513048 v5:NilClassExact = Const Value(nil)
30523049 v6:BasicObject = Defined global-variable, v5
3053- v8:ArrayExact = NewArray v2 , v4, v6
3050+ v8:ArrayExact = NewArray v3 , v4, v6
30543051 Return v8
30553052 "# ] ] ) ;
30563053 }
0 commit comments