Skip to content

Commit a54e15c

Browse files
committed
---
yaml --- r: 82612 b: refs/heads/auto c: eac429c h: refs/heads/master v: v3
1 parent b2a8392 commit a54e15c

File tree

10 files changed

+190
-71
lines changed

10 files changed

+190
-71
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: e76bfae7eb4405091625b973f1fbe1e8859afb15
16+
refs/heads/auto: eac429cc9e1e57ea9c91406dc149e7b1c79d86a0
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/AUTHORS.txt

Lines changed: 67 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
Initial author, project lead, target of blame:
2-
3-
Graydon Hoare <[email protected]>
4-
5-
Other authors:
6-
7-
1+
Aaron Laursen <[email protected]>
2+
Aaron Todd <[email protected]>
83
Adam Bozanich <[email protected]>
4+
Adrien Tétar <[email protected]>
95
Aleksander Balicki <[email protected]>
106
Alex Crichton <[email protected]>
117
Alex Rønne Petersen <[email protected]>
128
Alexander Stavonin <[email protected]>
139
Alexei Sholik <[email protected]>
10+
Aljaž "g5pw" Srebrnič <[email protected]>
11+
Anders Kaseorg <[email protected]>
1412
Andreas Gal <[email protected]>
13+
Andreas Martens <[email protected]>
1514
Andrew Dunham <[email protected]>
1615
Andrew Paseltiner <[email protected]>
1716
Anthony Juckel <[email protected]>
1817
Arkaitz Jimenez <[email protected]>
1918
Armin Ronacher <[email protected]>
2019
Ashok Gautham <[email protected]>
20+
Austin King <[email protected]>
2121
Austin Seipp <[email protected]>
2222
Aydin Kim <[email protected]>
2323
@@ -33,7 +33,12 @@ Bilal Husain <[email protected]>
3333
Bill Fallon <[email protected]>
3434
Bill Myers <[email protected]>
3535
Bill Wendling <[email protected]>
36+
Birunthan Mohanathas <[email protected]>
3637
Björn Steinbrink <[email protected]>
38+
blake2-ppc <[email protected]>
39+
Bouke van der Bijl <[email protected]>
40+
Brandon Sanderson <[email protected]>
41+
Brendan Cully <[email protected]>
3742
Brendan Eich <[email protected]>
3843
Brendan Zabarauskas <[email protected]>
3944
Brett Cannon <[email protected]>
@@ -42,7 +47,9 @@ Brian J. Burg <[email protected]>
4247
Brian Leibig <[email protected]>
4348
Bryan Dunsmore <[email protected]>
4449
Caitlin Potter <[email protected]>
50+
4551
Chris Double <[email protected]>
52+
Chris Morgan <[email protected]>
4653
Chris Peterson <[email protected]>
4754
Chris Pressey <[email protected]>
4855
Cody Schroeder <[email protected]>
@@ -52,39 +59,58 @@ Damien Grassart <[email protected]>
5259
Damien Schoof <[email protected]>
5360
Daniel Brooks <[email protected]>
5461
Daniel Farina <[email protected]>
62+
Dan Connolly <[email protected]>
5563
5664
Daniel Luz <[email protected]>
5765
Daniel Micay <[email protected]>
5866
Daniel Patterson <[email protected]>
5967
Daniel Ralston <[email protected]>
68+
Daniel Rosenwasser <[email protected]>
6069
Daniel Ursache Dogariu <[email protected]>
70+
6171
Dave Herman <[email protected]>
72+
David Creswick <[email protected]>
6273
David Forsythe <[email protected]>
74+
David Halperin <[email protected]>
6375
David Klein <[email protected]>
76+
David Manescu <[email protected]>
6477
David Rajchenbach-Teller <[email protected]>
6578
Diggory Hardy <[email protected]>
6679
Dimitri Krassovski <[email protected]>
80+
Dmitry Ermolov <[email protected]>
81+
Do Nhat Minh <[email protected]>
6782
Donovan Preston <[email protected]>
6883
Drew Willcoxon <[email protected]>
6984
Elliott Slaughter <[email protected]>
7085
Elly Fong-Jones <[email protected]>
7186
Eric Holk <[email protected]>
7287
Eric Holmes <[email protected]>
88+
Eric Martin <[email protected]>
89+
Eric Reed <[email protected]>
7390
Erick Tryzelaar <[email protected]>
7491
Erik Rose <[email protected]>
92+
Etienne Millon <[email protected]>
7593
Evan McClanahan <[email protected]>
7694
Fedor Indutny <[email protected]>
7795
Felix S. Klock II <[email protected]>
96+
Flaper Fesp <[email protected]>
97+
Flavio Percoco <[email protected]>
98+
Florian Hahn <[email protected]>
99+
Florian Zeitz <[email protected]>
78100
Francisco Souza <[email protected]>
79101
Franklin Chen <[email protected]>
80102
Gábor Horváth <[email protected]>
81103
82104
Gareth Daniel Smith <[email protected]>
105+
Gary Linscott <[email protected]>
106+
Georges Dubus <[email protected]>
83107
84108
Glenn Willen <[email protected]>
85109
Gonçalo Cabrita <[email protected]>
86110
Graham Fawcett <[email protected]>
87111
Grahame Bowland <[email protected]>
112+
Graydon Hoare <[email protected]>
113+
88114
Haitao Li <[email protected]>
89115
90116
Herman J. Radtke III <[email protected]>
@@ -96,9 +122,11 @@ Ivano Coppola <[email protected]>
96122
Jack Moffitt <[email protected]>
97123
Jacob Harris Cryer Kragh <[email protected]>
98124
Jacob Parker <[email protected]>
125+
99126
Jakub Wieczorek <[email protected]>
100127
James Miller <[email protected]>
101128
James Tranovich <[email protected]>
129+
Jan Kobler <[email protected]>
102130
Jason Orendorff <[email protected]>
103131
Jed Davis <[email protected]>
104132
Jeff Balogh <[email protected]>
@@ -113,35 +141,48 @@ Jesse Ruderman <[email protected]>
113141
Jihyun Yu <[email protected]>
114142
Jim Blandy <[email protected]>
115143
144+
Jimmy Zelinskie <[email protected]>
116145
J. J. Weber <[email protected]>
146+
117147
Joe Pletcher <[email protected]>
148+
John Barker <[email protected]>
118149
John Clements <[email protected]>
119150
Jon Morton <[email protected]>
120151
Jonathan Sternberg <[email protected]>
152+
Jordi Boggiano <[email protected]>
121153
Josh Matthews <[email protected]>
122154
Joshua Clark <[email protected]>
123155
Joshua Wise <[email protected]>
124156
Junyoung Cho <[email protected]>
125157
Jyun-Yan You <[email protected]>
126158
Kang Seonghoon <[email protected]>
159+
Keegan McAllister <[email protected]>
127160
Kelly Wilson <[email protected]>
128161
Kevin Atkinson <[email protected]>
129162
Kevin Ballard <[email protected]>
130163
Kevin Cantu <[email protected]>
164+
Kevin Mehall <[email protected]>
165+
Kevin Murphy <[email protected]>
131166
167+
korenchkin <[email protected]>
132168
Kyeongwoon Lee <[email protected]>
169+
Lars Bergstrom <[email protected]>
133170
Laurent Bonnans <[email protected]>
134171
Lawrence Velázquez <[email protected]>
135172
Leah Hanson <[email protected]>
136173
Lennart Kudling <[email protected]>
137174
Lindsey Kuper <[email protected]>
138175
Luca Bruno <[email protected]>
176+
Luis de Bethencourt <[email protected]>
139177
Luqman Aden <[email protected]>
140178
Magnus Auvinen <[email protected]>
141179
Mahmut Bulut <[email protected]>
180+
maikklein <[email protected]>
181+
Makoto Nakashima <[email protected]>
142182
Margaret Meyerhofer <[email protected]>
143183
Marijn Haverbeke <[email protected]>
144184
Mark Lacey <[email protected]>
185+
Mark Sinclair <[email protected]>
145186
Mark Vian <[email protected]>
146187
Marti Raudsepp <[email protected]>
147188
Martin DeMello <[email protected]>
@@ -151,18 +192,27 @@ Matthew McPherrin <[email protected]>
151192
Matthew O'Connor <[email protected]>
152193
Matthijs Hofstra <[email protected]>
153194
Max Penet <[email protected]>
195+
Maxim Kolganov <[email protected]>
196+
Micah Chalmer <[email protected]>
154197
Michael Arntzenius <[email protected]>
155198
Michael Bebenita <[email protected]>
156199
Michael Neumann <[email protected]>
157200
Michael Sullivan <[email protected]>
201+
Michael Woerister <michaelwoerister@gmail>
202+
Mihnea Dobrescu-Balaur <[email protected]>
158203
Mikko Perttunen <[email protected]>
204+
Mukilan Thiagarajan <[email protected]>
159205
Nick Desaulniers <[email protected]>
160206
Niko Matsakis <[email protected]>
207+
208+
Ogino Masanori <[email protected]>
161209
Olivier Saut <[email protected]>
162210
Or Brostovski <[email protected]>
163211
Orphée Lafond-Lummis <[email protected]>
212+
Palmer Cox <[email protected]>
164213
Patrick Walton <[email protected]>
165214
Patrik Kårlin <[email protected]>
215+
Paul Collins <[email protected]>
166216
Paul Stansifer <[email protected]>
167217
Paul Woolcock <[email protected]>
168218
Pavel Panchekha <[email protected]>
@@ -177,25 +227,32 @@ Reuben Morais <[email protected]>
177227
Rick Waldron <[email protected]>
178228
Rob Arnold <[email protected]>
179229
Rob Hoelz <[email protected]>
230+
Robert Knight <[email protected]>
231+
Robert Millar <[email protected]>
180232
Roland Tanglao <[email protected]>
181233
Ron Dahlgren <[email protected]>
182234
Roy Frostig <[email protected]>
183235
Ryan Scheel <[email protected]>
184236
Samuel Chase <[email protected]>
185237
Sander Mathijs van Veen <[email protected]>
186238
Sangeun Kim <[email protected]>
239+
Sankha Narayan Guria <[email protected]>
187240
Saurabh Anand <[email protected]>
241+
Scott Lawrence <[email protected]>
188242
Sean Moon <[email protected]>
189243
Sean Stangl <[email protected]>
190244
Sebastian N. Fernandez <[email protected]>
245+
Sébastien Crozet <[email protected]>
191246
Seth Pink <[email protected]>
192247
Seo Sanghyeon <[email protected]>
193248
194249
SiegeLord <[email protected]>
195250
Simon Barber-Dueck <[email protected]>
196251
Simon Sapin <[email protected]>
252+
sp3d <sp3d@github>
197253
startling <[email protected]>
198254
Stefan Plantikow <[email protected]>
255+
Stepan Koltsov <[email protected]>
199256
Steve Klabnik <[email protected]>
200257
Steven De Coeyer <[email protected]>
201258
Steven Fackler <[email protected]>
@@ -205,6 +262,7 @@ Ted Horst <[email protected]>
205262
Thad Guidry <[email protected]>
206263
Thomas Daede <[email protected]>
207264
Tim Chevalier <[email protected]>
265+
Tim Kuehn <[email protected]>
208266
Tim Taubert <[email protected]>
209267
210268
Tommy M. McGuire <[email protected]>
@@ -213,6 +271,7 @@ Tony Young <[email protected]>
213271
214272
Tycho Sci <[email protected]>
215273
Tyler Bindon <[email protected]>
274+
U-NOV2010\eugals
216275
Uwe Dauernheim <[email protected]>
217276
Vadim Chugunov <[email protected]>
218277
Viktor Dahl <[email protected]>
@@ -225,4 +284,5 @@ Young-il Choi <[email protected]>
225284
Youngmin Yoo <[email protected]>
226285
Youngsoo Son <[email protected]>
227286
Zack Corr <[email protected]>
287+
Zack Slayton <[email protected]>
228288

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

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,12 +220,6 @@ pub fn decl_rust_fn(ccx: &mut CrateContext, inputs: &[ty::t], output: ty::t,
220220
let llfn = decl_cdecl_fn(ccx.llmod, name, llfty);
221221

222222
match ty::get(output).sty {
223-
// functions returning bottom may unwind, but can never return normally
224-
ty::ty_bot => {
225-
unsafe {
226-
llvm::LLVMAddFunctionAttr(llfn, lib::llvm::NoReturnAttribute as c_uint)
227-
}
228-
}
229223
// `~` pointer return values never alias because ownership is transferred
230224
ty::ty_uniq(*) |
231225
ty::ty_evec(_, ty::vstore_uniq) => {
@@ -2956,7 +2950,7 @@ pub fn decl_crate_map(sess: session::Session, mapmeta: LinkMeta,
29562950
};
29572951
let sym_name = ~"_rust_crate_map_" + mapname;
29582952
let arrtype = Type::array(&int_type, n_subcrates as u64);
2959-
let maptype = Type::struct_([Type::i32(), Type::i8p(), int_type, arrtype], false);
2953+
let maptype = Type::struct_([Type::i32(), int_type, arrtype], false);
29602954
let map = do sym_name.with_c_str |buf| {
29612955
unsafe {
29622956
llvm::LLVMAddGlobal(llmod, maptype.to_ref(), buf)
@@ -2997,8 +2991,6 @@ pub fn fill_crate_map(ccx: @mut CrateContext, map: ValueRef) {
29972991
let mod_map = create_module_map(ccx);
29982992
llvm::LLVMSetInitializer(map, C_struct(
29992993
[C_i32(1),
3000-
// FIXME #8431 This used to be the annihilate function, now it's nothing
3001-
C_null(Type::i8p()),
30022994
p2i(ccx, mod_map),
30032995
C_array(ccx.int_type, subcrates)]));
30042996
}

branches/auto/src/librustc/util/common.rs

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -61,52 +61,54 @@ pub fn field_exprs(fields: ~[ast::Field]) -> ~[@ast::Expr] {
6161
}
6262

6363
struct LoopQueryVisitor<'self> {
64-
p: &'self fn(&ast::Expr_) -> bool
64+
p: &'self fn(&ast::Expr_) -> bool,
65+
flag: bool,
6566
}
6667

67-
impl<'self> Visitor<@mut bool> for LoopQueryVisitor<'self> {
68-
fn visit_expr(&mut self, e: @ast::Expr, flag: @mut bool) {
69-
*flag |= (self.p)(&e.node);
68+
impl<'self> Visitor<()> for LoopQueryVisitor<'self> {
69+
fn visit_expr(&mut self, e: @ast::Expr, _: ()) {
70+
self.flag |= (self.p)(&e.node);
7071
match e.node {
7172
// Skip inner loops, since a break in the inner loop isn't a
7273
// break inside the outer loop
7374
ast::ExprLoop(*) | ast::ExprWhile(*) => {}
74-
_ => visit::walk_expr(self, e, flag)
75+
_ => visit::walk_expr(self, e, ())
7576
}
7677
}
7778
}
7879

7980
// Takes a predicate p, returns true iff p is true for any subexpressions
8081
// of b -- skipping any inner loops (loop, while, loop_body)
8182
pub fn loop_query(b: &ast::Block, p: &fn(&ast::Expr_) -> bool) -> bool {
82-
let rs = @mut false;
8383
let mut v = LoopQueryVisitor {
8484
p: p,
85+
flag: false,
8586
};
86-
visit::walk_block(&mut v, b, rs);
87-
return *rs;
87+
visit::walk_block(&mut v, b, ());
88+
return v.flag;
8889
}
8990

9091
struct BlockQueryVisitor<'self> {
91-
p: &'self fn(@ast::Expr) -> bool
92+
p: &'self fn(@ast::Expr) -> bool,
93+
flag: bool,
9294
}
9395

94-
impl<'self> Visitor<@mut bool> for BlockQueryVisitor<'self> {
95-
fn visit_expr(&mut self, e: @ast::Expr, flag: @mut bool) {
96-
*flag |= (self.p)(e);
97-
visit::walk_expr(self, e, flag)
96+
impl<'self> Visitor<()> for BlockQueryVisitor<'self> {
97+
fn visit_expr(&mut self, e: @ast::Expr, _:()) {
98+
self.flag |= (self.p)(e);
99+
visit::walk_expr(self, e, ())
98100
}
99101
}
100102

101103
// Takes a predicate p, returns true iff p is true for any subexpressions
102104
// of b -- skipping any inner loops (loop, while, loop_body)
103105
pub fn block_query(b: &ast::Block, p: &fn(@ast::Expr) -> bool) -> bool {
104-
let rs = @mut false;
105106
let mut v = BlockQueryVisitor {
106107
p: p,
108+
flag: false,
107109
};
108-
visit::walk_block(&mut v, b, rs);
109-
return *rs;
110+
visit::walk_block(&mut v, b, ());
111+
return v.flag;
110112
}
111113

112114
pub fn local_rhs_span(l: @ast::Local, def: Span) -> Span {

0 commit comments

Comments
 (0)