Skip to content
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

Jump to bottom

Avoid reporting empty debug info ranges to the vm #77289

Merged
merged 16 commits into from
Nov 2, 2022
Merged

Avoid reporting empty debug info ranges to the vm #77289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
66d18e0
Removing empty variable live ranges
Oct 20, 2022
609605a
Extending variable live ranges in more cases
Oct 21, 2022
a11fd5d
Avoiding creating a new debug range when previous is empty
Oct 21, 2022
e8b102d
Updating check for empty debug ranges
Oct 21, 2022
7b79b0d
Updating print
Oct 21, 2022
4e1cf47
Avoiding printing twice variable live range
Oct 24, 2022
de1185d
Avoiding reporting empty variable ranges to the vm
Oct 24, 2022
861a028
Revert "Avoiding printing twice variable live range"
Oct 25, 2022
2717653
Revert "Updating print"
Oct 25, 2022
a6ad2b3
Revert "Updating check for empty debug ranges"
Oct 25, 2022
6d6f7a7
Revert "Avoiding creating a new debug range when previous is empty"
Oct 25, 2022
c4e4818
Revert "Extending variable live ranges in more cases"
Oct 25, 2022
4e5acdf
Revert "Removing empty variable live ranges"
Oct 25, 2022
8364689
Freeing vm memory when there is no debug info
Oct 28, 2022
719f9e4
Persisting JIT-EE contract on empty debug info
Oct 31, 2022
70fb789
Update src/coreclr/jit/ee_il_dll.cpp
BrianBohe Nov 1, 2022
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
7 changes: 5 additions & 2 deletions src/coreclr/jit/codegencommon.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6959,8 +6959,11 @@ void CodeGen::genSetScopeInfoUsingVariableRanges()
end++;
}

genSetScopeInfo(liveRangeIndex, start, end - start, varNum, varNum, true, loc);
liveRangeIndex++;
if (start < end)
{
genSetScopeInfo(liveRangeIndex, start, end - start, varNum, varNum, true, loc);
liveRangeIndex++;
}
};

siVarLoc* curLoc = nullptr;
Expand Down
8 changes: 7 additions & 1 deletion src/coreclr/jit/ee_il_dll.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -693,9 +693,15 @@ void Compiler::eeSetLVdone()
eeDispVars(info.compMethodHnd, eeVarsCount, (ICorDebugInfo::NativeVarInfo*)eeVars);
}
#endif // DEBUG
if ((eeVarsCount == 0) && (eeVars != nullptr))
{
// We still call setVars with nullptr when eeVarsCount is 0 as part of the contract.
// We also need to free the nonused memory.
info.compCompHnd->freeArray(eeVars);
eeVars = nullptr;
}

info.compCompHnd->setVars(info.compMethodHnd, eeVarsCount, (ICorDebugInfo::NativeVarInfo*)eeVars);

eeVars = nullptr; // We give up ownership after setVars()
}

Expand Down