Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
1fb1c8f4
R
runtime
项目概览
dotNET Platform
/
runtime
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
1fb1c8f4
编写于
6月 08, 2021
作者:
A
Andrew Au
提交者:
GitHub
6月 08, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make sure EnsureInitialize() loads the GcInfo if it is there (#53896)
上级
878dc203
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
20 addition
and
12 deletion
+20
-12
src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
...ection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
+0
-1
src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunMethod.cs
.../aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunMethod.cs
+20
-11
未找到文件。
src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ILCompiler.Reflection.ReadyToRun.csproj
浏览文件 @
1fb1c8f4
...
...
@@ -14,7 +14,6 @@
<OutputPath>$(RuntimeBinDir)</OutputPath>
<Platforms>AnyCPU;x64</Platforms>
<PlatformTarget>AnyCPU</PlatformTarget>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<ItemGroup>
...
...
src/coreclr/tools/aot/ILCompiler.Reflection.ReadyToRun/ReadyToRunMethod.cs
浏览文件 @
1fb1c8f4
...
...
@@ -305,7 +305,7 @@ private void EnsureRuntimeFunctions()
if
(
this
.
_runtimeFunctions
==
null
)
{
this
.
_runtimeFunctions
=
new
List
<
RuntimeFunction
>();
this
.
ParseRuntimeFunctions
();
this
.
ParseRuntimeFunctions
(
false
);
}
}
...
...
@@ -474,17 +474,21 @@ public IReadOnlyList<FixupCell> Fixups
private
void
EnsureInitialized
()
{
if
(
_gcInfo
==
null
&&
GcInfoRva
!=
0
)
if
(
_gcInfo
==
null
)
{
int
gcInfoOffset
=
_readyToRunReader
.
CompositeReader
.
GetOffset
(
GcInfoRva
);
if
(
_readyToRunReader
.
Machine
==
Machine
.
I386
)
{
_gcInfo
=
new
x86
.
GcInfo
(
_readyToRunReader
.
Image
,
gcInfoOffset
,
_readyToRunReader
.
Machine
,
_readyToRunReader
.
ReadyToRunHeader
.
MajorVersion
);
}
else
ParseRuntimeFunctions
(
true
);
if
(
GcInfoRva
!=
0
)
{
// Arm and Arm64 use the same GcInfo format as Amd64
_gcInfo
=
new
Amd64
.
GcInfo
(
_readyToRunReader
.
Image
,
gcInfoOffset
,
_readyToRunReader
.
Machine
,
_readyToRunReader
.
ReadyToRunHeader
.
MajorVersion
);
int
gcInfoOffset
=
_readyToRunReader
.
CompositeReader
.
GetOffset
(
GcInfoRva
);
if
(
_readyToRunReader
.
Machine
==
Machine
.
I386
)
{
_gcInfo
=
new
x86
.
GcInfo
(
_readyToRunReader
.
Image
,
gcInfoOffset
,
_readyToRunReader
.
Machine
,
_readyToRunReader
.
ReadyToRunHeader
.
MajorVersion
);
}
else
{
// Arm and Arm64 use the same GcInfo format as Amd64
_gcInfo
=
new
Amd64
.
GcInfo
(
_readyToRunReader
.
Image
,
gcInfoOffset
,
_readyToRunReader
.
Machine
,
_readyToRunReader
.
ReadyToRunHeader
.
MajorVersion
);
}
}
}
if
(
_pgoInfo
==
null
)
...
...
@@ -547,7 +551,7 @@ private void EnsureFixupCells()
/// Get the RVAs of the runtime functions for each method
/// based on <a href="https://github.com/dotnet/coreclr/blob/master/src/zap/zapcode.cpp">ZapUnwindInfo::Save</a>
/// </summary>
private
void
ParseRuntimeFunctions
()
private
void
ParseRuntimeFunctions
(
bool
partial
)
{
int
runtimeFunctionId
=
EntryPointRuntimeFunctionId
;
int
runtimeFunctionSize
=
_readyToRunReader
.
CalculateRuntimeFunctionSize
();
...
...
@@ -602,6 +606,11 @@ private void ParseRuntimeFunctions()
}
}
if
(
partial
)
{
return
;
}
RuntimeFunction
rtf
=
new
RuntimeFunction
(
_readyToRunReader
,
runtimeFunctionId
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录