Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d2c1bb0b
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d2c1bb0b
编写于
2月 19, 2016
作者:
T
Tomas Matousek
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
EnC: Fix handling ByRef parameters in anonymous delegates
上级
4a433033
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
116 addition
and
2 deletion
+116
-2
src/Compilers/VisualBasic/Portable/Emit/EditAndContinue/PEDeltaAssemblyBuilder.vb
...c/Portable/Emit/EditAndContinue/PEDeltaAssemblyBuilder.vb
+1
-1
src/Compilers/VisualBasic/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousDelegate_TemplateSymbol.vb
...es/SynthesizedSymbols/AnonymousDelegate_TemplateSymbol.vb
+1
-1
src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.vb
...ic/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.vb
+114
-0
未找到文件。
src/Compilers/VisualBasic/Portable/Emit/EditAndContinue/PEDeltaAssemblyBuilder.vb
浏览文件 @
d2c1bb0b
...
...
@@ -181,7 +181,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Emit
Dim
method
=
DirectCast
(
members
(
0
),
MethodSymbol
)
Debug
.
Assert
(
method
.
Parameters
.
Length
+
If
(
method
.
IsSub
,
0
,
1
)
=
type
.
TypeParameters
.
Length
)
Dim
parameters
=
ArrayBuilder
(
Of
AnonymousTypeKeyField
).
GetInstance
()
parameters
.
AddRange
(
method
.
Parameters
.
SelectAsArray
(
Function
(
p
)
New
AnonymousTypeKeyField
(
p
.
Name
,
isKey
:
=
False
,
ignoreCase
:
=
True
)))
parameters
.
AddRange
(
method
.
Parameters
.
SelectAsArray
(
Function
(
p
)
New
AnonymousTypeKeyField
(
p
.
Name
,
isKey
:
=
p
.
IsByRef
,
ignoreCase
:
=
True
)))
parameters
.
Add
(
New
AnonymousTypeKeyField
(
AnonymousTypeDescriptor
.
GetReturnParameterName
(
Not
method
.
IsSub
),
isKey
:
=
False
,
ignoreCase
:
=
True
))
Return
New
AnonymousTypeKey
(
parameters
.
ToImmutableAndFree
(),
isDelegate
:
=
True
)
End
Function
...
...
src/Compilers/VisualBasic/Portable/Symbols/AnonymousTypes/SynthesizedSymbols/AnonymousDelegate_TemplateSymbol.vb
浏览文件 @
d2c1bb0b
...
...
@@ -125,7 +125,7 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
End
Sub
Friend
Overrides
Function
GetAnonymousTypeKey
()
As
AnonymousTypeKey
Dim
parameters
=
TypeDescr
.
Parameters
.
SelectAsArray
(
Function
(
p
)
New
AnonymousTypeKeyField
(
p
.
Name
,
isKey
:
=
False
,
ignoreCase
:
=
True
))
Dim
parameters
=
TypeDescr
.
Parameters
.
SelectAsArray
(
Function
(
p
)
New
AnonymousTypeKeyField
(
p
.
Name
,
isKey
:
=
p
.
IsByRef
,
ignoreCase
:
=
True
))
Return
New
AnonymousTypeKey
(
parameters
,
isDelegate
:
=
True
)
End
Function
...
...
src/Compilers/VisualBasic/Test/Emit/Emit/EditAndContinue/EditAndContinueTests.vb
浏览文件 @
d2c1bb0b
...
...
@@ -4273,6 +4273,120 @@ End Class
diff2
.
VerifyIL
(
"C.F"
,
expectedIL
.
Replace
(
"<<VALUE>>"
,
"2"
))
End
Sub
<
Fact
>
Public
Sub
AnonymousDelegates1
()
Dim
source0
=
MarkedSource
(
"
Class C
Private Sub F()
Dim <N:0>g</N:0> = <N:1>Function(ByRef arg As String) arg</N:1>
System.Console.WriteLine(1)
End Sub
End Class
"
)
Dim
source1
=
MarkedSource
(
"
Class C
Private Sub F()
Dim <N:0>g</N:0> = <N:1>Function(ByRef arg As String) arg</N:1>
System.Console.WriteLine(2)
End Sub
End Class
"
)
Dim
source2
=
MarkedSource
(
"
Class C
Private Sub F()
Dim <N:0>g</N:0> = <N:1>Function(ByRef arg As String) arg</N:1>
System.Console.WriteLine(3)
End Sub
End Class
"
)
Dim
compilation0
=
CreateCompilationWithMscorlib
({
source0
.
Tree
},
options
:
=
ComSafeDebugDll
)
Dim
compilation1
=
compilation0
.
WithSource
(
source1
.
Tree
)
Dim
compilation2
=
compilation1
.
WithSource
(
source2
.
Tree
)
Dim
v0
=
CompileAndVerify
(
compilation0
)
v0
.
VerifyIL
(
"C.F"
,
"
{
// Code size 46 (0x2e)
.maxstack 2
.locals init (VB$AnonymousDelegate_0(Of String, String) V_0) //g
IL_0000: nop
IL_0001: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0006: brfalse.s IL_000f
IL_0008: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_000d: br.s IL_0025
IL_000f: ldsfld
""
C._Closure$__.$I As C._Closure$__
""
IL_0014: ldftn
""
Function C._Closure$__._Lambda$__1-0(ByRef String) As String
""
IL_001a: newobj
""
Sub VB$AnonymousDelegate_0(Of String, String)..ctor(Object, System.IntPtr)
""
IL_001f: dup
IL_0020: stsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0025: stloc.0
IL_0026: ldc.i4.1
IL_0027: call
""
Sub System.Console.WriteLine(Integer)
""
IL_002c: nop
IL_002d: ret
}
"
)
Dim
md0
=
ModuleMetadata
.
CreateFromImage
(
v0
.
EmittedAssemblyData
)
Dim
generation0
=
EmitBaseline
.
CreateInitialBaseline
(
md0
,
AddressOf
v0
.
CreateSymReader
().
GetEncMethodDebugInfo
)
Dim
f0
=
compilation0
.
GetMember
(
Of
MethodSymbol
)(
"C.F"
)
Dim
f1
=
compilation1
.
GetMember
(
Of
MethodSymbol
)(
"C.F"
)
Dim
f2
=
compilation2
.
GetMember
(
Of
MethodSymbol
)(
"C.F"
)
Dim
diff1
=
compilation1
.
EmitDifference
(
generation0
,
ImmutableArray
.
Create
(
New
SemanticEdit
(
SemanticEditKind
.
Update
,
f0
,
f1
,
GetSyntaxMapFromMarkers
(
source0
,
source1
),
preserveLocalVariables
:
=
True
)))
diff1
.
VerifyIL
(
"C.F"
,
"
{
// Code size 46 (0x2e)
.maxstack 2
.locals init (VB$AnonymousDelegate_0(Of String, String) V_0) //g
IL_0000: nop
IL_0001: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0006: brfalse.s IL_000f
IL_0008: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_000d: br.s IL_0025
IL_000f: ldsfld
""
C._Closure$__.$I As C._Closure$__
""
IL_0014: ldftn
""
Function C._Closure$__._Lambda$__1-0(ByRef String) As String
""
IL_001a: newobj
""
Sub VB$AnonymousDelegate_0(Of String, String)..ctor(Object, System.IntPtr)
""
IL_001f: dup
IL_0020: stsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0025: stloc.0
IL_0026: ldc.i4.2
IL_0027: call
""
Sub System.Console.WriteLine(Integer)
""
IL_002c: nop
IL_002d: ret
}
"
)
Dim
diff2
=
compilation2
.
EmitDifference
(
diff1
.
NextGeneration
,
ImmutableArray
.
Create
(
New
SemanticEdit
(
SemanticEditKind
.
Update
,
f1
,
f2
,
GetSyntaxMapFromMarkers
(
source1
,
source2
),
preserveLocalVariables
:
=
True
)))
diff2
.
VerifyIL
(
"C.F"
,
"
{
// Code size 46 (0x2e)
.maxstack 2
.locals init (VB$AnonymousDelegate_0(Of String, String) V_0) //g
IL_0000: nop
IL_0001: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0006: brfalse.s IL_000f
IL_0008: ldsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_000d: br.s IL_0025
IL_000f: ldsfld
""
C._Closure$__.$I As C._Closure$__
""
IL_0014: ldftn
""
Function C._Closure$__._Lambda$__1-0(ByRef String) As String
""
IL_001a: newobj
""
Sub VB$AnonymousDelegate_0(Of String, String)..ctor(Object, System.IntPtr)
""
IL_001f: dup
IL_0020: stsfld
""
C._Closure$__.$I1-0 As <generated method>
""
IL_0025: stloc.0
IL_0026: ldc.i4.3
IL_0027: call
""
Sub System.Console.WriteLine(Integer)
""
IL_002c: nop
IL_002d: ret
}
"
)
End
Sub
''' <summary>
''' Should not re-use locals with custom modifiers.
''' </summary>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录