File tree Expand file tree Collapse file tree 2 files changed +2
-7
lines changed
branches/try2/src/librustc/middle/trans Expand file tree Collapse file tree 2 files changed +2
-7
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: a2bbcb594fff51ecad2f9077467a29a6b2713319
8
+ refs/heads/try2: f8b4e821ea856d84f1521ea82148bd108c8faba2
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -20,7 +20,6 @@ use middle::trans::cleanup;
20
20
use middle:: trans:: common:: * ;
21
21
use middle:: trans:: debuginfo;
22
22
use middle:: trans:: expr;
23
- use middle:: trans:: type_of;
24
23
use middle:: ty;
25
24
use util:: ppaux:: Repr ;
26
25
@@ -343,14 +342,10 @@ pub fn trans_ret<'a>(bcx: &'a Block<'a>,
343
342
344
343
fn str_slice_arg < ' a > ( bcx : & ' a Block < ' a > , s : InternedString ) -> ValueRef {
345
344
let ccx = bcx. ccx ( ) ;
346
- let t = ty:: mk_str_slice ( bcx. tcx ( ) , ty:: ReStatic , ast:: MutImmutable ) ;
347
345
let s = C_str_slice ( ccx, s) ;
348
346
let slot = alloca ( bcx, val_ty ( s) , "__temp" ) ;
349
347
Store ( bcx, s, slot) ;
350
-
351
- // The type of C_str_slice is { i8*, i64 }, but the type of the &str is
352
- // %str_slice, so we do a bitcast here to the right type.
353
- BitCast ( bcx, slot, type_of:: type_of ( ccx, t) . ptr_to ( ) )
348
+ slot
354
349
}
355
350
356
351
pub fn trans_fail < ' a > (
You can’t perform that action at this time.
0 commit comments