Skip to content

Fix issue with GDBJIT: moving NotifyGdb call to other function #33963

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
1 commit merged into from
Mar 25, 2020
Merged

Fix issue with GDBJIT: moving NotifyGdb call to other function #33963

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Fix issue with GDBJIT: moving NotifyGdb call to other function 
This commit moves call to NotifyGdb::MethodPrepared from
MethodDesc::PrepareInitialCode to MethodDesc::PrepareCode.

Previously NotifyGdb::MethodPrepared might be not called
in few cases.

This commit fixes #33962.
  • Loading branch information
@0xfk0
0xfk0 committed Mar 23, 2020
commit c3ecb4a019e36a1b1fcc36c259ed333ba1be5ec9
16 changes: 8 additions & 8 deletions src/coreclr/src/vm/prestub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,13 +319,7 @@ PCODE MethodDesc::PrepareInitialCode(CallerGCMode callerGCMode)
STANDARD_VM_CONTRACT;
PrepareCodeConfig config(NativeCodeVersion(this), TRUE, TRUE);
config.SetCallerGCMode(callerGCMode);
PCODE pCode = PrepareCode(&config);

#if defined(FEATURE_GDBJIT) && defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE)
NotifyGdb::MethodPrepared(this);
#endif

return pCode;
return PrepareCode(&config);
}

PCODE MethodDesc::PrepareCode(PrepareCodeConfig* pConfig)
Expand All @@ -335,7 +329,13 @@ PCODE MethodDesc::PrepareCode(PrepareCodeConfig* pConfig)
// If other kinds of code need multi-versioning we could add more cases here,
// but for now generation of all other code/stubs occurs in other code paths
_ASSERTE(IsIL() || IsNoMetadata());
return PrepareILBasedCode(pConfig);
PCODE pCode = PrepareILBasedCode(pConfig);

#if defined(FEATURE_GDBJIT) && defined(TARGET_UNIX) && !defined(CROSSGEN_COMPILE)
NotifyGdb::MethodPrepared(this);
#endif

return pCode;
}

bool MayUsePrecompiledILStub()
Expand Down