From 3c3596e1b31afd8a5231209d804c77315b3abe1d Mon Sep 17 00:00:00 2001 From: Adam Stark Date: Mon, 26 Mar 2018 13:46:13 -0700 Subject: [PATCH] Only use FEATURE_PERFTRACING and FEATURE_EVENT_TRACE features when turned on (#17232) --- src/inc/eventtracebase.h | 2 +- src/vm/corhost.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/inc/eventtracebase.h b/src/inc/eventtracebase.h index c46cb8a..9437e60 100644 --- a/src/inc/eventtracebase.h +++ b/src/inc/eventtracebase.h @@ -611,7 +611,7 @@ namespace ETW #else // FEATURE_EVENT_TRACE public: static VOID MethodJitting(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL) {}; - static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, SIZE_T pCode = 0, ReJITID rejitID = 0) {}; + static VOID MethodJitted(MethodDesc *pMethodDesc, SString *namespaceOrClassName=NULL, SString *methodName=NULL, SString *methodSignature=NULL, SIZE_T pCode = 0, ReJITID rejitID = 0, BOOL bProfilerRejectedPrecompiledCode = FALSE, BOOL bReadyToRunRejectedPrecompiledCode = FALSE) {}; static VOID StubInitialized(ULONGLONG ullHelperStartAddress, LPCWSTR pHelperName) {}; static VOID StubsInitialized(PVOID *pHelperStartAddresss, PVOID *pHelperNames, LONG ulNoOfHelpers) {}; static VOID MethodRestored(MethodDesc * pMethodDesc) {}; diff --git a/src/vm/corhost.cpp b/src/vm/corhost.cpp index 2b67f19..810c45f 100644 --- a/src/vm/corhost.cpp +++ b/src/vm/corhost.cpp @@ -43,7 +43,9 @@ #endif // !FEATURE_PAL #include "stringarraylist.h" +#ifdef FEATURE_PERFTRACING #include "eventpipe.h" +#endif // FEATURE_PERFTRACING #ifdef FEATURE_COMINTEROP #include "winrttypenameconverter.h" @@ -370,7 +372,9 @@ void SetCommandLineArgs(LPCWSTR pwzAssemblyPath, int argc, LPCWSTR* argv) CONTRACTL_END; // Send the command line to EventPipe. +#ifdef FEATURE_PERFTRACING EventPipe::SaveCommandLine(pwzAssemblyPath, argc, argv); +#endif // FEATURE_PERFTRACING // Send the command line to System.Environment. struct _gc -- 2.7.4