---

yaml
---
r: 152431
b: refs/heads/try2
c: f8b4e82
h: refs/heads/master
i:
  152429: bb0f303
  152427: 67caa72
  152423: 742571c
  152415: bd54db6
v: v3

Author: Jakub Wieczorek

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a2bbcb594fff51ecad2f9077467a29a6b2713319
+refs/heads/try2: f8b4e821ea856d84f1521ea82148bd108c8faba2
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -20,7 +20,6 @@ use middle::trans::cleanup;
 use middle::trans::common::*;
 use middle::trans::debuginfo;
 use middle::trans::expr;
-use middle::trans::type_of;
 use middle::ty;
 use util::ppaux::Repr;
 
@@ -343,14 +342,10 @@ pub fn trans_ret<'a>(bcx: &'a Block<'a>,
 
 fn str_slice_arg<'a>(bcx: &'a Block<'a>, s: InternedString) -> ValueRef {
     let ccx = bcx.ccx();
-    let t = ty::mk_str_slice(bcx.tcx(), ty::ReStatic, ast::MutImmutable);
     let s = C_str_slice(ccx, s);
     let slot = alloca(bcx, val_ty(s), "__temp");
     Store(bcx, s, slot);
-
-    // The type of C_str_slice is { i8*, i64 }, but the type of the &str is
-    // %str_slice, so we do a bitcast here to the right type.
-    BitCast(bcx, slot, type_of::type_of(ccx, t).ptr_to())
+    slot
 }
 
 pub fn trans_fail<'a>(