Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

[x86/Linux] Disable Watson-related code for non-Windows platforms #8410

Merged
merged 2 commits into from
Dec 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/vm/exinfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,11 @@ void ExInfo::CopyAndClearSource(ExInfo *from)
// Finally, initialize the source ExInfo.
from->Init();

#ifndef FEATURE_PAL
// Clear the Watson Bucketing information as well since they
// have been transferred over by the "memcpy" above.
from->GetWatsonBucketTracker()->Init();
#endif // FEATURE_PAL
}

void ExInfo::Init()
Expand Down Expand Up @@ -136,8 +138,10 @@ ExInfo::ExInfo()
m_hThrowable = NULL;
Init();

#ifndef FEATURE_PAL
// Init the WatsonBucketTracker
m_WatsonBucketTracker.Init();
#endif // FEATURE_PAL
}

//*******************************************************************************
Expand Down Expand Up @@ -206,9 +210,11 @@ void ExInfo::UnwindExInfo(VOID* limit)
pPrevNestedInfo->DestroyExceptionHandle();
}

#ifndef FEATURE_PAL
// Free the Watson bucket details when ExInfo
// is being released
pPrevNestedInfo->GetWatsonBucketTracker()->ClearWatsonBucketDetails();
#endif // FEATURE_PAL

pPrevNestedInfo->m_StackTraceInfo.FreeStackTrace();

Expand Down Expand Up @@ -256,8 +262,10 @@ void ExInfo::UnwindExInfo(VOID* limit)
// We just do a basic Init of the current top ExInfo here.
Init();

#ifndef FEATURE_PAL
// Init the Watson buckets as well
GetWatsonBucketTracker()->ClearWatsonBucketDetails();
#endif // FEATURE_PAL
}
}
#endif // DACCESS_COMPILE
Expand Down
2 changes: 2 additions & 0 deletions src/vm/i386/excepx86.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1153,6 +1153,7 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.

pExInfo->m_pExceptionPointers = &exceptionPointers;

#ifndef FEATURE_PAL
if (bRethrownException || bNestedException)
{
_ASSERTE(pExInfo->m_pPrevNestedInfo != NULL);
Expand All @@ -1161,6 +1162,7 @@ CPFH_RealFirstPassHandler( // ExceptionContinueSearch, etc.
SetStateForWatsonBucketing(bRethrownException, pExInfo->GetPreviousExceptionTracker()->GetThrowableAsHandle());
END_SO_INTOLERANT_CODE;
}
#endif

#ifdef DEBUGGING_SUPPORTED
//
Expand Down