diff options
| author | Tomáš Rylek <trylek@microsoft.com> | 2019-01-07 13:32:04 +0100 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-01-07 04:32:04 -0800 |
| commit | bcbb84df02d73a89dd13ea7fa2257f542202dd81 (patch) | |
| tree | 79755cc0a16ff0ff624f07dbc0628efad47fadf0 /src | |
| parent | ee8bc3272391e46862dd8d27d3e086dc3bf953cf (diff) | |
| download | coreclr-bcbb84df02d73a89dd13ea7fa2257f542202dd81.tar.gz coreclr-bcbb84df02d73a89dd13ea7fa2257f542202dd81.tar.bz2 coreclr-bcbb84df02d73a89dd13ea7fa2257f542202dd81.zip | |
Fix incorrect assignment of READYTORUN_HELPER_[Dbl|Flt][Rem/Round] (#21836)
Turns out there's a long-standing typo in CoreCLR that reverses
the helper enumeration values for DBL and FLT. This doesn't seem
to be a problem in the CoreCLR repo as such because it solely
uses the legacy identifiers CORINFO_HELP_DBLREM et al. We have
however ported the incorrect helper enumeration values into R2RDump
and ILCompiler. This change immediately fixes R2RDump as it resides
in the same repo, I'll send out the ILCompiler change in
a separate PR.
Diffstat (limited to 'src')
| -rw-r--r-- | src/inc/readytorunhelpers.h | 8 | ||||
| -rw-r--r-- | src/tools/r2rdump/R2RConstants.cs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/inc/readytorunhelpers.h b/src/inc/readytorunhelpers.h index 7a1245c3bd..ffddab39b4 100644 --- a/src/inc/readytorunhelpers.h +++ b/src/inc/readytorunhelpers.h @@ -84,10 +84,10 @@ HELPER(READYTORUN_HELPER_Dbl2UIntOvf, CORINFO_HELP_DBL2UINT_OVF, HELPER(READYTORUN_HELPER_Dbl2ULng, CORINFO_HELP_DBL2ULNG, ) HELPER(READYTORUN_HELPER_Dbl2ULngOvf, CORINFO_HELP_DBL2ULNG_OVF, ) -HELPER(READYTORUN_HELPER_DblRem, CORINFO_HELP_FLTREM, ) -HELPER(READYTORUN_HELPER_FltRem, CORINFO_HELP_DBLREM, ) -HELPER(READYTORUN_HELPER_DblRound, CORINFO_HELP_FLTROUND, ) -HELPER(READYTORUN_HELPER_FltRound, CORINFO_HELP_DBLROUND, ) +HELPER(READYTORUN_HELPER_FltRem, CORINFO_HELP_FLTREM, ) +HELPER(READYTORUN_HELPER_DblRem, CORINFO_HELP_DBLREM, ) +HELPER(READYTORUN_HELPER_FltRound, CORINFO_HELP_FLTROUND, ) +HELPER(READYTORUN_HELPER_DblRound, CORINFO_HELP_DBLROUND, ) #ifndef _TARGET_X86_ HELPER(READYTORUN_HELPER_PersonalityRoutine, CORINFO_HELP_EE_PERSONALITY_ROUTINE, OPTIMIZEFORSIZE) diff --git a/src/tools/r2rdump/R2RConstants.cs b/src/tools/r2rdump/R2RConstants.cs index 84340f4d5b..7e1c5e388f 100644 --- a/src/tools/r2rdump/R2RConstants.cs +++ b/src/tools/r2rdump/R2RConstants.cs @@ -231,10 +231,10 @@ namespace R2RDump READYTORUN_HELPER_Dbl2ULngOvf = 0xD7, // Floating point ops - READYTORUN_HELPER_DblRem = 0xE0, - READYTORUN_HELPER_FltRem = 0xE1, - READYTORUN_HELPER_DblRound = 0xE2, - READYTORUN_HELPER_FltRound = 0xE3, + READYTORUN_HELPER_FltRem = 0xE0, + READYTORUN_HELPER_DblRem = 0xE1, + READYTORUN_HELPER_FltRound = 0xE2, + READYTORUN_HELPER_DblRound = 0xE3, // Personality rountines READYTORUN_HELPER_PersonalityRoutine = 0xF0, |