Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
b21abf0c
R
runtime
项目概览
dotNET Platform
/
runtime
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
b21abf0c
编写于
11月 14, 2019
作者:
J
jashook
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Apply format patch and run git out of tempdir
上级
c8eab0ce
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
35 addition
and
37 deletion
+35
-37
src/coreclr/src/jit/compiler.cpp
src/coreclr/src/jit/compiler.cpp
+3
-2
src/coreclr/tests/scripts/format.py
src/coreclr/tests/scripts/format.py
+32
-35
未找到文件。
src/coreclr/src/jit/compiler.cpp
浏览文件 @
b21abf0c
...
...
@@ -6139,8 +6139,9 @@ int Compiler::compCompileHelper(CORINFO_MODULE_HANDLE classPtr,
#ifdef DEBUG
if
(
JitConfig
.
DumpJittedMethods
()
==
1
&&
!
compIsForInlining
())
{
printf
(
"Compiling %4d %s::%s, IL size = %u, hash=%08x %s
\n
"
,
Compiler
::
jitTotalMethodCompiled
,
info
.
compClassName
,
info
.
compMethodName
,
info
.
compILCodeSize
,
info
.
compMethodHash
(),
compGetTieringName
());
printf
(
"Compiling %4d %s::%s, IL size = %u, hash=%08x %s
\n
"
,
Compiler
::
jitTotalMethodCompiled
,
info
.
compClassName
,
info
.
compMethodName
,
info
.
compILCodeSize
,
info
.
compMethodHash
(),
compGetTieringName
());
}
if
(
compIsForInlining
())
{
...
...
src/coreclr/tests/scripts/format.py
浏览文件 @
b21abf0c
...
...
@@ -161,7 +161,6 @@ def main(argv):
returncode
=
0
jitutilsBin
=
os
.
path
.
join
(
os
.
path
.
dirname
(
bootstrapPath
),
"jitutils"
,
"bin"
)
my_env
[
"PATH"
]
=
jitutilsBin
+
os
.
pathsep
+
my_env
[
"PATH"
]
current_dir
=
os
.
getcwd
()
if
not
os
.
path
.
isdir
(
jitutilsBin
):
print
(
"Jitutils not built!"
)
...
...
@@ -203,43 +202,41 @@ def main(argv):
proc
=
subprocess
.
Popen
([
jitformat
,
"--fix"
,
"-a"
,
arch
,
"-b"
,
build
,
"-o"
,
platform
,
"-c"
,
coreclr
,
"--verbose"
,
"--projects"
,
project
],
env
=
my_env
)
output
,
error
=
proc
.
communicate
()
os
.
chdir
(
current_dir
)
patchFilePath
=
os
.
path
.
join
(
coreclr
,
"format.patch"
)
patchFilePath
=
os
.
path
.
join
(
coreclr
,
"format.patch"
)
if
returncode
!=
0
:
# Create a patch file
print
(
"Creating patch file "
+
patchFilePath
)
patchFile
=
open
(
patchFilePath
,
"w"
)
proc
=
subprocess
.
Popen
([
"git"
,
"diff"
,
"--patch"
,
"-U20"
],
env
=
my_env
,
stdout
=
patchFile
)
output
,
error
=
proc
.
communicate
()
if
returncode
!=
0
:
# Create a patch file
print
(
"Creating patch file "
+
patchFilePath
)
patchFile
=
open
(
patchFilePath
,
"w"
)
proc
=
subprocess
.
Popen
([
"git"
,
"diff"
,
"--patch"
,
"-U20"
],
env
=
my_env
,
stdout
=
patchFile
)
output
,
error
=
proc
.
communicate
()
if
os
.
path
.
isdir
(
jitUtilsPath
):
print
(
"Deleting "
+
jitUtilsPath
)
shutil
.
rmtree
(
jitUtilsPath
,
onerror
=
del_rw
)
if
os
.
path
.
isdir
(
jitUtilsPath
):
print
(
"Deleting "
+
jitUtilsPath
)
shutil
.
rmtree
(
jitUtilsPath
,
onerror
=
del_rw
)
if
os
.
path
.
isfile
(
bootstrapPath
):
print
(
"Deleting "
+
bootstrapPath
)
os
.
remove
(
bootstrapPath
)
if
returncode
!=
0
:
print
(
"There were errors in formatting. Please run jit-format locally with:
\n
"
)
print
(
errorMessage
)
print
(
"
\n
Or download and apply generated patch:"
)
print
(
"1. From the GitHub 'Checks' page on the Pull Request, with the failing Formatting"
)
print
(
" job selected (e.g., 'Formatting Linux x64'), click the 'View more details on"
)
print
(
" Azure Pipelines' link."
)
print
(
"3. Select the 'Summary' tab."
)
print
(
"4. Open the 'Build artifacts published' entry."
)
print
(
"5. Find the link to the OS/architecture appropriate format patch file."
)
print
(
"6. Click on the link to download it."
)
print
(
"7. Unzip the patch file."
)
print
(
"8. git apply format.patch"
)
if
(
returncode
!=
0
)
and
(
os
.
environ
.
get
(
"TF_BUILD"
)
==
"True"
):
print
(
"##vso[task.logissue type=error](NETCORE_ENGINEERING_TELEMETRY=Build) Format job found errors, please apply the format patch."
)
return
returncode
if
os
.
path
.
isfile
(
bootstrapPath
):
print
(
"Deleting "
+
bootstrapPath
)
os
.
remove
(
bootstrapPath
)
if
returncode
!=
0
:
print
(
"There were errors in formatting. Please run jit-format locally with:
\n
"
)
print
(
errorMessage
)
print
(
"
\n
Or download and apply generated patch:"
)
print
(
"1. From the GitHub 'Checks' page on the Pull Request, with the failing Formatting"
)
print
(
" job selected (e.g., 'Formatting Linux x64'), click the 'View more details on"
)
print
(
" Azure Pipelines' link."
)
print
(
"3. Select the 'Summary' tab."
)
print
(
"4. Open the 'Build artifacts published' entry."
)
print
(
"5. Find the link to the OS/architecture appropriate format patch file."
)
print
(
"6. Click on the link to download it."
)
print
(
"7. Unzip the patch file."
)
print
(
"8. git apply format.patch"
)
if
(
returncode
!=
0
)
and
(
os
.
environ
.
get
(
"TF_BUILD"
)
==
"True"
):
print
(
"##vso[task.logissue type=error](NETCORE_ENGINEERING_TELEMETRY=Build) Format job found errors, please apply the format patch."
)
return
returncode
if
__name__
==
'__main__'
:
return_code
=
main
(
sys
.
argv
[
1
:])
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录