Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
9617fa2e
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,发现更多精彩内容 >>
提交
9617fa2e
编写于
7月 25, 2016
作者:
J
Julien
提交者:
GitHub
7月 25, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #12693 from vslsnap/merge-dev15-preview-4-into-master20160723-150102
Merge dev15-preview-4 into master
上级
46d97f9a
89be9817
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
77 addition
and
0 deletion
+77
-0
src/Compilers/CSharp/Portable/Lowering/MethodToClassRewriter.cs
...mpilers/CSharp/Portable/Lowering/MethodToClassRewriter.cs
+9
-0
src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs
...Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs
+68
-0
未找到文件。
src/Compilers/CSharp/Portable/Lowering/MethodToClassRewriter.cs
浏览文件 @
9617fa2e
...
@@ -721,6 +721,15 @@ internal override void AddSynthesizedAttributes(ModuleCompilationState compilati
...
@@ -721,6 +721,15 @@ internal override void AddSynthesizedAttributes(ModuleCompilationState compilati
AddSynthesizedAttribute
(
ref
attributes
,
this
.
DeclaringCompilation
.
TrySynthesizeAttribute
(
WellKnownMember
.
System_Diagnostics_DebuggerHiddenAttribute__ctor
));
AddSynthesizedAttribute
(
ref
attributes
,
this
.
DeclaringCompilation
.
TrySynthesizeAttribute
(
WellKnownMember
.
System_Diagnostics_DebuggerHiddenAttribute__ctor
));
}
}
internal
override
TypeSymbol
IteratorElementType
{
get
{
// BaseMethodWrapperSymbol should not be rewritten by the IteratorRewriter
return
null
;
}
}
}
}
}
}
}
}
src/Compilers/CSharp/Test/Semantic/Semantics/IteratorTests.cs
浏览文件 @
9617fa2e
...
@@ -339,5 +339,73 @@ public void TopLevelYieldBreak()
...
@@ -339,5 +339,73 @@ public void TopLevelYieldBreak()
Assert
.
NotNull
(
yieldNode
);
Assert
.
NotNull
(
yieldNode
);
Assert
.
Equal
(
SyntaxKind
.
YieldBreakStatement
,
yieldNode
.
Kind
());
Assert
.
Equal
(
SyntaxKind
.
YieldBreakStatement
,
yieldNode
.
Kind
());
}
}
[
Fact
]
[
WorkItem
(
11649
,
"https://github.com/dotnet/roslyn/issues/11649"
)]
public
void
IteratorRewriterShouldNotRewriteBaseMethodWrapperSymbol
()
{
var
text
=
@"using System.Collections.Generic;
class Base
{
protected virtual IEnumerable<int> M()
{
yield break;
}
class D : Base
{
protected override IEnumerable<int> M()
{
base.M(); // the rewriting of D.M() synthesizes a BaseMethodWrapperSymbol for this base call, with return type IEnumerable,
// but it should not in turn be lowered by the IteratorRewriter
yield break;
}
}
}"
;
var
comp
=
CreateCompilationWithMscorlib
(
text
,
options
:
TestOptions
.
DebugDll
);
comp
.
VerifyEmitDiagnostics
();
// without the fix for bug 11649, the compilation would fail emitting
CompileAndVerify
(
comp
);
}
[
Fact
]
[
WorkItem
(
11649
,
"https://github.com/dotnet/roslyn/issues/11649"
)]
public
void
IteratorRewriterShouldNotRewriteBaseMethodWrapperSymbol2
()
{
var
source
=
@"using System.Collections.Generic;
class Base
{
public static void Main()
{
System.Console.WriteLine(string.Join("","", new D().M()));
}
protected virtual IEnumerable<int> M()
{
yield return 1;
yield return 2;
yield break;
}
class D : Base
{
protected override IEnumerable<int> M()
{
yield return 0;
foreach (var n in base.M())
{
yield return n;
}
yield return 3;
yield break;
}
}
}"
;
var
comp
=
CompileAndVerify
(
source
,
expectedOutput
:
"0,1,2,3"
,
options
:
TestOptions
.
DebugExe
);
comp
.
Compilation
.
VerifyDiagnostics
();
}
}
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录