---

yaml
---
r: 31175
b: refs/heads/dist-snap
c: ee73b78
h: refs/heads/master
i:
  31173: 01a4b14
  31171: 2639462
  31167: 7c57e4b
v: v3

Author: catamorphism

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 28c1f21433a927bf9e3b399ec293cd7f7b688af6
+refs/heads/dist-snap: ee73b78e04860f0e4312e462c80ab8a6d37cd759
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/rustc/back/link.rs

@@ -1,4 +1,4 @@
-import libc::{c_int, c_uint, c_char};
+import libc::{c_int, c_uint};
 import driver::session;
 import session::session;
 import lib::llvm::llvm;
@@ -32,21 +32,6 @@ fn llvm_err(sess: session, msg: str) -> ! unsafe {
     } else { sess.fatal(msg + ": " + str::unsafe::from_c_str(cstr)); }
 }
 
-fn WriteOutputFile(sess:session,
-        PM: lib::llvm::PassManagerRef, M: ModuleRef,
-        Triple: *c_char,
-        // FIXME: When #2334 is fixed, change
-        // c_uint to FileType
-        Output: *c_char, FileType: c_uint,
-        OptLevel: c_int,
-        EnableSegmentedStacks: bool) {
-    let result = llvm::LLVMRustWriteOutputFile(
-            PM, M, Triple, Output, FileType, OptLevel, EnableSegmentedStacks);
-    if (!result) {
-        llvm_err(sess, "Could not write output");
-    }
-}
-
 mod write {
     fn is_object_or_assembly_or_exe(ot: output_type) -> bool {
         if ot == output_type_assembly || ot == output_type_object ||
@@ -175,8 +160,7 @@ mod write {
                         sess.targ_cfg.target_strs.target_triple,
                         |buf_t| {
                             str::as_c_str(output, |buf_o| {
-                                WriteOutputFile(
-                                    sess,
+                                llvm::LLVMRustWriteOutputFile(
                                     pm.llpm,
                                     llmod,
                                     buf_t,
@@ -197,8 +181,7 @@ mod write {
                         sess.targ_cfg.target_strs.target_triple,
                         |buf_t| {
                             str::as_c_str(output, |buf_o| {
-                                WriteOutputFile(
-                                    sess,
+                                llvm::LLVMRustWriteOutputFile(
                                     pm.llpm,
                                     llmod,
                                     buf_t,
@@ -217,8 +200,7 @@ mod write {
                     sess.targ_cfg.target_strs.target_triple,
                     |buf_t| {
                         str::as_c_str(output, |buf_o| {
-                            WriteOutputFile(
-                                sess,
+                            llvm::LLVMRustWriteOutputFile(
                                 pm.llpm,
                                 llmod,
                                 buf_t,

branches/dist-snap/src/rustc/lib/llvm.rs

@@ -941,7 +941,7 @@ extern mod llvm {
                                // c_uint to FileType
                                Output: *c_char, FileType: c_uint,
                                OptLevel: c_int,
-                               EnableSegmentedStacks: bool) -> bool;
+                               EnableSegmentedStacks: bool);
 
     /** Returns a string describing the last error caused by an LLVMRust*
         call. */

branches/dist-snap/src/rustllvm/RustWrapper.cpp

@@ -75,7 +75,7 @@ extern "C" bool LLVMLinkModules(LLVMModuleRef Dest, LLVMModuleRef Src) {
   return true;
 }
 
-extern "C" bool
+extern "C" void
 LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
                         LLVMModuleRef M,
                         const char *triple,
@@ -107,18 +107,13 @@ LLVMRustWriteOutputFile(LLVMPassManagerRef PMR,
   std::string ErrorInfo;
   raw_fd_ostream OS(path, ErrorInfo,
                     raw_fd_ostream::F_Binary);
-  if (ErrorInfo != "") {
-    LLVMRustError = ErrorInfo.c_str();
-    return false;
-  }
   formatted_raw_ostream FOS(OS);
 
   bool foo = Target->addPassesToEmitFile(*PM, FOS, FileType, NoVerify);
   assert(!foo);
   (void)foo;
   PM->run(*unwrap(M));
   delete Target;
-  return true;
 }
 
 extern "C" LLVMModuleRef LLVMRustParseAssemblyFile(const char *Filename) {

branches/dist-snap/src/test/run-pass/issue-2288.rs

@@ -0,0 +1,20 @@
+iface clam<A: copy> {
+  fn chowder(y: A);
+}
+class foo<A: copy> : clam<A> {
+  let x: A;
+  new(b: A) { self.x = b; }
+  fn chowder(y: A) {
+  }
+}
+
+fn f<A: copy>(x: clam<A>, a: A) {
+  x.chowder(a);
+}
+
+fn main() {
+
+  let c = foo(42);
+  let d: clam<int> = c as clam::<int>;
+  f(d, c.x);
+}

branches/dist-snap/src/test/run-pass/pipe-select.rs

@@ -1,4 +1,4 @@
-// xfail
+// xfail-test
 // xfail-pretty
 // xfail-win32