diff options
author | Atsushi Kanamori <AtsushiKan@users.noreply.github.com> | 2018-04-23 13:42:24 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-23 13:42:24 -0700 |
commit | 5a42b8c7348ba7dfa0dbf423d36245570488c888 (patch) | |
tree | c35278add0c8c8ab6fd9d2063f1d37494c5feb7e /src/dlls | |
parent | 72dd7f2146cee213babb18378130e4375442aca1 (diff) | |
download | coreclr-5a42b8c7348ba7dfa0dbf423d36245570488c888.tar.gz coreclr-5a42b8c7348ba7dfa0dbf423d36245570488c888.tar.bz2 coreclr-5a42b8c7348ba7dfa0dbf423d36245570488c888.zip |
Enable Invoke and GetValue for ref-returning members (#17732)
* Reapply https://github.com/dotnet/coreclr/pull/17639
* tryagain-wip 4/23/2018 7:27:37 AM - Fix Invoke of enum-returning methods
* Assert for refbufargs implying valuetype
* Catch ref to void in managed layer
Diffstat (limited to 'src/dlls')
-rw-r--r-- | src/dlls/mscorrc/mscorrc.rc | 1 | ||||
-rw-r--r-- | src/dlls/mscorrc/resource.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/dlls/mscorrc/mscorrc.rc b/src/dlls/mscorrc/mscorrc.rc index 61f5c9af1b..42c0be4f83 100644 --- a/src/dlls/mscorrc/mscorrc.rc +++ b/src/dlls/mscorrc/mscorrc.rc @@ -1538,6 +1538,7 @@ BEGIN IDS_EE_TORNSTATE "Unexpected change made to file '%1'." + IDS_INVOKE_NULLREF_RETURNED "The target method returned a null reference." END // These strings are generated from within the EE for streams diff --git a/src/dlls/mscorrc/resource.h b/src/dlls/mscorrc/resource.h index b8e1b2b2a9..49f1d0e69d 100644 --- a/src/dlls/mscorrc/resource.h +++ b/src/dlls/mscorrc/resource.h @@ -898,3 +898,5 @@ #define IDS_EE_NDIRECT_LOADLIB_MAC 0x263f #define IDS_EE_NDIRECT_GETPROCADDRESS_UNIX 0x2640 #define IDS_EE_ERROR_COM 0x2641 + +#define IDS_INVOKE_NULLREF_RETURNED 0x2642 |