Skip to content

Commit b561607

Browse files
jkotasjkotas
authored
Delete SCAN contract annotations (#116182)
These annotations were used by prefast plugin that analyzed contract consistency. This prefast plugin is not coming back.
1 parent a7f68b8 commit b561607

30 files changed

+46
-537
lines changed

‎src/coreclr/debug/ee/debugger.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7900,8 +7900,6 @@ LONG Debugger::NotifyOfCHFFilter(EXCEPTION_POINTERS* pExceptionPointers, PVOID p
79007900
}
79017901
CONTRACTL_END;
79027902

7903-
SCAN_IGNORE_TRIGGER; // Scan can't handle conditional contracts.
7904-
79057903
// @@@
79067904
// Implements DebugInterface
79077905
// Can only be called from EE

‎src/coreclr/debug/ee/debugger.h

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ class GCHolderEEInterface<TRUE, TOGGLE, IFTHREAD>
157157
public:
158158
DEBUG_NOINLINE GCHolderEEInterface()
159159
{
160-
SCAN_SCOPE_BEGIN;
161160
STATIC_CONTRACT_MODE_COOPERATIVE;
162161

163162
if (IFTHREAD && g_pEEInterface->GetThread() == NULL)
@@ -182,8 +181,6 @@ class GCHolderEEInterface<TRUE, TOGGLE, IFTHREAD>
182181

183182
DEBUG_NOINLINE ~GCHolderEEInterface()
184183
{
185-
SCAN_SCOPE_END;
186-
187184
if (IFTHREAD && g_pEEInterface->GetThread() == NULL)
188185
{
189186
return;
@@ -279,15 +276,13 @@ class GCHolderEEInterface<FALSE, TOGGLE, IFTHREAD>
279276
public:
280277
DEBUG_NOINLINE GCHolderEEInterface()
281278
{
282-
SCAN_SCOPE_BEGIN;
283279
STATIC_CONTRACT_MODE_PREEMPTIVE;
284280

285281
this->EnterInternal(false, true);
286282
}
287283

288284
DEBUG_NOINLINE GCHolderEEInterface(bool bConditional)
289285
{
290-
SCAN_SCOPE_BEGIN;
291286
if (bConditional)
292287
{
293288
STATIC_CONTRACT_MODE_PREEMPTIVE;
@@ -298,8 +293,6 @@ class GCHolderEEInterface<FALSE, TOGGLE, IFTHREAD>
298293

299294
DEBUG_NOINLINE ~GCHolderEEInterface()
300295
{
301-
SCAN_SCOPE_END;
302-
303296
this->LeaveInternal();
304297
};
305298
};

‎src/coreclr/inc/contract.h

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ class DebugOnlyCodeHolder
710710
// we don't recreated one on exit if its been deleted.
711711
DEBUG_NOINLINE void Enter()
712712
{
713-
SCAN_SCOPE_BEGIN;
714713
STATIC_CONTRACT_DEBUG_ONLY;
715714

716715
m_pClrDebugState = GetClrDebugState();
@@ -723,7 +722,6 @@ class DebugOnlyCodeHolder
723722

724723
DEBUG_NOINLINE void Leave()
725724
{
726-
SCAN_SCOPE_END;
727725
STATIC_CONTRACT_DEBUG_ONLY;
728726

729727
m_pClrDebugState = CheckClrDebugState();
@@ -751,16 +749,13 @@ class AutoCleanupDebugOnlyCodeHolder : public DebugOnlyCodeHolder
751749
public:
752750
DEBUG_NOINLINE AutoCleanupDebugOnlyCodeHolder()
753751
{
754-
SCAN_SCOPE_BEGIN;
755752
STATIC_CONTRACT_DEBUG_ONLY;
756753

757754
Enter();
758755
};
759756

760757
DEBUG_NOINLINE ~AutoCleanupDebugOnlyCodeHolder()
761758
{
762-
SCAN_SCOPE_END;
763-
764759
Leave();
765760
};
766761
};
@@ -1403,7 +1398,6 @@ typedef __SafeToUsePostCondition __PostConditionOK;
14031398

14041399
#define UNCHECKED(thecheck) \
14051400
do { \
1406-
ANNOTATION_UNCHECKED(thecheck); \
14071401
enum {___disabled = 1 }; \
14081402
thecheck; \
14091403
} while(0)
@@ -1601,7 +1595,7 @@ typedef __SafeToUsePostCondition __PostConditionOK;
16011595
#define WRAPPER_NO_CONTRACT CUSTOM_WRAPPER_NO_CONTRACT(Contract)
16021596

16031597
// GC_NOTRIGGER allowed but not currently enforced at runtime
1604-
#define GC_NOTRIGGER STATIC_CONTRACT_GC_NOTRIGGER
1598+
#define GC_NOTRIGGER do { STATIC_CONTRACT_GC_NOTRIGGER; } while(0)
16051599
#define GC_TRIGGERS static_assert(false, "TriggersGC not supported in utilcode contracts")
16061600

16071601
#ifdef ENABLE_CONTRACTS_IMPL
@@ -1619,7 +1613,6 @@ class ContractViolationHolder
16191613

16201614
DEBUG_NOINLINE void Leave()
16211615
{
1622-
SCAN_SCOPE_END;
16231616
LeaveInternal();
16241617
};
16251618

@@ -1660,7 +1653,6 @@ class AutoCleanupContractViolationHolder : ContractViolationHolder<VIOLATION_MAS
16601653

16611654
DEBUG_NOINLINE ~AutoCleanupContractViolationHolder()
16621655
{
1663-
SCAN_SCOPE_END;
16641656
this->LeaveInternal();
16651657
};
16661658
};
@@ -1737,7 +1729,6 @@ class FaultForbidHolder
17371729
public:
17381730
DEBUG_NOINLINE FaultForbidHolder(BOOL fConditional, BOOL fAlloc, const char *szFunction, const char *szFile, int lineNum)
17391731
{
1740-
SCAN_SCOPE_BEGIN;
17411732
STATIC_CONTRACT_FORBID_FAULT;
17421733

17431734
m_fConditional = fConditional;
@@ -1772,8 +1763,6 @@ class FaultForbidHolder
17721763

17731764
DEBUG_NOINLINE ~FaultForbidHolder()
17741765
{
1775-
SCAN_SCOPE_END;
1776-
17771766
if (m_fConditional)
17781767
{
17791768
*m_pClrDebugState = m_oldClrDebugState;
@@ -1914,7 +1903,6 @@ class ClrTryMarkerHolder
19141903
public:
19151904
DEBUG_NOINLINE ClrTryMarkerHolder()
19161905
{
1917-
SCAN_SCOPE_BEGIN;
19181906
STATIC_CONTRACT_THROWS;
19191907

19201908
m_pClrDebugState = GetClrDebugState();
@@ -1924,8 +1912,6 @@ class ClrTryMarkerHolder
19241912

19251913
DEBUG_NOINLINE ~ClrTryMarkerHolder()
19261914
{
1927-
SCAN_SCOPE_END;
1928-
19291915
m_pClrDebugState->SetOkToThrow( m_oldOkayToThrowValue );
19301916
}
19311917

‎src/coreclr/inc/ex.h

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,6 @@ class CAutoTryCleanup
598598
DEBUG_NOINLINE CAutoTryCleanup(STATETYPE& refState) :
599599
m_refState(refState)
600600
{
601-
SCAN_SCOPE_BEGIN;
602601
STATIC_CONTRACT_THROWS;
603602
STATIC_CONTRACT_SUPPORTS_DAC;
604603

@@ -614,7 +613,6 @@ class CAutoTryCleanup
614613

615614
DEBUG_NOINLINE ~CAutoTryCleanup()
616615
{
617-
SCAN_SCOPE_END;
618616
WRAPPER_NO_CONTRACT;
619617

620618
m_refState.CleanupTry();
@@ -729,7 +727,6 @@ class CAutoTryCleanup
729727
#define RethrowTerminalExceptions \
730728
if (GET_EXCEPTION()->IsTerminal()) \
731729
{ \
732-
STATIC_CONTRACT_THROWS_TERMINAL; \
733730
EX_RETHROW; \
734731
} \
735732

@@ -811,18 +808,11 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
811808
{ \
812809
STATETYPE __state STATEARG; \
813810
typedef DEFAULT_EXCEPTION_TYPE __defaultException_t; \
814-
SCAN_EHMARKER(); \
815811
PAL_CPP_TRY \
816812
{ \
817-
SCAN_EHMARKER_TRY(); \
818-
SCAN_EHMARKER(); \
819813
PAL_CPP_TRY \
820814
{ \
821-
SCAN_EHMARKER_TRY(); \
822815
CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state); \
823-
/* prevent annotations from being dropped by optimizations in debug */ \
824-
INDEBUG(static bool __alwayszero;) \
825-
INDEBUG(VolatileLoad(&__alwayszero);) \
826816
{ \
827817
/* Disallow returns to make exception handling work. */ \
828818
/* Some work is done after the catch, see EX_ENDTRY. */ \
@@ -833,32 +823,23 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
833823
#define EX_CATCH_IMPL_EX(DerivedExceptionClass) \
834824
DEBUG_ASSURE_NO_RETURN_END(EX_TRY) \
835825
} \
836-
SCAN_EHMARKER_END_TRY(); \
837826
} \
838827
PAL_CPP_CATCH_NON_DERIVED_NOARG (const std::bad_alloc&) \
839828
{ \
840-
SCAN_EHMARKER_CATCH(); \
841829
__state.SetCaughtCxx(); \
842830
__state.m_pExceptionPtr = Exception::GetOOMException(); \
843-
SCAN_EHMARKER_END_CATCH(); \
844-
SCAN_IGNORE_THROW_MARKER; \
845831
ThrowOutOfMemory(); \
846832
} \
847833
PAL_CPP_CATCH_DERIVED (DerivedExceptionClass, __pExceptionRaw) \
848834
{ \
849-
SCAN_EHMARKER_CATCH(); \
850835
__state.SetCaughtCxx(); \
851836
__state.m_pExceptionPtr = __pExceptionRaw; \
852-
SCAN_EHMARKER_END_CATCH(); \
853-
SCAN_IGNORE_THROW_MARKER; \
854837
PAL_CPP_RETHROW; \
855838
} \
856839
PAL_CPP_ENDTRY \
857-
SCAN_EHMARKER_END_TRY(); \
858840
} \
859841
PAL_CPP_CATCH_ALL \
860842
{ \
861-
SCAN_EHMARKER_CATCH(); \
862843
__defaultException_t __defaultException; \
863844
CHECK::ResetAssert(); \
864845
ExceptionHolder __pException(__state.m_pExceptionPtr); \
@@ -875,18 +856,11 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
875856
{ \
876857
STATETYPE __state STATEARG; \
877858
typedef DEFAULT_EXCEPTION_TYPE __defaultException_t; \
878-
SCAN_EHMARKER(); \
879859
PAL_CPP_TRY \
880860
{ \
881-
SCAN_EHMARKER_TRY(); \
882-
SCAN_EHMARKER(); \
883861
PAL_CPP_TRY \
884862
{ \
885-
SCAN_EHMARKER_TRY(); \
886863
CAutoTryCleanup<STATETYPE> __autoCleanupTry(__state); \
887-
/* prevent annotations from being dropped by optimizations in debug */ \
888-
INDEBUG(static bool __alwayszero;) \
889-
INDEBUG(VolatileLoad(&__alwayszero);) \
890864
{ \
891865
/* Disallow returns to make exception handling work. */ \
892866
/* Some work is done after the catch, see EX_ENDTRY. */ \
@@ -895,27 +869,19 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
895869
#define EX_CATCH_IMPL_CPP_ONLY \
896870
DEBUG_ASSURE_NO_RETURN_END(EX_TRY) \
897871
} \
898-
SCAN_EHMARKER_END_TRY(); \
899872
} \
900873
PAL_CPP_CATCH_NON_DERIVED_NOARG (const std::bad_alloc&) \
901874
{ \
902-
SCAN_EHMARKER_CATCH(); \
903875
__state.SetCaughtCxx(); \
904876
__state.m_pExceptionPtr = Exception::GetOOMException(); \
905-
SCAN_EHMARKER_END_CATCH(); \
906-
SCAN_IGNORE_THROW_MARKER; \
907877
ThrowOutOfMemory(); \
908878
} \
909879
PAL_CPP_ENDTRY \
910-
SCAN_EHMARKER_END_TRY(); \
911880
} \
912881
PAL_CPP_CATCH_DERIVED (Exception, __pExceptionRaw) \
913882
{ \
914-
SCAN_EHMARKER_CATCH(); \
915883
__state.SetCaughtCxx(); \
916884
__state.m_pExceptionPtr = __pExceptionRaw; \
917-
SCAN_EHMARKER_END_CATCH(); \
918-
SCAN_IGNORE_THROW_MARKER; \
919885
__defaultException_t __defaultException; \
920886
CHECK::ResetAssert(); \
921887
ExceptionHolder __pException(__state.m_pExceptionPtr); \
@@ -956,7 +922,6 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
956922
#define EX_END_CATCH_UNREACHABLE \
957923
DEBUG_ASSURE_NO_RETURN_END(EX_CATCH) \
958924
} \
959-
SCAN_EHMARKER_END_CATCH(); \
960925
UNREACHABLE(); \
961926
} \
962927
PAL_CPP_ENDTRY \
@@ -971,7 +936,6 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
971936
__state.SucceedCatch(); \
972937
DEBUG_ASSURE_NO_RETURN_END(EX_CATCH) \
973938
} \
974-
SCAN_EHMARKER_END_CATCH(); \
975939
} \
976940
EX_ENDTRY \
977941
} \
@@ -980,9 +944,7 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
980944
#define EX_END_CATCH_FOR_HOOK \
981945
__state.SucceedCatch(); \
982946
DEBUG_ASSURE_NO_RETURN_END(EX_CATCH) \
983-
ANNOTATION_HANDLER_END; \
984947
} \
985-
SCAN_EHMARKER_END_CATCH(); \
986948
} \
987949
EX_ENDTRY
988950

@@ -1217,7 +1179,6 @@ Exception *ExThrowWithInnerHelper(Exception *inner);
12171179

12181180
#define EX_END_HOOK \
12191181
} \
1220-
ANNOTATION_HANDLER_END; \
12211182
EX_RETHROW; \
12221183
EX_END_CATCH_FOR_HOOK; \
12231184
}

‎src/coreclr/inc/ostype.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#include "staticcontract.h"
66

77
#ifndef WRAPPER_NO_CONTRACT
8-
#define WRAPPER_NO_CONTRACT ANNOTATION_WRAPPER
8+
#define WRAPPER_NO_CONTRACT
99
#endif
1010

1111
#ifndef LIMITED_METHOD_CONTRACT
12-
#define LIMITED_METHOD_CONTRACT ANNOTATION_FN_LEAF
12+
#define LIMITED_METHOD_CONTRACT
1313
#endif
1414

1515
//*****************************************************************************

‎src/coreclr/inc/palclr.h

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -317,17 +317,14 @@
317317
{ \
318318
bool __exHandled; __exHandled = false; \
319319
DWORD __exCode; __exCode = 0; \
320-
SCAN_EHMARKER(); \
321320
__try \
322-
{ \
323-
SCAN_EHMARKER_TRY();
321+
{
324322

325323
#define PAL_EXCEPT_NAKED(Disposition) \
326324
} \
327325
__except(__exCode = GetExceptionCode(), Disposition) \
328326
{ \
329327
__exHandled = true; \
330-
SCAN_EHMARKER_CATCH(); \
331328
PAL_SEH_RESTORE_GUARD_PAGE
332329

333330
#define PAL_EXCEPT_FILTER_NAKED(pfnFilter, param) \
@@ -336,7 +333,6 @@
336333
pfnFilter(GetExceptionInformation(), param)) \
337334
{ \
338335
__exHandled = true; \
339-
SCAN_EHMARKER_CATCH(); \
340336
PAL_SEH_RESTORE_GUARD_PAGE
341337

342338
#define PAL_FINALLY_NAKED \
@@ -346,7 +342,6 @@
346342

347343
#define PAL_ENDTRY_NAKED \
348344
} \
349-
PAL_ENDTRY_NAKED_DBG \
350345
} \
351346

352347

@@ -475,8 +470,8 @@
475470

476471
#define PAL_CPP_TRY try
477472
#define PAL_CPP_ENDTRY
478-
#define PAL_CPP_THROW(type, obj) do { SCAN_THROW_MARKER; throw obj; } while (false)
479-
#define PAL_CPP_RETHROW do { SCAN_THROW_MARKER; throw; } while (false)
473+
#define PAL_CPP_THROW(type, obj) do { throw obj; } while (false)
474+
#define PAL_CPP_RETHROW do { throw; } while (false)
480475
#define PAL_CPP_CATCH_DERIVED(type, obj) catch (type * obj)
481476
#define PAL_CPP_CATCH_NON_DERIVED(type, obj) catch (type obj)
482477
#define PAL_CPP_CATCH_NON_DERIVED_NOARG(type) catch (type)
@@ -527,13 +522,10 @@
527522
} \
528523
}
529524

530-
#define PAL_ENDTRY_NAKED_DBG
531-
532525
#else
533-
#define PAL_TRY_HANDLER_DBG_BEGIN ANNOTATION_TRY_BEGIN;
534-
#define PAL_TRY_HANDLER_DBG_BEGIN_DLLMAIN(_reason) ANNOTATION_TRY_BEGIN;
535-
#define PAL_TRY_HANDLER_DBG_END ANNOTATION_TRY_END;
536-
#define PAL_ENDTRY_NAKED_DBG
526+
#define PAL_TRY_HANDLER_DBG_BEGIN
527+
#define PAL_TRY_HANDLER_DBG_BEGIN_DLLMAIN(_reason)
528+
#define PAL_TRY_HANDLER_DBG_END
537529
#endif // defined(ENABLE_CONTRACTS_IMPL)
538530

539531

0 commit comments

Comments
 (0)