Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
17354951
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,发现更多精彩内容 >>
提交
17354951
编写于
4月 05, 2016
作者:
J
John Hamby
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Don't instrument local declarations without initializers.
上级
7d0314e2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
22 deletion
+47
-22
src/Compilers/CSharp/Portable/Compiler/Instrumentation.cs
src/Compilers/CSharp/Portable/Compiler/Instrumentation.cs
+41
-18
src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs
.../Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs
+6
-4
未找到文件。
src/Compilers/CSharp/Portable/Compiler/Instrumentation.cs
浏览文件 @
17354951
...
...
@@ -185,17 +185,19 @@ public override BoundNode Visit(BoundNode node)
case
BoundKind
.
ForStatement
:
return
visited
;
case
BoundKind
.
ReturnStatement
:
// A synthesized return statement that does not return a value never requires instrumentation.
// A property set method defined without a block has such a synthesized return statement.
if
(!
_methodHasExplicitBlock
&&
((
BoundReturnStatement
)
statement
).
ExpressionOpt
!=
null
)
{
// The return statement for value-returning methods defined without a block is compiler generated, but requires instrumentation.
return
Force
CollectDynamicAnalysis
(
visited
);
return
CollectDynamicAnalysis
(
visited
);
}
break
;
case
BoundKind
.
ExpressionStatement
:
if
(!
_methodHasExplicitBlock
)
{
// The assignment statement for a property set method defined without a block is compiler generated, but requires instrumentation.
return
Force
CollectDynamicAnalysis
(
visited
);
return
CollectDynamicAnalysis
(
visited
);
}
break
;
case
BoundKind
.
LocalDeclaration
:
...
...
@@ -226,6 +228,13 @@ public override BoundNode Visit(BoundNode node)
break
;
}
}
// Declarations without initializers are not instrumented.
if
(!
HasInitializer
((
BoundLocalDeclaration
)
statement
))
{
return
visited
;
}
break
;
case
BoundKind
.
MultipleLocalDeclarations
:
// Using and fixed statements have a multiple local declarations node even if they contain only one declaration.
...
...
@@ -246,44 +255,58 @@ public override BoundNode Visit(BoundNode node)
}
break
;
}
// Declarations without initializers are not instrumented.
// Ultimately the individual initializers will be implemented, but for now instrument the statement if it has any initializers.
if
(!
HasInitializer
((
BoundMultipleLocalDeclarations
)
statement
))
{
return
visited
;
}
break
;
default
:
break
;
}
return
CollectDynamicAnalysis
(
visited
);
if
(!
statement
.
WasCompilerGenerated
)
{
return
CollectDynamicAnalysis
(
visited
);
}
}
return
visited
;
}
private
BoundNode
CollectDynamicAnalysis
(
BoundNode
node
)
private
static
bool
HasInitializer
(
BoundLocalDeclaration
local
)
{
BoundStatement
statement
=
node
as
BoundStatement
;
if
(
statement
!=
null
)
{
return
CollectDynamicAnalysis
(
statement
);
}
return
node
;
return
local
.
InitializerOpt
!=
null
;
}
private
BoundNode
CollectDynamicAnalysis
(
BoundStatement
statement
)
private
static
bool
HasInitializer
(
BoundMultipleLocalDeclarations
multiple
)
{
if
(
statement
.
WasCompilerGenerated
)
foreach
(
BoundLocalDeclaration
local
in
multiple
.
LocalDeclarations
)
{
return
statement
;
if
(
HasInitializer
(
local
))
{
return
true
;
}
}
return
CollectDynamicAnalysisCore
(
statement
)
;
return
false
;
}
private
BoundNode
Force
CollectDynamicAnalysis
(
BoundNode
node
)
private
BoundNode
CollectDynamicAnalysis
(
BoundNode
node
)
{
return
CollectDynamicAnalysisCore
((
BoundStatement
)
node
);
BoundStatement
statement
=
node
as
BoundStatement
;
if
(
statement
!=
null
)
{
return
CollectDynamicAnalysis
(
statement
);
}
return
node
;
}
private
BoundNode
CollectDynamicAnalysis
Core
(
BoundStatement
statement
)
private
BoundNode
CollectDynamicAnalysis
(
BoundStatement
statement
)
{
// Add an entry in the spans array.
...
...
src/Compilers/CSharp/Test/Emit/Emit/DynamicAnalysis/DynamicInstrumentationTests.cs
浏览文件 @
17354951
...
...
@@ -260,6 +260,8 @@ public static void Main(string[] args)
static void TestMain()
{
int x;
int a, b;
DoubleDeclaration(5);
DoubleForDeclaration(5);
}
...
...
@@ -268,9 +270,10 @@ static int DoubleDeclaration(int x)
{
int c = x;
int a, b;
a = b = c;
int f;
a = b = f = c;
int d = a, e = b;
return d + e;
return d + e
+ f
;
}
static int DoubleForDeclaration(int x)
...
...
@@ -295,7 +298,6 @@ static int DoubleForDeclaration(int x)
True
True
True
True
4
True
False
...
...
@@ -613,7 +615,7 @@ async static Task<string> First(string s)
async static Task<string> Second(string s)
{
string doubled;
string doubled
= """"
;
if (s.Length > 2)
doubled = s + s;
else
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录