From e36431719109208cdc56d3e98ac9deb859e13b2a Mon Sep 17 00:00:00 2001
From: Jonghyun Park <parjong@gmail.com>
Date: Wed, 2 Aug 2017 12:05:34 +0900
Subject: Resolve FEATURE_GDBJIT/FEATURE_INTERPRETER conflict

---
 src/vm/prestub.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'src/vm/prestub.cpp')

diff --git a/src/vm/prestub.cpp b/src/vm/prestub.cpp
index e7014bef87..8f72d23b93 100644
--- a/src/vm/prestub.cpp
+++ b/src/vm/prestub.cpp
@@ -795,9 +795,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
@@ -822,8 +826,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;
 }
-- 
cgit v1.2.3