projects
/
platform
/
upstream
/
dotnet
/
runtime.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c727a41
)
Fix jit build break (#32927)
author
Andy Ayers
<andya@microsoft.com>
Thu, 27 Feb 2020 20:40:59 +0000
(12:40 -0800)
committer
GitHub
<noreply@github.com>
Thu, 27 Feb 2020 20:40:59 +0000
(12:40 -0800)
Two changes to codegencommon.cpp were merged in short order, and
git/github did not spot the merge conflict.
Fixes #32926.
src/coreclr/src/jit/codegencommon.cpp
patch
|
blob
|
history
diff --git
a/src/coreclr/src/jit/codegencommon.cpp
b/src/coreclr/src/jit/codegencommon.cpp
index
7da93af
..
2de0553
100644
(file)
--- a/
src/coreclr/src/jit/codegencommon.cpp
+++ b/
src/coreclr/src/jit/codegencommon.cpp
@@
-11304,11
+11304,11
@@
void CodeGenInterface::VariableLiveKeeper::VariableLiveRange::dumpVariableLiveRa
{
codeGen->dumpSiVarLoc(&m_VarLocation);
printf(" [ ");
- m_StartEmitLocation.Print();
+ m_StartEmitLocation.Print(
codeGen->GetCompiler()->compMethodID
);
printf(", ");
if (m_EndEmitLocation.Valid())
{
- m_EndEmitLocation.Print();
+ m_EndEmitLocation.Print(
codeGen->GetCompiler()->compMethodID
);
}
else
{