diff options
author | Swaroop Sridhar <Swaroop.Sridhar@microsoft.com> | 2016-07-21 04:10:02 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-07-21 04:10:02 -0700 |
commit | d1697c6f8b6e6d1f06b4d734fabd3b328e1dc724 (patch) | |
tree | 4cb536b527847fe2067cdd71c13acd4bbfd3cbdf /src/vm/gcinfodecoder.cpp | |
parent | 4ba6e7418e6a34ffa7b8ba91cb10e004d30d803f (diff) | |
download | coreclr-d1697c6f8b6e6d1f06b4d734fabd3b328e1dc724.tar.gz coreclr-d1697c6f8b6e6d1f06b4d734fabd3b328e1dc724.tar.bz2 coreclr-d1697c6f8b6e6d1f06b4d734fabd3b328e1dc724.zip |
Remove DBG GcInfo encoder/decoder (#6374)
This change removes the redundant set of GcInfo encoder/decoder
in the CoreCLR tree called Debug encoder/decoders.
These components are expected to be are well-tested versions
for verification, but are not actively used.
They cause additional overhead wrt maintaining two versions of
GcInfo encoder/decoder as GcInfo format changes.
Diffstat (limited to 'src/vm/gcinfodecoder.cpp')
-rw-r--r-- | src/vm/gcinfodecoder.cpp | 55 |
1 files changed, 1 insertions, 54 deletions
diff --git a/src/vm/gcinfodecoder.cpp b/src/vm/gcinfodecoder.cpp index b2f5640331..351e221d82 100644 --- a/src/vm/gcinfodecoder.cpp +++ b/src/vm/gcinfodecoder.cpp @@ -87,11 +87,7 @@ GcInfoDecoder::GcInfoDecoder( GcInfoDecoderFlags flags, UINT32 breakOffset ) - : m_Reader(dac_cast<PTR_CBYTE>(gcInfoToken.Info) -#ifdef VERIFY_GCINFO - + sizeof(size_t) -#endif - ) + : m_Reader(dac_cast<PTR_CBYTE>(gcInfoToken.Info)) , m_InstructionOffset(breakOffset) , m_IsInterruptible(false) #ifdef _DEBUG @@ -99,14 +95,6 @@ GcInfoDecoder::GcInfoDecoder( , m_GcInfoAddress(dac_cast<PTR_CBYTE>(gcInfoToken.Info)) , m_Version(gcInfoToken.Version) #endif -#ifdef VERIFY_GCINFO - , m_DbgDecoder(dac_cast<PTR_CBYTE>(gcInfoToken.Info) + - (((UINT32)((PTR_BYTE)(TADDR)gcInfoToken.Info)[3])<<24)+ - (((UINT32)((PTR_BYTE)(TADDR)gcInfoToken.Info)[2])<<16)+ - (((UINT32)((PTR_BYTE)(TADDR)gcInfoToken.Info)[1])<<8)+ - ((PTR_BYTE)(TADDR)gcInfoAddr)[0], - flags, breakOffset) -#endif { _ASSERTE( (flags & (DECODE_INTERRUPTIBILITY | DECODE_GC_LIFETIMES)) || (0 == breakOffset) ); @@ -320,30 +308,6 @@ GcInfoDecoder::GcInfoDecoder( { EnumerateInterruptibleRanges(&SetIsInterruptibleCB, this); } - -#ifdef VERIFY_GCINFO -#if 0 - if(flags & DECODE_INTERRUPTIBILITY) - _ASSERTE(IsInterruptible() == m_DbgDecoder.IsInterruptible()); -#endif - if(flags & DECODE_SECURITY_OBJECT) - _ASSERTE(GetSecurityObjectStackSlot() == m_DbgDecoder.GetSecurityObjectStackSlot()); - if(flags & DECODE_GENERICS_INST_CONTEXT) - { - _ASSERTE(GetGenericsInstContextStackSlot() == m_DbgDecoder.GetGenericsInstContextStackSlot()); - _ASSERTE(GetPSPSymStackSlot() == m_DbgDecoder.GetPSPSymStackSlot()); - } - if(flags & DECODE_VARARG) - _ASSERTE(GetIsVarArg() == m_DbgDecoder.GetIsVarArg()); - if(flags & DECODE_CODE_LENGTH) - _ASSERTE(GetCodeLength() == m_DbgDecoder.GetCodeLength()); - _ASSERTE(GetStackBaseRegister() == m_DbgDecoder.GetStackBaseRegister()); - _ASSERTE(GetSizeOfEditAndContinuePreservedArea() == m_DbgDecoder.GetSizeOfEditAndContinuePreservedArea()); -#ifdef FIXED_STACK_PARAMETER_SCRATCH_AREA - _ASSERTE(GetSizeOfStackParameterArea() == m_DbgDecoder.GetSizeOfStackParameterArea()); -#endif -#endif - } bool GcInfoDecoder::IsInterruptible() @@ -587,16 +551,6 @@ bool GcInfoDecoder::EnumerateLiveSlots( return true; } -#ifdef VERIFY_GCINFO - m_DbgDecoder.EnumerateLiveSlots( - pRD, - reportScratchSlots, - inputFlags, - pCallBack, - hCallBack - ); -#endif - // // If this is a non-leaf frame and we are executing a call, the unwinder has given us the PC // of the call instruction. We should adjust it to the PC of the instruction after the call in order to @@ -1073,13 +1027,6 @@ ReportUntracked: ExitSuccess: #endif -#ifdef VERIFY_GCINFO -#ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED - if(!executionAborted) -#endif - m_DbgDecoder.DoFinalVerification(); -#endif - return true; } |