Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
Rust
提交
8b8d41d2
R
Rust
项目概览
int
/
Rust
12 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
8b8d41d2
编写于
1月 25, 2014
作者:
X
xales
提交者:
Flavio Percoco
3月 06, 2014
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow mutable slices in statics.
Fixes #11411
上级
1eb3f63d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
54 addition
and
8 deletion
+54
-8
src/librustc/middle/borrowck/check_loans.rs
src/librustc/middle/borrowck/check_loans.rs
+3
-0
src/librustc/middle/check_const.rs
src/librustc/middle/check_const.rs
+14
-5
src/librustc/middle/trans/consts.rs
src/librustc/middle/trans/consts.rs
+6
-3
src/test/compile-fail/issue-11411.rs
src/test/compile-fail/issue-11411.rs
+13
-0
src/test/run-pass/issue-11411.rs
src/test/run-pass/issue-11411.rs
+18
-0
未找到文件。
src/librustc/middle/borrowck/check_loans.rs
浏览文件 @
8b8d41d2
...
...
@@ -520,6 +520,9 @@ fn check_for_aliasability_violation(this: &CheckLoanCtxt,
None
=>
{
return
true
;
}
Some
(
mc
::
AliasableStaticMut
)
=>
{
return
true
;
}
Some
(
cause
)
=>
{
this
.bccx
.report_aliasability_violation
(
expr
.span
,
...
...
src/librustc/middle/check_const.rs
浏览文件 @
8b8d41d2
...
...
@@ -29,14 +29,15 @@ pub struct CheckCrateVisitor {
impl
Visitor
<
bool
>
for
CheckCrateVisitor
{
fn
visit_item
(
&
mut
self
,
i
:
&
Item
,
env
:
bool
)
{
check_item
(
self
,
self
.sess
,
self
.def_map
,
i
,
env
);
check_item
(
self
,
self
.sess
,
self
.def_map
,
self
.method_map
,
self
.tcx
,
i
,
env
)
}
fn
visit_pat
(
&
mut
self
,
p
:
&
Pat
,
env
:
bool
)
{
check_pat
(
self
,
p
,
env
);
}
fn
visit_expr
(
&
mut
self
,
ex
:
&
Expr
,
env
:
bool
)
{
check_expr
(
self
,
self
.sess
,
self
.def_map
,
self
.method_map
,
self
.tcx
,
ex
,
env
);
self
.tcx
,
ex
,
env
,
false
);
}
}
...
...
@@ -58,11 +59,13 @@ pub fn check_crate(sess: Session,
pub
fn
check_item
(
v
:
&
mut
CheckCrateVisitor
,
sess
:
Session
,
def_map
:
resolve
::
DefMap
,
method_map
:
typeck
::
method_map
,
tcx
:
ty
::
ctxt
,
it
:
&
Item
,
_
is_const
:
bool
)
{
match
it
.node
{
ItemStatic
(
_
,
_
,
ex
)
=>
{
v
.visit_expr
(
ex
,
tru
e
);
ItemStatic
(
_
,
mut
_
,
ex
)
=>
{
check_expr
(
v
,
sess
,
def_map
,
method_map
,
tcx
,
ex
,
true
,
mut_
==
MutMutabl
e
);
check_item_recursion
(
sess
,
&
v
.tcx.map
,
def_map
,
it
);
}
ItemEnum
(
ref
enum_definition
,
_
)
=>
{
...
...
@@ -105,7 +108,8 @@ pub fn check_expr(v: &mut CheckCrateVisitor,
method_map
:
typeck
::
MethodMap
,
tcx
:
ty
::
ctxt
,
e
:
&
Expr
,
is_const
:
bool
)
{
is_const
:
bool
,
is_static_mut
:
bool
)
{
if
is_const
{
match
e
.node
{
ExprUnary
(
UnDeref
,
_
)
=>
{
}
...
...
@@ -187,6 +191,11 @@ pub fn check_expr(v: &mut CheckCrateVisitor,
e
.span
,
"references in constants may only refer to
\
immutable values"
);
}
ExprVstore
(
_
,
ExprVstoreMutSlice
)
=>
{
if
!
is_static_mut
{
sess
.span_err
(
e
.span
,
"mutable slice is not allowed in immutable constants"
)
}
},
ExprVstore
(
_
,
ExprVstoreUniq
)
=>
{
sess
.span_err
(
e
.span
,
"cannot allocate vectors in constant expressions"
)
...
...
src/librustc/middle/trans/consts.rs
浏览文件 @
8b8d41d2
...
...
@@ -10,7 +10,8 @@
use
back
::
abi
;
use
lib
::
llvm
::{
llvm
,
ConstFCmp
,
ConstICmp
,
SetLinkage
,
PrivateLinkage
,
ValueRef
,
Bool
,
True
};
use
lib
::
llvm
::{
llvm
,
ConstFCmp
,
ConstICmp
,
SetLinkage
,
PrivateLinkage
,
ValueRef
,
Bool
,
True
,
False
};
use
lib
::
llvm
::{
IntEQ
,
IntNE
,
IntUGT
,
IntUGE
,
IntULT
,
IntULE
,
IntSGT
,
IntSGE
,
IntSLT
,
IntSLE
,
RealOEQ
,
RealOGT
,
RealOGE
,
RealOLT
,
RealOLE
,
RealONE
};
...
...
@@ -572,7 +573,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: &ast::Expr,
is_local
);
(
v
,
inlineable
)
}
ast
::
ExprVstore
(
sub
,
ast
::
ExprVstoreSlice
)
=>
{
ast
::
ExprVstore
(
sub
,
store
@
ast
::
ExprVstoreSlice
)
|
ast
::
ExprVstore
(
sub
,
store
@
ast
::
ExprVstoreMutSlice
)
=>
{
match
sub
.node
{
ast
::
ExprLit
(
ref
lit
)
=>
{
match
lit
.node
{
...
...
@@ -590,7 +592,8 @@ fn const_expr_unadjusted(cx: @CrateContext, e: &ast::Expr,
llvm
::
LLVMAddGlobal
(
cx
.llmod
,
llty
.to_ref
(),
name
)
});
llvm
::
LLVMSetInitializer
(
gv
,
cv
);
llvm
::
LLVMSetGlobalConstant
(
gv
,
True
);
llvm
::
LLVMSetGlobalConstant
(
gv
,
if
store
==
ast
::
ExprVstoreMutSlice
{
False
}
else
{
True
});
SetLinkage
(
gv
,
PrivateLinkage
);
let
p
=
const_ptrcast
(
cx
,
gv
,
llunitty
);
(
C_struct
([
p
,
C_uint
(
cx
,
es
.len
())],
false
),
false
)
...
...
src/test/compile-fail/issue-11411.rs
0 → 100644
浏览文件 @
8b8d41d2
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
static
TEST
:
&
'static
mut
[
int
]
=
&
mut
[];
//~ ERROR mutable slice is not allowed
fn
main
()
{
}
src/test/run-pass/issue-11411.rs
0 → 100644
浏览文件 @
8b8d41d2
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
static
mut
TEST
:
&
'static
mut
[
int
]
=
&
mut
[
1
];
pub
fn
main
()
{
unsafe
{
TEST
[
0
]
+=
1
;
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录