Skip to content

Commit a008fc8

Browse files
brsonbrson
committed
Fix rebase fallout. Sorry.
1 parent 3096d9b commit a008fc8

File tree

5 files changed

+29
-76
lines changed

5 files changed

+29
-76
lines changed

‎src/librustc/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ pub mod back {
6666
pub mod lto;
6767

6868
}
69-
>>>>>>> Extract librustc_back from librustc
7069

7170
pub mod middle {
7271
pub mod def;

‎src/librustc/middle/trans/intrinsic.rs

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -426,13 +426,13 @@ pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
426426
assert!(split.len() >= 2, "Atomic intrinsic not correct format");
427427

428428
let order = if split.len() == 2 {
429-
lib::llvm::SequentiallyConsistent
429+
llvm::SequentiallyConsistent
430430
} else {
431431
match *split.get(2) {
432-
"relaxed" => lib::llvm::Monotonic,
433-
"acq" => lib::llvm::Acquire,
434-
"rel" => lib::llvm::Release,
435-
"acqrel" => lib::llvm::AcquireRelease,
432+
"relaxed" => llvm::Monotonic,
433+
"acq" => llvm::Acquire,
434+
"rel" => llvm::Release,
435+
"acqrel" => llvm::AcquireRelease,
436436
_ => ccx.sess().fatal("unknown ordering in atomic intrinsic")
437437
}
438438
};
@@ -443,23 +443,23 @@ pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
443443
// of this, I assume that it's good enough for us to use for
444444
// now.
445445
let strongest_failure_ordering = match order {
446-
lib::llvm::NotAtomic | lib::llvm::Unordered =>
446+
llvm::NotAtomic | llvm::Unordered =>
447447
ccx.sess().fatal("cmpxchg must be atomic"),
448448

449-
lib::llvm::Monotonic | lib::llvm::Release =>
450-
lib::llvm::Monotonic,
449+
llvm::Monotonic | llvm::Release =>
450+
llvm::Monotonic,
451451

452-
lib::llvm::Acquire | lib::llvm::AcquireRelease =>
453-
lib::llvm::Acquire,
452+
llvm::Acquire | llvm::AcquireRelease =>
453+
llvm::Acquire,
454454

455-
lib::llvm::SequentiallyConsistent =>
456-
lib::llvm::SequentiallyConsistent
455+
llvm::SequentiallyConsistent =>
456+
llvm::SequentiallyConsistent
457457
};
458458

459459
let res = AtomicCmpXchg(bcx, *llargs.get(0), *llargs.get(1),
460460
*llargs.get(2), order,
461461
strongest_failure_ordering);
462-
if unsafe { lib::llvm::llvm::LLVMVersionMinor() >= 5 } {
462+
if unsafe { llvm::LLVMVersionMinor() >= 5 } {
463463
ExtractValue(bcx, res, 0)
464464
} else {
465465
res
@@ -482,17 +482,17 @@ pub fn trans_intrinsic_call<'a>(mut bcx: &'a Block<'a>, node: ast::NodeId,
482482
// These are all AtomicRMW ops
483483
op => {
484484
let atom_op = match op {
485-
"xchg" => lib::llvm::Xchg,
486-
"xadd" => lib::llvm::Add,
487-
"xsub" => lib::llvm::Sub,
488-
"and" => lib::llvm::And,
489-
"nand" => lib::llvm::Nand,
490-
"or" => lib::llvm::Or,
491-
"xor" => lib::llvm::Xor,
492-
"max" => lib::llvm::Max,
493-
"min" => lib::llvm::Min,
494-
"umax" => lib::llvm::UMax,
495-
"umin" => lib::llvm::UMin,
485+
"xchg" => llvm::Xchg,
486+
"xadd" => llvm::Add,
487+
"xsub" => llvm::Sub,
488+
"and" => llvm::And,
489+
"nand" => llvm::Nand,
490+
"or" => llvm::Or,
491+
"xor" => llvm::Xor,
492+
"max" => llvm::Max,
493+
"min" => llvm::Min,
494+
"umax" => llvm::UMax,
495+
"umin" => llvm::UMin,
496496
_ => ccx.sess().fatal("unknown atomic operation")
497497
};
498498

‎src/librustc/middle/trans/type_.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,7 @@ impl Type {
308308
}
309309
}
310310

311+
311312
/* Memory-managed object interface to type handles. */
312313

313314
pub struct TypeNames {
@@ -330,7 +331,7 @@ impl TypeNames {
330331
self.named_types.borrow().find_equiv(&s).map(|x| Type::from_ref(*x))
331332
}
332333

333-
pub fn type_to_str(&self, ty: Type) -> String {
334+
pub fn type_to_string(&self, ty: Type) -> String {
334335
unsafe {
335336
let s = llvm::LLVMTypeToString(ty.to_ref());
336337
let ret = from_c_str(s);
@@ -340,11 +341,11 @@ impl TypeNames {
340341
}
341342

342343
pub fn types_to_str(&self, tys: &[Type]) -> String {
343-
let strs: Vec<String> = tys.iter().map(|t| self.type_to_str(*t)).collect();
344+
let strs: Vec<String> = tys.iter().map(|t| self.type_to_string(*t)).collect();
344345
format!("[{}]", strs.connect(","))
345346
}
346347

347-
pub fn val_to_str(&self, val: ValueRef) -> String {
348+
pub fn val_to_string(&self, val: ValueRef) -> String {
348349
unsafe {
349350
let s = llvm::LLVMValueToString(val);
350351
let ret = from_c_str(s);
@@ -353,4 +354,3 @@ impl TypeNames {
353354
}
354355
}
355356
}
356-

‎src/librustc_back/rpath.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ mod test {
230230
used_crates: Vec::new(),
231231
out_filename: Path::new("bin/rustc"),
232232
get_install_prefix_lib_path: || fail!(),
233-
realpath: |p| p.clone()
233+
realpath: |p| Ok(p.clone())
234234
};
235235
let res = get_rpath_relative_to_output(config, &Path::new("lib/libstd.so"));
236236
assert_eq!(res.as_slice(), "@loader_path/../lib");

‎src/librustc_llvm/lib.rs

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1869,52 +1869,6 @@ pub fn SetFunctionAttribute(fn_: ValueRef, attr: Attribute) {
18691869
}
18701870
}
18711871

1872-
/* Memory-managed object interface to type handles. */
1873-
1874-
pub struct TypeNames {
1875-
named_types: RefCell<HashMap<String, TypeRef>>,
1876-
}
1877-
1878-
impl TypeNames {
1879-
pub fn new() -> TypeNames {
1880-
TypeNames {
1881-
named_types: RefCell::new(HashMap::new())
1882-
}
1883-
}
1884-
1885-
pub fn associate_type(&self, s: &str, t: &Type) {
1886-
assert!(self.named_types.borrow_mut().insert(s.to_string(),
1887-
t.to_ref()));
1888-
}
1889-
1890-
pub fn find_type(&self, s: &str) -> Option<Type> {
1891-
self.named_types.borrow().find_equiv(&s).map(|x| Type::from_ref(*x))
1892-
}
1893-
1894-
pub fn type_to_string(&self, ty: Type) -> String {
1895-
unsafe {
1896-
let s = llvm::LLVMTypeToString(ty.to_ref());
1897-
let ret = from_c_str(s);
1898-
free(s as *mut c_void);
1899-
ret.to_string()
1900-
}
1901-
}
1902-
1903-
pub fn types_to_str(&self, tys: &[Type]) -> String {
1904-
let strs: Vec<String> = tys.iter().map(|t| self.type_to_string(*t)).collect();
1905-
format!("[{}]", strs.connect(","))
1906-
}
1907-
1908-
pub fn val_to_string(&self, val: ValueRef) -> String {
1909-
unsafe {
1910-
let s = llvm::LLVMValueToString(val);
1911-
let ret = from_c_str(s);
1912-
free(s as *mut c_void);
1913-
ret.to_string()
1914-
}
1915-
}
1916-
}
1917-
19181872
/* Memory-managed interface to target data. */
19191873

19201874
pub struct TargetData {

0 commit comments

Comments
 (0)