diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-03 06:18:44 -0800 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-03 06:18:44 -0800 |
| commit | d747b85536994e4c73c3f810d9e7b9cb46e02745 (patch) | |
| tree | ef950ddc845ede744fbe30ca248398f0f9997a88 /src/vm/peimage.cpp | |
| parent | c92c399cee4c2c772093b67cb6f6cac3d705adc8 (diff) | |
| download | coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.tar.gz coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.tar.bz2 coreclr-d747b85536994e4c73c3f810d9e7b9cb46e02745.zip | |
Integrate changes from full .NET Framework
- Custom attribute to suppress NGen with method granularity
- Static contract fixes
- GC fix
[tfs-changeset: 1571860]
Diffstat (limited to 'src/vm/peimage.cpp')
| -rw-r--r-- | src/vm/peimage.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/vm/peimage.cpp b/src/vm/peimage.cpp index 874f20fad4..27904ff476 100644 --- a/src/vm/peimage.cpp +++ b/src/vm/peimage.cpp @@ -829,7 +829,14 @@ void PEImage::VerifyIsILOrNIAssembly(BOOL fIL) void DECLSPEC_NORETURN PEImage::ThrowFormat(HRESULT hrError) { - WRAPPER_NO_CONTRACT; + CONTRACTL + { + GC_TRIGGERS; + THROWS; + MODE_ANY; + } + CONTRACTL_END; + EEFileLoadException::Throw(m_path, hrError); } |