Skip to content

More cleanups in assembly loader area #63157

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
VSadov merged 25 commits into from
Jan 29, 2022
Merged

More cleanups in assembly loader area #63157

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
7c3b570
GetManifestFile() --> GetPEAssembly()
VSadov Dec 24, 2021
1bfed85
GetManifestImport() -> GetMDImport()
VSadov Dec 24, 2021
b99316e
removed GetCurrentAssembly(), GetLoadedAssembly()
VSadov Dec 24, 2021
b907403
removed GetCurrentModule(), GetLoadedModule()
VSadov Dec 24, 2021
0f1c732
fix
VSadov Dec 25, 2021
82f2ffa
removed DomainFile::ModuleIterator
VSadov Dec 25, 2021
bc797ba
renamed Assembly::GetManifestModule() --> GetModule()
VSadov Dec 25, 2021
f7dae8d
Removed Assembly::ModuleIterator
VSadov Dec 27, 2021
d02dc08
move most fields off DomainAssembly
VSadov Dec 28, 2021
0248e3a
DomainAssembly is a complete proxy
VSadov Dec 28, 2021
c793d4e
some DomainFile --> DomainAssembly renames.
VSadov Dec 28, 2021
c5df253
deleted DomainFile class
VSadov Dec 28, 2021
04b7e7e
renamed files
VSadov Dec 28, 2021
2365789
a few minor cleanups
VSadov Dec 28, 2021
987aa5d
DomainAssembly does not need to have VPTR_. Couple other changes.
VSadov Dec 30, 2021
0c7926f
More DomainFile --> DomainAssembly renames
VSadov Dec 30, 2021
b359988
More DomainFile --> DomainAssembly renames
VSadov Dec 30, 2021
4359b0e
a few more renames
VSadov Dec 30, 2021
91a5f93
removed domainassembly.inl
VSadov Dec 30, 2021
9222df3
domainassembly.h cleanup
VSadov Dec 30, 2021
8ea72ed
make gcc happy
VSadov Dec 30, 2021
ca767c1
couple more changes
VSadov Jan 11, 2022
47db770
fixed build after rebasing
VSadov Jan 21, 2022
be348b9
PR feedback
VSadov Jan 26, 2022
0caa838
more PR feedback
VSadov Jan 27, 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
Prev Previous commit
Next Next commit
PR feedback
  • Loading branch information
@VSadov
VSadov committed Jan 26, 2022
commit be348b9218e43d34ea51b243030cab6adc725c91
6 changes: 0 additions & 6 deletions src/coreclr/debug/ee/debugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14725,12 +14725,6 @@ HRESULT Debugger::IterateAppDomainsForPdbs()
if (!pDomainAssembly->IsVisibleToDebugger())
continue;

if (pDomainAssembly->ShouldNotifyDebugger())
{
Module* pRuntimeModule = pDomainAssembly->GetModule();
CopyModulePdb(pRuntimeModule);
}

if (pDomainAssembly->ShouldNotifyDebugger())
{
CopyModulePdb(pDomainAssembly->GetModule());
Expand Down
4 changes: 1 addition & 3 deletions src/coreclr/debug/inc/dbgipcevents.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,6 @@ typedef VMPTR_Base<DT_CONTEXT, void > VMPTR_CONTEXT;
DEFINE_VMPTR(class DomainAssembly, PTR_DomainAssembly, VMPTR_DomainAssembly);
DEFINE_VMPTR(class Module, PTR_Module, VMPTR_Module);

// DomainAssembly derives from DomainAssembly and represents a manifest module.
DEFINE_VMPTR(class DomainAssembly, PTR_DomainAssembly, VMPTR_DomainAssembly);
DEFINE_VMPTR(class Assembly, PTR_Assembly, VMPTR_Assembly);

DEFINE_VMPTR(class PEAssembly, PTR_PEAssembly, VMPTR_PEAssembly);
Expand Down Expand Up @@ -1679,7 +1677,7 @@ struct MSLAYOUT DebuggerIPCE_FuncEvalInfo
DebuggerIPCE_FuncEvalType funcEvalType;
mdMethodDef funcMetadataToken;
mdTypeDef funcClassMetadataToken;
VMPTR_DomainAssembly vmDomainAssembly;
VMPTR_DomainAssembly vmDomainAssembly;
RSPTR_CORDBEVAL funcEvalKey;
bool evalDuringException;

Expand Down
Loading