Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Fix handling of StdCall intrinsic #6051

Merged
merged 1 commit into from
Jul 4, 2018
Merged

Fix handling of StdCall intrinsic #6051

merged 1 commit into from
Jul 4, 2018

Conversation

MichalStrehovsky
Copy link
Member

The Project N compiler only needs the prefix to match, so matching the behavior here. dotnet/csharplang#1685 can't come soon enough.

corert/src/System.Private.Interop/src/Shared/McgIntrinsics.cs

Lines 59 to 67 in 7246a7a

internal static int StdCall__QueryInterface(
IntPtr pfn,
IntPtr pComThis,
IntPtr arg0,
IntPtr arg1)
{
// This method is implemented elsewhere in the toolchain
return default(int);
}

Fixes #6042.

@MichalStrehovsky
Copy link
Member Author

@dotnet-bot test this please

1 similar comment
@MichalStrehovsky
Copy link
Member Author

@dotnet-bot test this please

@MichalStrehovsky MichalStrehovsky merged commit 51e9932 into dotnet:master Jul 4, 2018
@MichalStrehovsky MichalStrehovsky deleted the fix6042 branch July 4, 2018 17:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@jkotas jkotas jkotas approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Strange null ref in COM call
2 participants
@MichalStrehovsky @jkotas