Introduce COMPlus_GDBJitEmitDebugFrame (#13515)

* Introduce COMPlus_GDBJitEmitDebugFrame * Use a proper #ifdef macro
dotnet · Aug 22, 2017 · aed0665 · aed0665
1 parent f0e8660
commit aed0665
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/src/inc/clrconfigvalues.h b/src/inc/clrconfigvalues.h
@@ -1059,6 +1059,9 @@ RETAIL_CONFIG_DWORD_INFO(INTERNAL_PerformanceTracing, W("PerformanceTracing"), 0
 // GDBJIT
 //
 CONFIG_STRING_INFO(INTERNAL_GDBJitElfDump, W("GDBJitElfDump"), "Dump ELF for specified method")
+#ifdef FEATURE_GDBJIT_FRAME
+RETAIL_CONFIG_DWORD_INFO(INTERNAL_GDBJitEmitDebugFrame, W("GDBJitEmitDebugFrame"), TRUE, "Enable .debug_frame generation")
+#endif
 #endif
 
 //

diff --git a/src/vm/eeconfig.cpp b/src/vm/eeconfig.cpp
@@ -385,6 +385,10 @@ HRESULT EEConfig::Init()
     pszGDBJitElfDump = NULL;
 #endif // FEATURE_GDBJIT && _DEBUG
 
+#if defined(FEATURE_GDBJIT_FRAME)
+    fGDBJitEmitDebugFrame = false;
+#endif
+
     // After initialization, register the code:#GetConfigValueCallback method with code:CLRConfig to let
     // CLRConfig access config files. This is needed because CLRConfig lives outside the VM and can't
     // statically link to EEConfig.
@@ -1248,6 +1252,9 @@ HRESULT EEConfig::sync()
     }
 #endif // FEATURE_GDBJIT && _DEBUG
 
+#if defined(FEATURE_GDBJIT_FRAME)
+    fGDBJitEmitDebugFrame = CLRConfig::GetConfigValue(CLRConfig::INTERNAL_GDBJitEmitDebugFrame) != 0;
+#endif
     return hr;
 }
 

diff --git a/src/vm/eeconfig.h b/src/vm/eeconfig.h
@@ -298,6 +298,9 @@ class EEConfig
     }
 #endif // FEATURE_GDBJIT && _DEBUG
 
+#if defined(FEATURE_GDBJIT_FRAME)
+    inline bool ShouldEmitDebugFrame(void) const {LIMITED_METHOD_CONTRACT; return fGDBJitEmitDebugFrame;}
+#endif // FEATURE_GDBJIT_FRAME
     BOOL PInvokeRestoreEsp(BOOL fDefault) const
     {
         LIMITED_METHOD_CONTRACT;
@@ -1114,6 +1117,9 @@ class EEConfig
     LPCUTF8 pszGDBJitElfDump;
 #endif // FEATURE_GDBJIT && _DEBUG
 
+#if defined(FEATURE_GDBJIT_FRAME)
+    bool fGDBJitEmitDebugFrame;
+#endif
 public:
 
     HRESULT GetConfiguration_DontUse_(__in_z LPCWSTR pKey, ConfigSearch direction, __deref_out_opt LPCWSTR* value);

diff --git a/src/vm/gdbjit.cpp b/src/vm/gdbjit.cpp
@@ -2468,6 +2468,7 @@ void NotifyGdb::OnMethodPrepared(MethodDesc* methodDescPtr)
     elfBuilder.Initialize(pCode, codeSize);
 
 #ifdef FEATURE_GDBJIT_FRAME
+    if (g_pConfig->ShouldEmitDebugFrame())
     {
         bool bEmitted = EmitFrameInfo(elfBuilder, pCode, codeSize);
         bNotify = bNotify || bEmitted;