Skip to content

Commit f21e51c

Browse files
committed
---
yaml --- r: 12031 b: refs/heads/master c: 75ee463 h: refs/heads/master i: 12029: ebb3102 12027: d623e4d 12023: 0054be7 12015: 0a7711e 11999: bc673ef 11967: aec07de 11903: a7c1af8 11775: e39bdc9 v: v3
1 parent 206dbb7 commit f21e51c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 5835a4cc8ed075f048c089350002f515383b7df4
2+
refs/heads/master: 75ee4633ebff7ce6f1669fc81a1c75dcd24b2c15
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustc/middle/trans/base.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,8 @@ fn declare_tydesc(ccx: @crate_ctxt, t: ty::t) -> @tydesc_info {
402402
llsize = llsize_of(ccx, llty);
403403
llalign = llalign_of(ccx, llty);
404404
let name;
405-
if false /*ccx.sess.opts.debuginfo*/ { //XXX this triggers duplicate LLVM symbols
405+
//XXX this triggers duplicate LLVM symbols
406+
if false /*ccx.sess.opts.debuginfo*/ {
406407
name = mangle_internal_name_by_type_only(ccx, t, "tydesc");
407408
} else { name = mangle_internal_name_by_seq(ccx, "tydesc"); }
408409
note_unique_llvm_symbol(ccx, name);
@@ -427,7 +428,8 @@ fn declare_generic_glue(ccx: @crate_ctxt, t: ty::t, llfnty: TypeRef,
427428
name: str) -> ValueRef {
428429
let name = name;
429430
let fn_nm;
430-
if false /*ccx.sess.opts.debuginfo*/ { //XXX this triggers duplicate LLVM symbols
431+
//XXX this triggers duplicate LLVM symbols
432+
if false /*ccx.sess.opts.debuginfo*/ {
431433
fn_nm = mangle_internal_name_by_type_only(ccx, t, "glue_" + name);
432434
} else {
433435
fn_nm = mangle_internal_name_by_seq(ccx, "glue_" + name);

0 commit comments

Comments
 (0)