Skip to content

Commit 6f23aaf

Browse files
authored
Fix bad merge of the interpreter code (#114233)
There were two changes merged after their ci runs completed where one has renamed a variable used in the compiler.cpp and the other has added few new usages of the variable with the old name. This change fixes it.
1 parent 9e8a9e9 commit 6f23aaf

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/coreclr/interpreter/compiler.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1969,9 +1969,9 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
19691969
int64_t val = getI8LittleEndian(m_ip + 1);
19701970
AddIns(INTOP_LDC_I8);
19711971
PushInterpType(InterpTypeI8, NULL);
1972-
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
1973-
m_pLastIns->data[0] = (int32_t)val;
1974-
m_pLastIns->data[1] = (int32_t)(val >> 32);
1972+
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
1973+
m_pLastNewIns->data[0] = (int32_t)val;
1974+
m_pLastNewIns->data[1] = (int32_t)(val >> 32);
19751975
m_ip += 9;
19761976
break;
19771977
}
@@ -1980,8 +1980,8 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
19801980
int32_t val = getI4LittleEndian(m_ip + 1);
19811981
AddIns(INTOP_LDC_R4);
19821982
PushInterpType(InterpTypeR4, NULL);
1983-
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
1984-
m_pLastIns->data[0] = val;
1983+
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
1984+
m_pLastNewIns->data[0] = val;
19851985
m_ip += 5;
19861986
break;
19871987
}
@@ -1990,9 +1990,9 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
19901990
int64_t val = getI8LittleEndian(m_ip + 1);
19911991
AddIns(INTOP_LDC_R8);
19921992
PushInterpType(InterpTypeR8, NULL);
1993-
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
1994-
m_pLastIns->data[0] = (int32_t)val;
1995-
m_pLastIns->data[1] = (int32_t)(val >> 32);
1993+
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
1994+
m_pLastNewIns->data[0] = (int32_t)val;
1995+
m_pLastNewIns->data[1] = (int32_t)(val >> 32);
19961996
m_ip += 9;
19971997
break;
19981998
}
@@ -2011,8 +2011,8 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
20112011
// str should be forever pinned, so we can include its ref inside interpreter code
20122012
AddIns(INTOP_LDPTR);
20132013
PushInterpType(InterpTypeO, m_compHnd->getBuiltinClass(CLASSID_STRING));
2014-
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
2015-
m_pLastIns->data[0] = GetDataItemIndex(str);
2014+
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
2015+
m_pLastNewIns->data[0] = GetDataItemIndex(str);
20162016
m_ip += 5;
20172017
break;
20182018
}

0 commit comments

Comments
 (0)