diff options
| author | Joseph Tremoulet <jotrem@microsoft.com> | 2017-02-14 14:39:03 -0500 |
|---|---|---|
| committer | Joseph Tremoulet <jotrem@microsoft.com> | 2017-02-14 14:39:03 -0500 |
| commit | 9155a99333c09b13ffc28aaeb3be3894e1b17b7a (patch) | |
| tree | bc0143151408f0fb67fe5417e8c9a871dae8813a /src | |
| parent | c055f7ba7d85347e1cb88937964f39d96b12d79e (diff) | |
| download | coreclr-9155a99333c09b13ffc28aaeb3be3894e1b17b7a.tar.gz coreclr-9155a99333c09b13ffc28aaeb3be3894e1b17b7a.tar.bz2 coreclr-9155a99333c09b13ffc28aaeb3be3894e1b17b7a.zip | |
Value number casts and zeros of TYP_BYREF
Value numbering already has a representation for constants of byref type.
Hook up both `VNZeroForType` and `EvalCastForConstantArgs` to return a
value number using this representation (rather than fail an assertion)
when the requested result type is byref.
Fixes #9453
Diffstat (limited to 'src')
| -rw-r--r-- | src/jit/valuenum.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/jit/valuenum.cpp b/src/jit/valuenum.cpp index ed0398442f..4d20087b17 100644 --- a/src/jit/valuenum.cpp +++ b/src/jit/valuenum.cpp @@ -833,7 +833,7 @@ ValueNum ValueNumStore::VNForHandle(ssize_t cnsVal, unsigned handleFlags) } // Returns the value number for zero of the given "typ". -// It has an unreached() for a "typ" that has no zero value, such as TYP_BYREF. +// It has an unreached() for a "typ" that has no zero value, such as TYP_VOID. ValueNum ValueNumStore::VNZeroForType(var_types typ) { switch (typ) @@ -861,6 +861,8 @@ ValueNum ValueNumStore::VNZeroForType(var_types typ) case TYP_REF: case TYP_ARRAY: return VNForNull(); + case TYP_BYREF: + return VNForByrefCon(0); case TYP_STRUCT: #ifdef FEATURE_SIMD // TODO-CQ: Improve value numbering for SIMD types. @@ -1876,6 +1878,7 @@ ValueNum ValueNumStore::EvalCastForConstantArgs(var_types typ, VNFunc func, Valu { #ifndef _TARGET_64BIT_ case TYP_REF: + case TYP_BYREF: #endif case TYP_INT: { @@ -1934,6 +1937,9 @@ ValueNum ValueNumStore::EvalCastForConstantArgs(var_types typ, VNFunc func, Valu else return VNForLongCon(INT64(arg0Val)); #endif + case TYP_BYREF: + assert(typ == TYP_BYREF); + return VNForByrefCon((INT64)arg0Val); case TYP_FLOAT: assert(typ == TYP_FLOAT); if (srcIsUnsigned) @@ -1962,6 +1968,7 @@ ValueNum ValueNumStore::EvalCastForConstantArgs(var_types typ, VNFunc func, Valu { #ifdef _TARGET_64BIT_ case TYP_REF: + case TYP_BYREF: #endif case TYP_LONG: INT64 arg0Val = GetConstantInt64(arg0VN); @@ -1992,6 +1999,9 @@ ValueNum ValueNumStore::EvalCastForConstantArgs(var_types typ, VNFunc func, Valu case TYP_ULONG: assert(typ == TYP_LONG); return arg0VN; + case TYP_BYREF: + assert(typ == TYP_BYREF); + return VNForByrefCon((INT64)arg0Val); case TYP_FLOAT: assert(typ == TYP_FLOAT); if (srcIsUnsigned) |