- 
                Notifications
    You must be signed in to change notification settings 
- Fork 5.2k
Rework unloadability fix #68550
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.
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
                    Rework unloadability fix #68550
Changes from all commits
      Commits
    
    
            Show all changes
          
          
            6 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      c05b0b8
              
                Rework the unloadability fix
              
              
                janvorli 83f0172
              
                Use LoaderAllocator from binder only
              
              
                janvorli d833894
              
                Pass binder instead of LoaderAllocator
              
              
                janvorli 08c9fb2
              
                Move clearing of the m_pAssemblyLoaderAllocator to a later stage
              
              
                janvorli 97956f5
              
                Throw exception on collectible assembly in non-collectible ALC
              
              
                janvorli e5a73df
              
                Update the ResolvedFromDifferentContext test
              
              
                janvorli File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
There are no files selected for viewing
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              | Original file line number | Diff line number | Diff line change | 
|---|---|---|
|  | @@ -30,6 +30,7 @@ | |
| extern HRESULT RuntimeInvokeHostAssemblyResolver(INT_PTR pManagedAssemblyLoadContextToBindWithin, | ||
| BINDER_SPACE::AssemblyName *pAssemblyName, | ||
| DefaultAssemblyBinder *pDefaultBinder, | ||
| AssemblyBinder *pBinder, | ||
| BINDER_SPACE::Assembly **ppLoadedAssembly); | ||
|  | ||
| #endif // !defined(DACCESS_COMPILE) | ||
|  | @@ -1153,9 +1154,10 @@ namespace BINDER_SPACE | |
|  | ||
| #if !defined(DACCESS_COMPILE) | ||
| HRESULT AssemblyBinderCommon::BindUsingHostAssemblyResolver(/* in */ INT_PTR pManagedAssemblyLoadContextToBindWithin, | ||
| There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We can probably do some cleanup around just getting the managed ALC pointer from the AssemblyBinder now that we have the binder - after this change goes in, since we want to backport this. | ||
| /* in */ AssemblyName *pAssemblyName, | ||
| /* in */ AssemblyName *pAssemblyName, | ||
| /* in */ DefaultAssemblyBinder *pDefaultBinder, | ||
| /* out */ Assembly **ppAssembly) | ||
| /* in */ AssemblyBinder *pBinder, | ||
| /* out */ Assembly **ppAssembly) | ||
| { | ||
| HRESULT hr = E_FAIL; | ||
|  | ||
|  | @@ -1164,7 +1166,7 @@ HRESULT AssemblyBinderCommon::BindUsingHostAssemblyResolver(/* in */ INT_PTR pMa | |
| // RuntimeInvokeHostAssemblyResolver will perform steps 2-4 of CustomAssemblyBinder::BindAssemblyByName. | ||
| BINDER_SPACE::Assembly *pLoadedAssembly = NULL; | ||
| hr = RuntimeInvokeHostAssemblyResolver(pManagedAssemblyLoadContextToBindWithin, | ||
| pAssemblyName, pDefaultBinder, &pLoadedAssembly); | ||
| pAssemblyName, pDefaultBinder, pBinder, &pLoadedAssembly); | ||
| if (SUCCEEDED(hr)) | ||
| { | ||
| _ASSERTE(pLoadedAssembly != NULL); | ||
|  | ||
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  
    
      This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
      Learn more about bidirectional Unicode characters
    
  
  
    
              
  Add this suggestion to a batch that can be applied as a single commit.
  This suggestion is invalid because no changes were made to the code.
  Suggestions cannot be applied while the pull request is closed.
  Suggestions cannot be applied while viewing a subset of changes.
  Only one suggestion per line can be applied in a batch.
  Add this suggestion to a batch that can be applied as a single commit.
  Applying suggestions on deleted lines is not supported.
  You must change the existing code in this line in order to create a valid suggestion.
  Outdated suggestions cannot be applied.
  This suggestion has been applied or marked resolved.
  Suggestions cannot be applied from pending reviews.
  Suggestions cannot be applied on multi-line comments.
  Suggestions cannot be applied while the pull request is queued to merge.
  Suggestion cannot be applied right now. Please check back later.
  
    
  
    
Uh oh!
There was an error while loading. Please reload this page.