Delete DISABLE_EH_VECTORS

1 files changed, 1 insertions, 98 deletions

diff --git a/src/vm/gcinfodecoder.cpp b/src/vm/gcinfodecoder.cpp
index ef237a2768..052cb4cff1 100644
--- a/src/vm/gcinfodecoder.cpp
+++ b/src/vm/gcinfodecoder.cpp
@@ -645,48 +645,6 @@ bool GcInfoDecoder::EnumerateLiveSlots(
 
 
 #ifdef PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED
-#ifndef DISABLE_EH_VECTORS
-    if(m_SafePointIndex < m_NumSafePoints || executionAborted)
-    {
-        // Skip interruptibility information
-        for(UINT32 i=0; i<m_NumInterruptibleRanges; i++)
-        {
-            m_Reader.DecodeVarLengthUnsigned( INTERRUPTIBLE_RANGE_DELTA1_ENCBASE );
-            m_Reader.DecodeVarLengthUnsigned( INTERRUPTIBLE_RANGE_DELTA2_ENCBASE );
-        }
-    }
-    else
-    {
-        //
-        // We didn't find the break offset in the list of call sites
-        //    and are not in an executionAborted frame
-        // So we must have fully-interruptible information
-        //
-        _ASSERTE(m_NumInterruptibleRanges);
-
-#ifdef _DEBUG
-        int dbgCountIntersections = 0;
-#endif
-        UINT32 lastNormStop = 0;
-        for(UINT32 i=0; i<m_NumInterruptibleRanges; i++)
-        {
-            UINT32 normStartDelta = (UINT32) m_Reader.DecodeVarLengthUnsigned( INTERRUPTIBLE_RANGE_DELTA1_ENCBASE );
-            UINT32 normStopDelta = (UINT32) m_Reader.DecodeVarLengthUnsigned( INTERRUPTIBLE_RANGE_DELTA2_ENCBASE ) + 1;
-
-            UINT32 normStart = lastNormStop + normStartDelta;
-            UINT32 normStop = normStart + normStopDelta;
-            if(normBreakOffset >= normStart && normBreakOffset < normStop)
-            {
-                _ASSERTE(pseudoBreakOffset == 0);
-                _ASSERTE(dbgCountIntersections++ == 0);
-                pseudoBreakOffset = numInterruptibleLength + normBreakOffset - normStart;
-            }
-            numInterruptibleLength += normStopDelta;
-            lastNormStop = normStop;
-        }        
-        _ASSERTE(dbgCountIntersections == 1);
-    }        
-#else // DISABLE_EH_VECTORS
     if(m_SafePointIndex < m_NumSafePoints && !executionAborted)
     {
         // Skip interruptibility information
@@ -736,7 +694,6 @@ bool GcInfoDecoder::EnumerateLiveSlots(
             goto ExitSuccess;
         }
     }        
-#endif // DISABLE_EH_VECTORS
 #else   // !PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED
 
     // Skip interruptibility information
@@ -778,52 +735,8 @@ bool GcInfoDecoder::EnumerateLiveSlots(
 
         if(executionAborted)
         {
-#ifndef DISABLE_EH_VECTORS
-            m_Reader.Skip(m_NumSafePoints * numSlots);
-
-            UINT32 numClauses = (UINT32) m_Reader.DecodeVarLengthUnsigned(NUM_EH_CLAUSES_ENCBASE);
-
-            if(numClauses)
-            {
-                UINT32 numBitsPerOffset = CeilOfLog2(NORMALIZE_CODE_OFFSET(m_CodeLength));
-                
-                for(UINT32 i = 0; i < numClauses; i++)
-                {
-                    UINT32 startOffset = (UINT32) DENORMALIZE_CODE_OFFSET(m_Reader.Read(numBitsPerOffset));
-                    UINT32 stopOffset = (UINT32) DENORMALIZE_CODE_OFFSET(m_Reader.Read(numBitsPerOffset) + 1);
-                    
-                    if(m_InstructionOffset >= startOffset 
-                        && m_InstructionOffset < stopOffset)
-                    {
-                        for(UINT32 slotIndex = 0; slotIndex < numSlots; slotIndex++)
-                        {
-                            if(m_Reader.ReadOneFast())
-                            {
-                                ReportSlotToGC(
-                                        slotDecoder,
-                                        slotIndex,
-                                        pRD,
-                                        reportScratchSlots,
-                                        inputFlags,
-                                        pCallBack,
-                                        hCallBack
-                                        );
-                            }
-                        }
-                    }
-                    else
-                    {
-                        m_Reader.Skip(numSlots);
-                    }
-                }
-            }
-            goto ReportUntracked;
-#else //DISABLE_EH_VECTORS
-
             _ASSERTE(m_NumSafePoints == 0);
             m_Reader.Skip(m_NumSafePoints * numSlots);
-
-#endif //DISABLE_EH_VECTORS
         }
         else if( m_SafePointIndex != m_NumSafePoints )
         {
@@ -891,15 +804,7 @@ bool GcInfoDecoder::EnumerateLiveSlots(
         else
         {
             m_Reader.Skip(m_NumSafePoints * numSlots);
-
-#ifndef DISABLE_EH_VECTORS
-            UINT32 numClauses = (UINT32) m_Reader.DecodeVarLengthUnsigned(NUM_EH_CLAUSES_ENCBASE);
-            UINT32 numBitsPerOffset = CeilOfLog2(NORMALIZE_CODE_OFFSET(m_CodeLength));
-
-            m_Reader.Skip((numBitsPerOffset * 2 + numSlots) * numClauses);
-#endif //DISABLE_EH_VECTORS
-        } 
-    
+        }
 #endif // PARTIALLY_INTERRUPTIBLE_GC_SUPPORTED
         
         _ASSERTE(m_NumInterruptibleRanges);
@@ -1069,9 +974,7 @@ ReportUntracked:
         ReportUntrackedSlots(slotDecoder, pRD, inputFlags, pCallBack, hCallBack);
     }
 
-#ifdef DISABLE_EH_VECTORS
 ExitSuccess:
-#endif
 
     return true;
 }