diff options
| author | John Chen <jochen@microsoft.com> | 2015-09-30 21:08:57 -0700 |
|---|---|---|
| committer | John Chen <jochen@microsoft.com> | 2015-09-30 21:08:57 -0700 |
| commit | f97569360a2a0984a31270f75bcf7ba7e60c44d3 (patch) | |
| tree | 1e5d77a43e1db342f1b0b6508d0deb5858fb39d5 /src/vm/siginfo.cpp | |
| parent | 167f6cf5da60315946ca3d621c20a2530c0b42ae (diff) | |
| download | coreclr-f97569360a2a0984a31270f75bcf7ba7e60c44d3.tar.gz coreclr-f97569360a2a0984a31270f75bcf7ba7e60c44d3.tar.bz2 coreclr-f97569360a2a0984a31270f75bcf7ba7e60c44d3.zip | |
Fix SigPointer::PeekValueTypeTokenClosed to handle generic instantiation represented by ELEMENT_TYPE_INTERNAL
Integrate change #1529861 from NetFXDev1
[tfs-changeset: 1532127]
Diffstat (limited to 'src/vm/siginfo.cpp')
| -rw-r--r-- | src/vm/siginfo.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/vm/siginfo.cpp b/src/vm/siginfo.cpp index dd57e63840..25fe157784 100644 --- a/src/vm/siginfo.cpp +++ b/src/vm/siginfo.cpp @@ -2546,8 +2546,12 @@ mdTypeRef SigPointer::PeekValueTypeTokenClosed(Module *pModule, const SigTypeCon if (FAILED(sp.GetElemType(NULL))) return mdTokenNil; - if (FAILED(sp.GetElemType(NULL))) + CorElementType subtype; + if (FAILED(sp.GetElemType(&subtype))) + return mdTokenNil; + if (subtype == ELEMENT_TYPE_INTERNAL) return mdTokenNil; + _ASSERTE(subtype == ELEMENT_TYPE_VALUETYPE); if (FAILED(sp.GetToken(&token))) return mdTokenNil; |