Skip to content

VB: EmitDelegateCreation - account for the fact that static methods can be marked virtual in metadata #79697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AlekseyTs merged 1 commit into from
Jul 31, 2025
Merged

VB: EmitDelegateCreation - account for the fact that static methods can be marked virtual in metadata #79697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Compilers/VisualBasic/Portable/CodeGen/EmitExpression.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.CodeGen
' Delegates shall be declared sealed.
' The Invoke method shall be virtual.
' Dev11 VB uses ldvirtftn for delegate methods, we emit ldftn to be consistent with C#.
If method.IsMetadataVirtual AndAlso Not method.ContainingType.IsDelegateType() AndAlso Not receiver.SuppressVirtualCalls Then
If Not method.IsShared AndAlso method.IsMetadataVirtual AndAlso Not method.ContainingType.IsDelegateType() AndAlso Not receiver.SuppressVirtualCalls Then
_builder.EmitOpCode(ILOpCode.Dup)
_builder.EmitOpCode(ILOpCode.Ldvirtftn)
Else
Expand Down
50 changes: 50 additions & 0 deletions src/Compilers/VisualBasic/Test/Emit/CodeGen/CodeGenDelegateCreation.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2959,5 +2959,55 @@ End Module
CompileAndVerify(source, expectedOutput:="pass").VerifyDiagnostics()
End Sub

<Fact>
<WorkItem("https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2521944")>
<WorkItem("https://github.com/dotnet/roslyn/issues/79696")>
Public Sub DoubleCreateTruncating()
Dim source =
<compilation>
<file>
Imports System

Module Program
Sub Main()
Dim b As Byte = 10
Console.Write(Test1()(b))
Console.Write(":")
Console.Write(Test2(b))
End Sub

Function Test1() As Func(Of Byte, Double)
Return AddressOf Double.CreateTruncating
End Function

Function Test2(b As Byte) As Double
Return Double.CreateTruncating(b)
End Function
End Module </file>
</compilation>

Dim comp = CreateCompilation(source, targetFramework:=TargetFramework.Net90, options:=TestOptions.ReleaseExe)
Dim verifier = CompileAndVerify(comp, expectedOutput:=If(ExecutionConditionUtil.IsMonoOrCoreClr, "10:10", Nothing), verify:=Verification.FailsPEVerify).VerifyDiagnostics()
verifier.VerifyIL("Program.Test1", <![CDATA[
{
// Code size 13 (0xd)
.maxstack 2
IL_0000: ldnull
IL_0001: ldftn "Function Double.CreateTruncating(Of Byte)(Byte) As Double"
IL_0007: newobj "Sub System.Func(Of Byte, Double)..ctor(Object, System.IntPtr)"
IL_000c: ret
}
]]>)
verifier.VerifyIL("Program.Test2", <![CDATA[
{
// Code size 7 (0x7)
.maxstack 1
IL_0000: ldarg.0
IL_0001: call "Function Double.CreateTruncating(Of Byte)(Byte) As Double"
IL_0006: ret
}
]]>)
End Sub

End Class
End Namespace
1 change: 1 addition & 0 deletions src/Compilers/VisualBasic/Test/Emit/Microsoft.CodeAnalysis.VisualBasic.Emit.UnitTests.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<ProjectReference Include="..\..\..\Test\Utilities\VisualBasic\Microsoft.CodeAnalysis.VisualBasic.Test.Utilities.vbproj" />
<ProjectReference Include="..\..\Portable\Microsoft.CodeAnalysis.VisualBasic.vbproj" />
<PackageReference Include="Basic.Reference.Assemblies.Net50" />
<PackageReference Include="Basic.Reference.Assemblies.Net90" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DiaSymReader" />
Expand Down