Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
932883ad
R
runtime
项目概览
dotNET Platform
/
runtime
11 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
932883ad
编写于
11月 20, 2019
作者:
F
Fadi Hanna
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Propagate BestFitMapping/ThrowOnUnmappable from type/assembly
上级
60c362b2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
72 addition
and
2 deletion
+72
-2
src/coreclr/src/tools/crossgen2/Common/TypeSystem/Ecma/EcmaMethod.cs
.../src/tools/crossgen2/Common/TypeSystem/Ecma/EcmaMethod.cs
+72
-2
未找到文件。
src/coreclr/src/tools/crossgen2/Common/TypeSystem/Ecma/EcmaMethod.cs
浏览文件 @
932883ad
...
...
@@ -454,19 +454,48 @@ public override PInvokeMetadata GetPInvokeMethodMetadata()
return
default
(
PInvokeMetadata
);
MetadataReader
metadataReader
=
MetadataReader
;
MethodImport
import
=
metadataReader
.
GetMethodDefinition
(
_handle
).
GetImport
();
MethodDefinition
methodDef
=
metadataReader
.
GetMethodDefinition
(
_handle
);
MethodImport
import
=
methodDef
.
GetImport
();
string
name
=
metadataReader
.
GetString
(
import
.
Name
);
ModuleReference
moduleRef
=
metadataReader
.
GetModuleReference
(
import
.
Module
);
string
moduleName
=
metadataReader
.
GetString
(
moduleRef
.
Name
);
MethodImportAttributes
importAttributes
=
import
.
Attributes
;
// If either BestFitMapping or ThrowOnUnmappable wasn't set on the p/invoke,
// look for the value in the owning type or assembly.
if
((
importAttributes
&
MethodImportAttributes
.
BestFitMappingMask
)
==
0
||
(
importAttributes
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
)
==
0
)
{
TypeDefinition
declaringType
=
metadataReader
.
GetTypeDefinition
(
methodDef
.
GetDeclaringType
());
// Start with owning type
MethodImportAttributes
fromCA
=
GetImportAttributesFromBestFitMappingAttribute
(
declaringType
.
GetCustomAttributes
());
if
((
importAttributes
&
MethodImportAttributes
.
BestFitMappingMask
)
==
0
)
importAttributes
|=
fromCA
&
MethodImportAttributes
.
BestFitMappingMask
;
if
((
importAttributes
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
)
==
0
)
importAttributes
|=
fromCA
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
;
// If we still don't know, check the assembly
if
((
importAttributes
&
MethodImportAttributes
.
BestFitMappingMask
)
==
0
||
(
importAttributes
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
)
==
0
)
{
fromCA
=
GetImportAttributesFromBestFitMappingAttribute
(
metadataReader
.
GetAssemblyDefinition
().
GetCustomAttributes
());
if
((
importAttributes
&
MethodImportAttributes
.
BestFitMappingMask
)
==
0
)
importAttributes
|=
fromCA
&
MethodImportAttributes
.
BestFitMappingMask
;
if
((
importAttributes
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
)
==
0
)
importAttributes
|=
fromCA
&
MethodImportAttributes
.
ThrowOnUnmappableCharMask
;
}
}
// Spot check the enums match
Debug
.
Assert
((
int
)
MethodImportAttributes
.
CallingConventionStdCall
==
(
int
)
PInvokeAttributes
.
CallingConventionStdCall
);
Debug
.
Assert
((
int
)
MethodImportAttributes
.
CharSetAuto
==
(
int
)
PInvokeAttributes
.
CharSetAuto
);
Debug
.
Assert
((
int
)
MethodImportAttributes
.
CharSetUnicode
==
(
int
)
PInvokeAttributes
.
CharSetUnicode
);
Debug
.
Assert
((
int
)
MethodImportAttributes
.
SetLastError
==
(
int
)
PInvokeAttributes
.
SetLastError
);
PInvokeAttributes
attributes
=
(
PInvokeAttributes
)
import
.
Attributes
;
PInvokeAttributes
attributes
=
(
PInvokeAttributes
)
importAttributes
;
if
((
ImplAttributes
&
MethodImplAttributes
.
PreserveSig
)
!=
0
)
attributes
|=
PInvokeAttributes
.
PreserveSig
;
...
...
@@ -474,6 +503,47 @@ public override PInvokeMetadata GetPInvokeMethodMetadata()
return
new
PInvokeMetadata
(
moduleName
,
name
,
attributes
);
}
private
MethodImportAttributes
GetImportAttributesFromBestFitMappingAttribute
(
CustomAttributeHandleCollection
attributeHandles
)
{
// Look for the [BestFitMapping(BestFitMapping: x, ThrowOnUnmappableChar = y)] attribute and
// translate that to MethodImportAttributes
MethodImportAttributes
result
=
0
;
MetadataReader
reader
=
MetadataReader
;
CustomAttributeHandle
attributeHandle
=
reader
.
GetCustomAttributeHandle
(
attributeHandles
,
"System.Runtime.InteropServices"
,
"BestFitMappingAttribute"
);
if
(!
attributeHandle
.
IsNil
)
{
CustomAttribute
attribute
=
reader
.
GetCustomAttribute
(
attributeHandle
);
CustomAttributeValue
<
TypeDesc
>
decoded
=
attribute
.
DecodeValue
(
new
CustomAttributeTypeProvider
(
_type
.
EcmaModule
));
if
(
decoded
.
FixedArguments
.
Length
!=
1
||
!(
decoded
.
FixedArguments
[
0
].
Value
is
bool
))
ThrowHelper
.
ThrowBadImageFormatException
();
if
((
bool
)
decoded
.
FixedArguments
[
0
].
Value
)
result
|=
MethodImportAttributes
.
BestFitMappingEnable
;
else
result
|=
MethodImportAttributes
.
BestFitMappingDisable
;
foreach
(
CustomAttributeNamedArgument
<
TypeDesc
>
namedArg
in
decoded
.
NamedArguments
)
{
if
(
namedArg
.
Name
==
"ThrowOnUnmappableChar"
)
{
if
(!(
namedArg
.
Value
is
bool
))
ThrowHelper
.
ThrowBadImageFormatException
();
if
((
bool
)
namedArg
.
Value
)
result
|=
MethodImportAttributes
.
ThrowOnUnmappableCharEnable
;
else
result
|=
MethodImportAttributes
.
ThrowOnUnmappableCharDisable
;
break
;
}
}
}
return
result
;
}
public
override
ParameterMetadata
[]
GetParameterMetadata
()
{
MetadataReader
metadataReader
=
MetadataReader
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录