Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
ef7c9471
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,发现更多精彩内容 >>
未验证
提交
ef7c9471
编写于
8月 20, 2019
作者:
J
Jared Parsons
提交者:
GitHub
8月 20, 2019
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #38135 from RikkiGibson/nested-generic-pointer
Give LangVersion error when type is generic due to parent type
上级
aca10e05
f10365a1
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
39 addition
and
3 deletion
+39
-3
src/Compilers/CSharp/Portable/Symbols/BaseTypeAnalysis.cs
src/Compilers/CSharp/Portable/Symbols/BaseTypeAnalysis.cs
+4
-3
src/Compilers/CSharp/Test/Semantic/Semantics/GenericConstraintsTests.cs
...CSharp/Test/Semantic/Semantics/GenericConstraintsTests.cs
+27
-0
src/Compilers/CSharp/Test/Semantic/Semantics/UnsafeTests.cs
src/Compilers/CSharp/Test/Semantic/Semantics/UnsafeTests.cs
+8
-0
未找到文件。
src/Compilers/CSharp/Portable/Symbols/BaseTypeAnalysis.cs
浏览文件 @
ef7c9471
...
...
@@ -220,8 +220,9 @@ private static (bool definitelyManaged, bool hasGenerics) DependsOnDefinitelyMan
}
/// <summary>
/// Returns a boolean value if we can determine whether the type is managed
/// without looking at its fields and Unset otherwise.
/// Returns True or False if we can determine whether the type is managed
/// without looking at its fields and Unknown otherwise.
/// Also returns whether or not the given type is generic.
/// </summary>
private
static
(
ThreeState
isManaged
,
bool
hasGenerics
)
IsManagedTypeHelper
(
NamedTypeSymbol
type
)
{
...
...
@@ -231,7 +232,7 @@ private static (ThreeState isManaged, bool hasGenerics) IsManagedTypeHelper(Name
type
=
type
.
GetEnumUnderlyingType
();
}
bool
hasGenerics
=
type
.
TupleUnderlyingTypeOrSelf
()
.
GetArity
()
>
0
;
bool
hasGenerics
=
type
.
TupleUnderlyingTypeOrSelf
()
is
NamedTypeSymbol
{
IsGenericType
:
true
}
;
// Short-circuit common cases.
switch
(
type
.
SpecialType
)
...
...
src/Compilers/CSharp/Test/Semantic/Semantics/GenericConstraintsTests.cs
浏览文件 @
ef7c9471
...
...
@@ -3938,6 +3938,33 @@ public unsafe struct OtherStruct
CreateCompilation
(
code
,
options
:
TestOptions
.
UnsafeReleaseDll
).
VerifyDiagnostics
();
}
[
Fact
]
public
void
GenericNestedStructPointerFieldRequiresCSharp8
()
{
var
code
=
@"
public struct MyStruct<T>
{
public struct InnerStruct
{
public T field;
}
}
public unsafe struct OtherStruct
{
public MyStruct<int>.InnerStruct* ms;
}
"
;
CreateCompilation
(
code
,
options
:
TestOptions
.
UnsafeReleaseDll
,
parseOptions
:
TestOptions
.
Regular7_3
)
.
VerifyDiagnostics
(
// (12,39): error CS8370: Feature 'unmanaged constructed types' is not available in C# 7.3. Please use language version 8.0 or greater.
// public MyStruct<int>.InnerStruct* ms;
Diagnostic
(
ErrorCode
.
ERR_FeatureNotAvailableInVersion7_3
,
"ms"
).
WithArguments
(
"unmanaged constructed types"
,
"8.0"
).
WithLocation
(
12
,
39
)
);
CreateCompilation
(
code
,
options
:
TestOptions
.
UnsafeReleaseDll
).
VerifyDiagnostics
();
}
[
Fact
,
WorkItem
(
32103
,
"https://github.com/dotnet/roslyn/issues/32103"
)]
public
void
StructContainingTuple_Unmanaged_RequiresCSharp8
()
{
...
...
src/Compilers/CSharp/Test/Semantic/Semantics/UnsafeTests.cs
浏览文件 @
ef7c9471
...
...
@@ -2715,11 +2715,14 @@ class C<U>
S<int> f2;
S<U>.R f3;
S<int>.R f4;
S<U>.R2 f5;
S<int>.R2 f6;
}
struct S<T>
{
struct R { }
internal struct R2 { }
}
"
;
var
compilation
=
CreateCompilation
(
text
);
...
...
@@ -2734,6 +2737,11 @@ struct R { }
Assert
.
Equal
(
ManagedKind
.
Managed
,
type
.
GetMember
<
FieldSymbol
>(
"f3"
).
Type
.
ManagedKind
);
Assert
.
True
(
type
.
GetMember
<
FieldSymbol
>(
"f4"
).
Type
.
IsManagedType
);
Assert
.
Equal
(
ManagedKind
.
Managed
,
type
.
GetMember
<
FieldSymbol
>(
"f4"
).
Type
.
ManagedKind
);
Assert
.
False
(
type
.
GetMember
<
FieldSymbol
>(
"f5"
).
Type
.
IsManagedType
);
Assert
.
Equal
(
ManagedKind
.
UnmanagedWithGenerics
,
type
.
GetMember
<
FieldSymbol
>(
"f5"
).
Type
.
ManagedKind
);
Assert
.
False
(
type
.
GetMember
<
FieldSymbol
>(
"f6"
).
Type
.
IsManagedType
);
Assert
.
Equal
(
ManagedKind
.
UnmanagedWithGenerics
,
type
.
GetMember
<
FieldSymbol
>(
"f6"
).
Type
.
ManagedKind
);
}
[
Fact
]
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录