Skip to content

[release/7.0] Fix ALC lookup from the DAC #78420

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 2 commits into from
Jan 4, 2023
Merged

[release/7.0] Fix ALC lookup from the DAC #78420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
321e198
Fix ALC lookup from the DAC
AaronRobinsonMSFT Nov 15, 2022
2ffbd4b
Update src/coreclr/vm/peassembly.cpp
AaronRobinsonMSFT Nov 15, 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
11 changes: 6 additions & 5 deletions src/coreclr/binder/inc/assembly.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#endif // !defined(DACCESS_COMPILE)

#include "bundle.h"
#include <assemblybinderutil.h>

class DomainAssembly;

Expand All @@ -50,7 +51,7 @@ namespace BINDER_SPACE
PEImage* GetPEImage();
BOOL GetIsInTPA();

inline AssemblyBinder* GetBinder()
PTR_AssemblyBinder GetBinder()
{
return m_pBinder;
}
Expand All @@ -70,21 +71,21 @@ namespace BINDER_SPACE
LONG m_cRef;
PEImage *m_pPEImage;
AssemblyName *m_pAssemblyName;
AssemblyBinder *m_pBinder;
PTR_AssemblyBinder m_pBinder;
bool m_isInTPA;
DomainAssembly *m_domainAssembly;

#if !defined(DACCESS_COMPILE)
inline void SetBinder(AssemblyBinder *pBinder)
{
_ASSERTE(m_pBinder == NULL || m_pBinder == pBinder);
m_pBinder = pBinder;
}

friend class ::DefaultAssemblyBinder;

#if !defined(DACCESS_COMPILE)
friend class ::CustomAssemblyBinder;
#endif // !defined(DACCESS_COMPILE)

friend class ::DefaultAssemblyBinder;
};

#include "assembly.inl"
Expand Down
6 changes: 2 additions & 4 deletions src/coreclr/vm/peassembly.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@
#include "strongnameinternal.h"

#include "../binder/inc/applicationcontext.hpp"

#include "assemblybinderutil.h"
#include "../binder/inc/assemblybindercommon.hpp"

#include "sha1.h"
Expand Down Expand Up @@ -1114,10 +1112,10 @@ PTR_AssemblyBinder PEAssembly::GetAssemblyBinder()

PTR_AssemblyBinder pBinder = NULL;

BINDER_SPACE::Assembly* pHostAssembly = GetHostAssembly();
PTR_BINDER_SPACE_Assembly pHostAssembly = GetHostAssembly();
if (pHostAssembly)
{
pBinder = dac_cast<PTR_AssemblyBinder>(pHostAssembly->GetBinder());
pBinder = pHostAssembly->GetBinder();
}
else
{
Expand Down