Skip to content

Commit 82580a4

Browse files
committed
---
yaml --- r: 154855 b: refs/heads/try2 c: e29aa14 h: refs/heads/master i: 154853: 9c8f1f3 154851: fe62efd 154847: 5276966 v: v3
1 parent 1df076e commit 82580a4

File tree

8 files changed

+512
-507
lines changed

8 files changed

+512
-507
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: 0ab27b1d5b68d3bc3c727895e5219ce254c685ad
8+
refs/heads/try2: e29aa1430bb45d18a5d3fcc5f3b7d20e99a57758
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/back/link.rs

Lines changed: 2 additions & 476 deletions
Large diffs are not rendered by default.

branches/try2/src/librustc/back/lto.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
use super::link;
12+
use super::write;
1213
use driver::session;
1314
use driver::config;
1415
use llvm;
@@ -119,9 +120,9 @@ pub fn run(sess: &session::Session, llmod: ModuleRef,
119120
if !llvm::LLVMRustLinkInExternalBitcode(llmod,
120121
ptr as *const libc::c_char,
121122
bc_decoded.len() as libc::size_t) {
122-
link::llvm_err(sess,
123-
format!("failed to load bc of `{}`",
124-
name.as_slice()));
123+
write::llvm_err(sess,
124+
format!("failed to load bc of `{}`",
125+
name.as_slice()));
125126
}
126127
});
127128
}

0 commit comments

Comments
 (0)