Merge pull request #4607 from a7ehuo/3585-methodTracingReduction-m

Remove enter/exit tracing methods
eclipse-openj9 · Feb 7, 2019 · 3ce077d · 3ce077d
2 parents 8114cc0 + cc8c401
commit 3ce077d
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 37 deletions.
diff --git a/runtime/compiler/env/VMJ9.cpp b/runtime/compiler/env/VMJ9.cpp
@@ -3415,18 +3415,6 @@ bool
     return VM_VMHelpers::methodBeingTraced(_jitConfig->javaVM, (J9Method *)method);
     }
 
-bool
-TR_J9VMBase::isMethodEnterTracingEnabled(TR_OpaqueMethodBlock *method)
-   {
-   return isMethodTracingEnabled(method);
-   }
-
-bool
-TR_J9VMBase::isMethodExitTracingEnabled(TR_OpaqueMethodBlock *method)
-   {
-   return isMethodTracingEnabled(method);
-   }
-
 bool
 TR_J9VMBase::isSelectiveMethodEnterExitEnabled()
    {
@@ -8446,19 +8434,6 @@ TR_J9SharedCacheVM::isMethodTracingEnabled(TR_OpaqueMethodBlock *method)
    return TR_J9VMBase::isMethodTracingEnabled(method) || TR::Options::getAOTCmdLineOptions()->getOption(TR_EnableAOTMethodEnter) || TR::Options::getAOTCmdLineOptions()->getOption(TR_EnableAOTMethodExit);
    }
 
-bool
-TR_J9SharedCacheVM::isMethodEnterTracingEnabled(TR_OpaqueMethodBlock *method)
-   {
-   // We want to return the same answer as TR_J9VMBase unless we want to force it to allow tracing
-   return TR_J9VMBase::isMethodTracingEnabled(method) || TR::Options::getAOTCmdLineOptions()->getOption(TR_EnableAOTMethodEnter);
-   }
-
-bool
-TR_J9SharedCacheVM::isMethodExitTracingEnabled(TR_OpaqueMethodBlock *method)
-   {
-   return TR_J9VMBase::isMethodTracingEnabled(method) || TR::Options::getAOTCmdLineOptions()->getOption(TR_EnableAOTMethodExit);
-   }
-
 bool
 TR_J9SharedCacheVM::traceableMethodsCanBeInlined()
    {

diff --git a/runtime/compiler/env/VMJ9.h b/runtime/compiler/env/VMJ9.h
@@ -879,16 +879,6 @@ class TR_J9VMBase : public TR_FrontEnd
       {
       return isMethodTracingEnabled((TR_OpaqueMethodBlock *)j9method);
       }
-   virtual bool isMethodEnterTracingEnabled(TR_OpaqueMethodBlock *method);
-   virtual bool isMethodEnterTracingEnabled(J9Method *j9method)
-      {
-      return isMethodEnterTracingEnabled((TR_OpaqueMethodBlock *)j9method);
-      }
-   virtual bool isMethodExitTracingEnabled(TR_OpaqueMethodBlock *method);
-   virtual bool isMethodExitTracingEnabled(J9Method *j9method)
-      {
-      return isMethodExitTracingEnabled((TR_OpaqueMethodBlock *)j9method);
-      }
 
    virtual bool isSelectiveMethodEnterExitEnabled();
 
@@ -1128,8 +1118,6 @@ class TR_J9SharedCacheVM : public TR_J9VM
    virtual bool               stackWalkerMaySkipFrames(TR_OpaqueMethodBlock *method, TR_OpaqueClassBlock *methodClass);
 
    virtual bool               isMethodTracingEnabled(TR_OpaqueMethodBlock *method);
-   virtual bool               isMethodEnterTracingEnabled(TR_OpaqueMethodBlock *method);
-   virtual bool               isMethodExitTracingEnabled(TR_OpaqueMethodBlock *method);
    virtual bool               traceableMethodsCanBeInlined();
 
    virtual bool               canMethodEnterEventBeHooked();