Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Remove empty lines caused by empty fusion log string #27471

Merged
2 commits merged into from
Oct 27, 2019
Merged

Conversation

danmoseley
Copy link
Member

Fusion Logs are not relevant to CoreCLR (as far as I know). Pass null, not empty string, to the FileLoadException. (It was causing extra lines in the exception output.)

@jkotas
Copy link
Member

jkotas commented Oct 27, 2019

@vitek-karas @elinor-fung Does this interact with the assembly loader tracing improvements?

src/vm/clrex.cpp Outdated
@@ -1850,7 +1845,7 @@ OBJECTREF EEFileLoadException::CreateThrowable()
ARG_SLOT args[] = {
ObjToArgSlot(gc.pNewException),
ObjToArgSlot(gc.pNewFileString),
ObjToArgSlot(gc.pFusLogString),
NULL,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you wanted to, you can go one step further and delete the string? fusionLog argument from the constructor in FileLoadException.CoreCLR.cs, BadImageFormatException.CoreCLR.cs and FileNotFoundException.CoreCLR.cs and not pass this NULL here at all. (It would also need changing gsig_IM_Str_Str_Int_RetVoid a few lines above to gsig_IM_Str_Int_RetVoid.)

Copy link
Member

@vitek-karas vitek-karas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think there's any interaction with the binder tracing changes, now or in the future.

@danmoseley danmoseley added the auto-merge Automatically merge PR once CI passes. label Oct 27, 2019
@ghost
Copy link

ghost commented Oct 27, 2019

Hello @danmosemsft!

Because this pull request has the auto-merge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

@ghost ghost merged commit 7cdde63 into dotnet:master Oct 27, 2019
@danmoseley danmoseley deleted the fuslog branch February 10, 2020 02:26
This pull request was closed.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
auto-merge Automatically merge PR once CI passes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants