Skip to content

Commit 7ed4ac0

Browse files
author
Jakub Wieczorek
committed
---
yaml --- r: 152431 b: refs/heads/try2 c: f8b4e82 h: refs/heads/master i: 152429: bb0f303 152427: 67caa72 152423: 742571c 152415: bd54db6 v: v3
1 parent b1fdd2e commit 7ed4ac0

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: a2bbcb594fff51ecad2f9077467a29a6b2713319
8+
refs/heads/try2: f8b4e821ea856d84f1521ea82148bd108c8faba2
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/trans/controlflow.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use middle::trans::cleanup;
2020
use middle::trans::common::*;
2121
use middle::trans::debuginfo;
2222
use middle::trans::expr;
23-
use middle::trans::type_of;
2423
use middle::ty;
2524
use util::ppaux::Repr;
2625

@@ -343,14 +342,10 @@ pub fn trans_ret<'a>(bcx: &'a Block<'a>,
343342

344343
fn str_slice_arg<'a>(bcx: &'a Block<'a>, s: InternedString) -> ValueRef {
345344
let ccx = bcx.ccx();
346-
let t = ty::mk_str_slice(bcx.tcx(), ty::ReStatic, ast::MutImmutable);
347345
let s = C_str_slice(ccx, s);
348346
let slot = alloca(bcx, val_ty(s), "__temp");
349347
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
354349
}
355350

356351
pub fn trans_fail<'a>(

0 commit comments

Comments
 (0)