Skip to content

Commit 8bf1bb7

Browse files
committed
---
yaml --- r: 138222 b: refs/heads/auto c: 7899248 h: refs/heads/master v: v3
1 parent a2359e3 commit 8bf1bb7

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 6f9b3b574bde97ee60d84428d24d4f6e2859c709
16+
refs/heads/auto: 78992485047f7600a0d34c5f573b30be262b2e4b
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc/middle/trans/base.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2468,24 +2468,6 @@ pub fn get_fn_llvm_attributes(ccx: &CrateContext, fn_ty: ty::t)
24682468
.arg(idx, llvm::DereferenceableAttribute(llsz));
24692469
}
24702470

2471-
// The visit glue deals only with opaque pointers so we don't
2472-
// actually know the concrete type of Self thus we don't know how
2473-
// many bytes to mark as dereferenceable so instead we just mark
2474-
// it as nonnull which still holds true
2475-
ty::ty_rptr(b, ty::mt { ty: it, mutbl }) if match ty::get(it).sty {
2476-
ty::ty_param(_) => true, _ => false
2477-
} && mutbl == ast::MutMutable => {
2478-
attrs.arg(idx, llvm::NoAliasAttribute)
2479-
.arg(idx, llvm::NonNullAttribute);
2480-
2481-
match b {
2482-
ReLateBound(_, BrAnon(_)) => {
2483-
attrs.arg(idx, llvm::NoCaptureAttribute);
2484-
}
2485-
_ => {}
2486-
}
2487-
}
2488-
24892471
// `&mut` pointer parameters never alias other parameters, or mutable global data
24902472
//
24912473
// `&T` where `T` contains no `UnsafeCell<U>` is immutable, and can be marked as both

0 commit comments

Comments
 (0)