diff options
author | Bruce Forstall <brucefo@microsoft.com> | 2018-11-06 10:52:40 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-06 10:52:40 -0800 |
commit | 0dc37d16d734484b75e47cb243e347f5959a29bf (patch) | |
tree | 99e6f9c8ebaf3cbaa5fccda7f9df6897404aa99a /tests | |
parent | 28b4285b4d71a9aa9b9deb40a17ee356e5ef440f (diff) | |
parent | e250e6206fb7d20e436cb4d4ef0dd30da037e939 (diff) | |
download | coreclr-0dc37d16d734484b75e47cb243e347f5959a29bf.tar.gz coreclr-0dc37d16d734484b75e47cb243e347f5959a29bf.tar.bz2 coreclr-0dc37d16d734484b75e47cb243e347f5959a29bf.zip |
Merge pull request #20633 from BruceForstall/FixSPCheck
Fix SP check for x64/x86, remove for arm32/arm64
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/Interop/SizeConst/SizeConstTest.cs | 2 | ||||
-rw-r--r-- | tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs | 2 | ||||
-rw-r--r-- | tests/src/JIT/Directed/pinvoke/sin.cs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/Interop/SizeConst/SizeConstTest.cs b/tests/src/Interop/SizeConst/SizeConstTest.cs index bd081a6721..a4d85c898e 100644 --- a/tests/src/Interop/SizeConst/SizeConstTest.cs +++ b/tests/src/Interop/SizeConst/SizeConstTest.cs @@ -19,7 +19,7 @@ class Test internal const int ARRAY_SIZE = 100; //UnmanagedType.ByValTStr - [DllImport("SizeConstNative",CharSet = CharSet.Ansi)] + [DllImport("SizeConstNative",CharSet = CharSet.Ansi, CallingConvention = CallingConvention.Cdecl)] static extern bool TakeByValTStr(S_CHARArray_ByValTStr s, int size); static bool SizeConstByValTStr() diff --git a/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs index 2d4b5f6aea..35f75ab3bc 100644 --- a/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs +++ b/tests/src/JIT/Directed/pinvoke/pinvoke-bug.cs @@ -12,7 +12,7 @@ namespace PInvokeTest { internal class Test { - [DllImport("msvcrt", EntryPoint = "sin")] + [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); private static double g; diff --git a/tests/src/JIT/Directed/pinvoke/sin.cs b/tests/src/JIT/Directed/pinvoke/sin.cs index 3173cb823b..2ad75e4105 100644 --- a/tests/src/JIT/Directed/pinvoke/sin.cs +++ b/tests/src/JIT/Directed/pinvoke/sin.cs @@ -10,10 +10,10 @@ namespace JitTest internal class Test { - [DllImport("msvcrt", EntryPoint = "sin")] + [DllImport("msvcrt", EntryPoint = "sin", CallingConvention = CallingConvention.Cdecl)] private static extern double sin(double x); - [DllImport("msvcrt", EntryPoint = "acos")] + [DllImport("msvcrt", EntryPoint = "acos", CallingConvention = CallingConvention.Cdecl)] private static extern double acos(double x); private static int Main() |