diff options
| author | Jarret Shook <jashoo@microsoft.com> | 2019-06-24 16:18:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:18:14 -0700 |
| commit | 0c957b6e69639fe06add31e43bc90e0db60743ac (patch) | |
| tree | f73d6e5565e0bb65c8b6788e5d8d563d9c67bde5 /src/vm/jitinterface.cpp | |
| parent | e3c9a4afbceb838d7bffab1f246190a3d72caf42 (diff) | |
| download | coreclr-0c957b6e69639fe06add31e43bc90e0db60743ac.tar.gz coreclr-0c957b6e69639fe06add31e43bc90e0db60743ac.tar.bz2 coreclr-0c957b6e69639fe06add31e43bc90e0db60743ac.zip | |
Throw platform unsupported error for windows arm32 varargs (#25320)
* Throw unsupported platform for native vcarargs on Arm32 Windows
* Re-enable baseservices vararg test
Diffstat (limited to 'src/vm/jitinterface.cpp')
| -rw-r--r-- | src/vm/jitinterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp index 68918772ab..884257b6a4 100644 --- a/src/vm/jitinterface.cpp +++ b/src/vm/jitinterface.cpp @@ -478,14 +478,14 @@ CEEInfo::ConvToJitSig( IfFailThrow(sig.GetCallingConvInfo(&data)); sigRet->callConv = (CorInfoCallConv) data; -#ifdef PLATFORM_UNIX +#if defined(PLATFORM_UNIX) || defined(_TARGET_ARM_) if ((isCallConv(sigRet->callConv, IMAGE_CEE_CS_CALLCONV_VARARG)) || (isCallConv(sigRet->callConv, IMAGE_CEE_CS_CALLCONV_NATIVEVARARG))) { // This signature corresponds to a method that uses varargs, which are not supported. COMPlusThrow(kInvalidProgramException, IDS_EE_VARARG_NOT_SUPPORTED); } -#endif // PLATFORM_UNIX +#endif // defined(PLATFORM_UNIX) || defined(_TARGET_ARM_) // Skip number of type arguments if (sigRet->callConv & IMAGE_CEE_CS_CALLCONV_GENERIC) |