diff options
| author | Noah Falk <noahfalk@users.noreply.github.com> | 2017-08-02 14:06:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 14:06:21 -0700 |
| commit | 7c83f93be204a669f72a6ff39bafe1d3b38e06b5 (patch) | |
| tree | 1009c576456d23242cb524cbc6b7c2fee9f87e3d /src/vm/prestub.cpp | |
| parent | d68faa30b16fb66addc9aa8b53d571dfa9fdf7be (diff) | |
| parent | e36431719109208cdc56d3e98ac9deb859e13b2a (diff) | |
| download | coreclr-7c83f93be204a669f72a6ff39bafe1d3b38e06b5.tar.gz coreclr-7c83f93be204a669f72a6ff39bafe1d3b38e06b5.tar.bz2 coreclr-7c83f93be204a669f72a6ff39bafe1d3b38e06b5.zip | |
Merge pull request #13158 from parjong/fix/INTERPERTER_GDBJIT_Conflict
Resolve FEATURE_GDBJIT/FEATURE_INTERPRETER conflict
Diffstat (limited to 'src/vm/prestub.cpp')
| -rw-r--r-- | src/vm/prestub.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/vm/prestub.cpp b/src/vm/prestub.cpp index cc2ae6886a..2cc14166e4 100644 --- a/src/vm/prestub.cpp +++ b/src/vm/prestub.cpp @@ -787,9 +787,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J } #endif // PROFILING_SUPPORTED +#ifdef FEATURE_INTERPRETER + bool isJittedMethod = (Interpreter::InterpretationStubToMethodInfo(pCode) == NULL); +#endif + // Interpretted methods skip this notification #ifdef FEATURE_INTERPRETER - if (Interpreter::InterpretationStubToMethodInfo(pCode) == NULL) + if (isJittedMethod) #endif { #ifdef FEATURE_PERFMAP @@ -814,8 +818,13 @@ PCODE MethodDesc::JitCompileCodeLockedEventWrapper(PrepareCodeConfig* pConfig, J } #endif - // The notification will only occur if someone has registered for this method. - DACNotifyCompilationFinished(this); +#ifdef FEATURE_INTERPRETER + if (isJittedMethod) +#endif + { + // The notification will only occur if someone has registered for this method. + DACNotifyCompilationFinished(this); + } return pCode; } |