Skip to content

Fix bad merge of the interpreter code #114233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 3, 2025
Merged

Fix bad merge of the interpreter code #114233

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/coreclr/interpreter/compiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,9 +1969,9 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
int64_t val = getI8LittleEndian(m_ip + 1);
AddIns(INTOP_LDC_I8);
PushInterpType(InterpTypeI8, NULL);
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
m_pLastIns->data[0] = (int32_t)val;
m_pLastIns->data[1] = (int32_t)(val >> 32);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
m_pLastNewIns->data[0] = (int32_t)val;
m_pLastNewIns->data[1] = (int32_t)(val >> 32);
m_ip += 9;
break;
}
Expand All @@ -1980,8 +1980,8 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
int32_t val = getI4LittleEndian(m_ip + 1);
AddIns(INTOP_LDC_R4);
PushInterpType(InterpTypeR4, NULL);
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
m_pLastIns->data[0] = val;
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
m_pLastNewIns->data[0] = val;
m_ip += 5;
break;
}
Expand All @@ -1990,9 +1990,9 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
int64_t val = getI8LittleEndian(m_ip + 1);
AddIns(INTOP_LDC_R8);
PushInterpType(InterpTypeR8, NULL);
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
m_pLastIns->data[0] = (int32_t)val;
m_pLastIns->data[1] = (int32_t)(val >> 32);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
m_pLastNewIns->data[0] = (int32_t)val;
m_pLastNewIns->data[1] = (int32_t)(val >> 32);
m_ip += 9;
break;
}
Expand All @@ -2011,8 +2011,8 @@ int InterpCompiler::GenerateCode(CORINFO_METHOD_INFO* methodInfo)
// str should be forever pinned, so we can include its ref inside interpreter code
AddIns(INTOP_LDPTR);
PushInterpType(InterpTypeO, m_compHnd->getBuiltinClass(CLASSID_STRING));
m_pLastIns->SetDVar(m_pStackPointer[-1].var);
m_pLastIns->data[0] = GetDataItemIndex(str);
m_pLastNewIns->SetDVar(m_pStackPointer[-1].var);
m_pLastNewIns->data[0] = GetDataItemIndex(str);
m_ip += 5;
break;
}
Expand Down
Loading