Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
141b84fb
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,发现更多精彩内容 >>
未验证
提交
141b84fb
编写于
10月 23, 2018
作者:
F
Fredric Silberberg
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Correctly return cached blocks in the IncrementalBinder for things that use BindEmbeddedBlock.
上级
f3cbd8b4
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
39 addition
and
1 deletion
+39
-1
src/Compilers/CSharp/Portable/Binder/Binder_Statements.cs
src/Compilers/CSharp/Portable/Binder/Binder_Statements.cs
+1
-1
src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
...pilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
+5
-0
src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests.cs
...lers/CSharp/Test/IOperation/IOperation/IOperationTests.cs
+33
-0
未找到文件。
src/Compilers/CSharp/Portable/Binder/Binder_Statements.cs
浏览文件 @
141b84fb
...
@@ -1588,7 +1588,7 @@ protected virtual LocalFunctionSymbol LookupLocalFunction(SyntaxToken nameToken)
...
@@ -1588,7 +1588,7 @@ protected virtual LocalFunctionSymbol LookupLocalFunction(SyntaxToken nameToken)
/// </summary>
/// </summary>
internal
virtual
uint
LocalScopeDepth
=>
Next
.
LocalScopeDepth
;
internal
virtual
uint
LocalScopeDepth
=>
Next
.
LocalScopeDepth
;
internal
BoundBlock
BindEmbeddedBlock
(
BlockSyntax
node
,
DiagnosticBag
diagnostics
)
internal
virtual
BoundBlock
BindEmbeddedBlock
(
BlockSyntax
node
,
DiagnosticBag
diagnostics
)
{
{
return
BindBlock
(
node
,
diagnostics
);
return
BindBlock
(
node
,
diagnostics
);
}
}
...
...
src/Compilers/CSharp/Portable/Compilation/MemberSemanticModel.cs
浏览文件 @
141b84fb
...
@@ -2085,6 +2085,11 @@ public override BoundStatement BindStatement(StatementSyntax node, DiagnosticBag
...
@@ -2085,6 +2085,11 @@ public override BoundStatement BindStatement(StatementSyntax node, DiagnosticBag
return
(
BoundStatement
)
boundNode
;
return
(
BoundStatement
)
boundNode
;
}
}
internal
override
BoundBlock
BindEmbeddedBlock
(
BlockSyntax
node
,
DiagnosticBag
diagnostics
)
{
return
(
BoundBlock
)
TryGetBoundNodeFromMap
(
node
)
??
base
.
BindEmbeddedBlock
(
node
,
diagnostics
);
}
private
BoundNode
TryGetBoundNodeFromMap
(
CSharpSyntaxNode
node
)
private
BoundNode
TryGetBoundNodeFromMap
(
CSharpSyntaxNode
node
)
{
{
ImmutableArray
<
BoundNode
>
boundNodes
=
_semanticModel
.
GuardedGetBoundNodesFromMap
(
node
);
ImmutableArray
<
BoundNode
>
boundNodes
=
_semanticModel
.
GuardedGetBoundNodesFromMap
(
node
);
...
...
src/Compilers/CSharp/Test/IOperation/IOperation/IOperationTests.cs
浏览文件 @
141b84fb
...
@@ -493,6 +493,39 @@ void M(int x)
...
@@ -493,6 +493,39 @@ void M(int x)
"
);
"
);
}
}
[
Fact
,
WorkItem
(
26649
,
"https://github.com/dotnet/roslyn/issues/26649"
)]
public
void
IncrementalBindingReusesBlock
()
{
var
source
=
@"
class C
{
void M()
{
try
{
}
catch (Exception e)
{
throw new Exception();
}
}
}"
;
var
compilation
=
CreateCompilation
(
source
);
var
syntaxTree
=
compilation
.
SyntaxTrees
[
0
];
var
semanticModel
=
compilation
.
GetSemanticModel
(
syntaxTree
);
// We want to get the IOperation for the { throw new Exception(); } first, and then for the containing catch block, to
// force the semantic model to bind the inner first. It should reuse that inner block when binding the outer catch.
var
catchBlock
=
syntaxTree
.
GetRoot
().
DescendantNodes
().
OfType
<
CatchClauseSyntax
>().
Single
();
var
exceptionBlock
=
catchBlock
.
Block
;
var
blockOperation
=
semanticModel
.
GetOperation
(
exceptionBlock
);
var
catchOperation
=
(
ICatchClauseOperation
)
semanticModel
.
GetOperation
(
catchBlock
);
Assert
.
Same
(
blockOperation
,
catchOperation
.
Handler
);
}
private
static
void
VerifyRootAndModelForOperationAncestors
(
private
static
void
VerifyRootAndModelForOperationAncestors
(
IOperation
operation
,
IOperation
operation
,
SemanticModel
model
,
SemanticModel
model
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录