Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
15507bcb
R
Rust
项目概览
int
/
Rust
11 个月 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
Rust
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
15507bcb
编写于
4月 13, 2017
作者:
N
Niko Matsakis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
remove `metadata_*` from `SharedCrateContext`
No good reason for them to be in there.
上级
ea376822
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
22 addition
and
34 deletion
+22
-34
src/librustc_trans/base.rs
src/librustc_trans/base.rs
+21
-16
src/librustc_trans/context.rs
src/librustc_trans/context.rs
+1
-18
未找到文件。
src/librustc_trans/base.rs
浏览文件 @
15507bcb
...
...
@@ -32,7 +32,7 @@
use
back
::
link
;
use
back
::
linker
::
LinkerInfo
;
use
back
::
symbol_export
::{
self
,
ExportedSymbols
};
use
llvm
::{
Linkage
,
ValueRef
,
Vector
,
get_param
};
use
llvm
::{
ContextRef
,
Linkage
,
ModuleRef
,
ValueRef
,
Vector
,
get_param
};
use
llvm
;
use
rustc
::
hir
::
def_id
::
LOCAL_CRATE
;
use
middle
::
lang_items
::
StartFnLangItem
;
...
...
@@ -56,7 +56,7 @@
use
common
::{
type_is_zero_size
,
val_ty
};
use
common
;
use
consts
;
use
context
::{
SharedCrateContext
,
CrateContextList
};
use
context
::{
self
,
SharedCrateContext
,
CrateContextList
};
use
debuginfo
;
use
declare
;
use
machine
;
...
...
@@ -726,9 +726,13 @@ fn contains_null(s: &str) -> bool {
fn
write_metadata
(
cx
:
&
SharedCrateContext
,
exported_symbols
:
&
NodeSet
)
->
EncodedMetadata
{
->
(
ContextRef
,
ModuleRef
,
EncodedMetadata
)
{
use
flate
;
let
(
metadata_llcx
,
metadata_llmod
)
=
unsafe
{
context
::
create_context_and_module
(
cx
.sess
(),
"metadata"
)
};
#[derive(PartialEq,
Eq,
PartialOrd,
Ord)]
enum
MetadataKind
{
None
,
...
...
@@ -750,10 +754,10 @@ enum MetadataKind {
})
.max
()
.unwrap
();
if
kind
==
MetadataKind
::
None
{
return
EncodedMetadata
{
return
(
metadata_llcx
,
metadata_llmod
,
EncodedMetadata
{
raw_data
:
vec!
[],
hashes
:
vec!
[],
};
}
)
;
}
let
cstore
=
&
cx
.tcx
()
.sess.cstore
;
...
...
@@ -761,19 +765,19 @@ enum MetadataKind {
cx
.link_meta
(),
exported_symbols
);
if
kind
==
MetadataKind
::
Uncompressed
{
return
metadata
;
return
(
metadata_llcx
,
metadata_llmod
,
metadata
)
;
}
assert
!
(
kind
==
MetadataKind
::
Compressed
);
let
mut
compressed
=
cstore
.metadata_encoding_version
()
.to_vec
();
compressed
.extend_from_slice
(
&
flate
::
deflate_bytes
(
&
metadata
.raw_data
));
let
llmeta
=
C_bytes_in_context
(
cx
.metadata_llcx
()
,
&
compressed
);
let
llconst
=
C_struct_in_context
(
cx
.metadata_llcx
()
,
&
[
llmeta
],
false
);
let
llmeta
=
C_bytes_in_context
(
metadata_llcx
,
&
compressed
);
let
llconst
=
C_struct_in_context
(
metadata_llcx
,
&
[
llmeta
],
false
);
let
name
=
cx
.metadata_symbol_name
();
let
buf
=
CString
::
new
(
name
)
.unwrap
();
let
llglobal
=
unsafe
{
llvm
::
LLVMAddGlobal
(
cx
.metadata_llmod
()
,
val_ty
(
llconst
)
.to_ref
(),
buf
.as_ptr
())
llvm
::
LLVMAddGlobal
(
metadata_llmod
,
val_ty
(
llconst
)
.to_ref
(),
buf
.as_ptr
())
};
unsafe
{
llvm
::
LLVMSetInitializer
(
llglobal
,
llconst
);
...
...
@@ -787,9 +791,9 @@ enum MetadataKind {
// metadata doesn't get loaded into memory.
let
directive
=
format!
(
".section {}"
,
section_name
);
let
directive
=
CString
::
new
(
directive
)
.unwrap
();
llvm
::
LLVMSetModuleInlineAsm
(
cx
.metadata_llmod
()
,
directive
.as_ptr
())
llvm
::
LLVMSetModuleInlineAsm
(
metadata_llmod
,
directive
.as_ptr
())
}
return
metadata
;
return
(
metadata_llcx
,
metadata_llmod
,
metadata
)
;
}
/// Find any symbols that are defined in one compilation unit, but not declared
...
...
@@ -1070,16 +1074,17 @@ pub fn trans_crate<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
exported_symbols
,
check_overflow
);
// Translate the metadata.
let
metadata
=
time
(
tcx
.sess
.time_passes
(),
"write metadata"
,
||
{
write_metadata
(
&
shared_ccx
,
shared_ccx
.exported_symbols
())
});
let
(
metadata_llcx
,
metadata_llmod
,
metadata
)
=
time
(
tcx
.sess
.time_passes
(),
"write metadata"
,
||
{
write_metadata
(
&
shared_ccx
,
shared_ccx
.exported_symbols
())
});
let
metadata_module
=
ModuleTranslation
{
name
:
link
::
METADATA_MODULE_NAME
.to_string
(),
symbol_name_hash
:
0
,
// we always rebuild metadata, at least for now
source
:
ModuleSource
::
Translated
(
ModuleLlvm
{
llcx
:
shared_ccx
.metadata_llcx
()
,
llmod
:
shared_ccx
.metadata_llmod
()
,
llcx
:
metadata_llcx
,
llmod
:
metadata_llmod
,
}),
};
let
no_builtins
=
attr
::
contains_name
(
&
krate
.attrs
,
"no_builtins"
);
...
...
src/librustc_trans/context.rs
浏览文件 @
15507bcb
...
...
@@ -65,9 +65,6 @@ pub struct Stats {
/// crate, so it must not contain references to any LLVM data structures
/// (aside from metadata-related ones).
pub
struct
SharedCrateContext
<
'a
,
'tcx
:
'a
>
{
metadata_llmod
:
ModuleRef
,
metadata_llcx
:
ContextRef
,
exported_symbols
:
NodeSet
,
link_meta
:
LinkMeta
,
tcx
:
TyCtxt
<
'a
,
'tcx
,
'tcx
>
,
...
...
@@ -347,7 +344,7 @@ pub fn is_pie_binary(sess: &Session) -> bool {
!
is_any_library
(
sess
)
&&
get_reloc_model
(
sess
)
==
llvm
::
RelocMode
::
PIC
}
unsafe
fn
create_context_and_module
(
sess
:
&
Session
,
mod_name
:
&
str
)
->
(
ContextRef
,
ModuleRef
)
{
pub
unsafe
fn
create_context_and_module
(
sess
:
&
Session
,
mod_name
:
&
str
)
->
(
ContextRef
,
ModuleRef
)
{
let
llcx
=
llvm
::
LLVMContextCreate
();
let
mod_name
=
CString
::
new
(
mod_name
)
.unwrap
();
let
llmod
=
llvm
::
LLVMModuleCreateWithNameInContext
(
mod_name
.as_ptr
(),
llcx
);
...
...
@@ -409,10 +406,6 @@ pub fn new(tcx: TyCtxt<'b, 'tcx, 'tcx>,
exported_symbols
:
NodeSet
,
check_overflow
:
bool
)
->
SharedCrateContext
<
'b
,
'tcx
>
{
let
(
metadata_llcx
,
metadata_llmod
)
=
unsafe
{
create_context_and_module
(
&
tcx
.sess
,
"metadata"
)
};
// An interesting part of Windows which MSVC forces our hand on (and
// apparently MinGW didn't) is the usage of `dllimport` and `dllexport`
// attributes in LLVM IR as well as native dependencies (in C these
...
...
@@ -459,8 +452,6 @@ pub fn new(tcx: TyCtxt<'b, 'tcx, 'tcx>,
let
use_dll_storage_attrs
=
tcx
.sess.target.target.options.is_like_msvc
;
SharedCrateContext
{
metadata_llmod
:
metadata_llmod
,
metadata_llcx
:
metadata_llcx
,
exported_symbols
:
exported_symbols
,
link_meta
:
link_meta
,
empty_param_env
:
tcx
.empty_parameter_environment
(),
...
...
@@ -492,14 +483,6 @@ pub fn type_is_sized(&self, ty: Ty<'tcx>) -> bool {
ty
.is_sized
(
self
.tcx
,
&
self
.empty_param_env
,
DUMMY_SP
)
}
pub
fn
metadata_llmod
(
&
self
)
->
ModuleRef
{
self
.metadata_llmod
}
pub
fn
metadata_llcx
(
&
self
)
->
ContextRef
{
self
.metadata_llcx
}
pub
fn
exported_symbols
<
'a
>
(
&
'a
self
)
->
&
'a
NodeSet
{
&
self
.exported_symbols
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录