Add a few #if... FEATURE_EMULATE_SINGLESTEP (dotnet/coreclr#25637)

When the feature flag was added a few places were missed

Commit migrated from https://github.com/dotnet/coreclr/commit/ec253c38768bdbac40e07c1de3e43a91ff6f226c

diff --git a/src/coreclr/src/debug/daccess/dacdbiimpl.cpp b/src/coreclr/src/debug/daccess/dacdbiimpl.cpp
index 4ef3bc7b20b65c728c12cfb8260299a1e51e8f54..7f207f239021f1609e23289bbf4fd2e2da2ba06e 100644 (file)
--- a/src/coreclr/src/debug/daccess/dacdbiimpl.cpp
+++ b/src/coreclr/src/debug/daccess/dacdbiimpl.cpp
@@ -5241,7 +5241,7 @@ void DacDbiInterfaceImpl::Hijack(
     // is automatically turned off.
     //
     // The debugger could always re-enable the single-step flag if it wants to.    
-#ifndef _TARGET_ARM_
+#ifndef FEATURE_EMULATE_SINGLESTEP
     UnsetSSFlag(reinterpret_cast<DT_CONTEXT *>(&ctx)); 
 #endif
 

diff --git a/src/coreclr/src/debug/ee/controller.h b/src/coreclr/src/debug/ee/controller.h
index 7172662f4840775a08be05f9043908e83273b2fb..545fabd4439e344abf7c4b772f5f053a1f20bc2c 100644 (file)
--- a/src/coreclr/src/debug/ee/controller.h
+++ b/src/coreclr/src/debug/ee/controller.h
@@ -426,7 +426,7 @@ private:
         DebuggerJitInfo        *dji; // used for Slave and native patches, though only when tracking JIT Info
     };
 
-#ifndef _TARGET_ARM_
+#ifndef FEATURE_EMULATE_SINGLESTEP
     // this is shared among all the skippers for this controller. see the comments
     // right before the definition of SharedPatchBypassBuffer for lifetime info.
     SharedPatchBypassBuffer* m_pSharedPatchBypassBuffer;
@@ -530,7 +530,7 @@ public:
     // Is this patch at a position at which it's safe to take a stack?
     bool IsSafeForStackTrace();
 
-#ifndef _TARGET_ARM_
+#ifndef FEATURE_EMULATE_SINGLESTEP
     // gets a pointer to the shared buffer
     SharedPatchBypassBuffer* GetOrCreateSharedPatchBypassBuffer();
 
@@ -1456,7 +1456,7 @@ class DebuggerPatchSkip : public DebuggerController
     CORDB_ADDRESS_TYPE      *m_address;
     int                      m_iOrigDisp;        // the original displacement of a relative call or jump
     InstructionAttribute     m_instrAttrib;      // info about the instruction being skipped over
-#ifndef _TARGET_ARM_
+#ifndef FEATURE_EMULATE_SINGLESTEP
     // this is shared among all the skippers and the controller. see the comments
     // right before the definition of SharedPatchBypassBuffer for lifetime info.
     SharedPatchBypassBuffer *m_pSharedPatchBypassBuffer;