Skip to content

Commit bff51f7

Browse files
committed
Merge pull request dotnet#1216 from janvorli/fix-destructor-contracts
Add missing contracts to some destructors
2 parents eed62e3 + 24c0474 commit bff51f7

File tree

4 files changed

+22
-4
lines changed

4 files changed

+22
-4
lines changed

src/vm/compile.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,10 @@ typedef SHash<ZapperLoaderModuleTableTraits> ZapperLoaderModuleTable;
183183
class CEECompileInfo : public ICorCompileInfo
184184
{
185185
public:
186-
virtual ~CEECompileInfo() {}
186+
virtual ~CEECompileInfo()
187+
{
188+
WRAPPER_NO_CONTRACT;
189+
}
187190

188191
HRESULT Startup( BOOL fForceDebug,
189192
BOOL fForceProfiling,

src/vm/dllimport.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ class StubState
186186

187187
virtual void FinishEmit(MethodDesc* pMD) = 0;
188188

189-
virtual ~StubState() {}
189+
virtual ~StubState()
190+
{
191+
LIMITED_METHOD_CONTRACT;
192+
}
190193
};
191194

192195
class ILStubState : public StubState

src/vm/hash.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,10 @@ class Compare
139139
m_ptr = ptr;
140140
}
141141

142-
virtual ~Compare() {}
142+
virtual ~Compare()
143+
{
144+
LIMITED_METHOD_CONTRACT;
145+
}
143146

144147
virtual UPTR CompareHelper(UPTR val1, UPTR storedval)
145148
{

src/vm/ilmarshalers.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,10 @@ class ILMarshaler
235235
{
236236
}
237237

238-
virtual ~ILMarshaler() {}
238+
virtual ~ILMarshaler()
239+
{
240+
LIMITED_METHOD_CONTRACT;
241+
}
239242

240243
void SetNDirectStubLinker(NDirectStubLinker* pslNDirect)
241244
{
@@ -1946,6 +1949,7 @@ class ILWSTRMarshaler : public ILMarshaler
19461949

19471950
ILWSTRMarshaler()
19481951
{
1952+
LIMITED_METHOD_CONTRACT;
19491953
m_fCoMemoryAllocated = false;
19501954
}
19511955
#endif // _DEBUG
@@ -2444,6 +2448,7 @@ class ILVBByValStrWMarshaler : public ILMarshaler
24442448
m_dwCCHLocal(-1)
24452449
,m_dwLocalBuffer(-1)
24462450
{
2451+
LIMITED_METHOD_CONTRACT;
24472452
}
24482453

24492454
virtual bool SupportsArgumentMarshal(DWORD dwMarshalFlags, UINT* pErrorResID);
@@ -2475,6 +2480,7 @@ class ILVBByValStrMarshaler : public ILMarshaler
24752480
ILVBByValStrMarshaler() :
24762481
m_dwCCHLocal(-1)
24772482
{
2483+
LIMITED_METHOD_CONTRACT;
24782484
}
24792485

24802486
virtual bool SupportsArgumentMarshal(DWORD dwMarshalFlags, UINT* pErrorResID);
@@ -2716,6 +2722,7 @@ class ILArrayWithOffsetMarshaler : public ILMarshaler
27162722
m_dwOffsetLocalNum(-1),
27172723
m_dwPinnedLocalNum(-1)
27182724
{
2725+
LIMITED_METHOD_CONTRACT;
27192726
}
27202727

27212728
protected:
@@ -2745,6 +2752,7 @@ class ILAsAnyMarshalerBase : public ILMarshaler
27452752
ILAsAnyMarshalerBase() :
27462753
m_dwMarshalerLocalNum(-1)
27472754
{
2755+
LIMITED_METHOD_CONTRACT;
27482756
}
27492757

27502758
protected:
@@ -2818,6 +2826,7 @@ class ILMngdMarshaler : public ILMarshaler
28182826
m_idClearNativeContents(clearNatContents),
28192827
m_idClearManaged(clearMan)
28202828
{
2829+
LIMITED_METHOD_CONTRACT;
28212830
}
28222831

28232832
protected:

0 commit comments

Comments
 (0)