Skip to content

Commit 613b075

Browse files
committed
---
yaml --- r: 49141 b: refs/heads/snap-stage3 c: f7a2371 h: refs/heads/master i: 49139: 321c7f1 v: v3
1 parent e439819 commit 613b075

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 3bbcac322669cff3abde5be937cc4ec3860f3985
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: d98a195ffc6f68cf071826917e50eb4ad80b270b
4+
refs/heads/snap-stage3: f7a2371c176663d59062ec5158f39faecba45768
55
refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/trans/consts.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
use core::prelude::*;
1212

1313
use back::abi;
14-
use lib::llvm::{llvm, ValueRef, TypeRef, Bool, True, False};
14+
use lib::llvm::{llvm, SetLinkage, InternalLinkage, PrivateLinkage,
15+
ValueRef, TypeRef, Bool, True, False};
1516
use metadata::csearch;
1617
use middle::const_eval;
1718
use middle::trans::adt;
@@ -104,6 +105,7 @@ fn const_addr_of(cx: @CrateContext, cv: ValueRef) -> ValueRef {
104105
};
105106
llvm::LLVMSetInitializer(gv, cv);
106107
llvm::LLVMSetGlobalConstant(gv, True);
108+
SetLinkage(gv, PrivateLinkage);
107109
gv
108110
}
109111
}
@@ -483,6 +485,7 @@ fn const_expr_unadjusted(cx: @CrateContext, e: @ast::expr) -> ValueRef {
483485
};
484486
llvm::LLVMSetInitializer(gv, cv);
485487
llvm::LLVMSetGlobalConstant(gv, True);
488+
SetLinkage(gv, PrivateLinkage);
486489
let p = const_ptrcast(cx, gv, llunitty);
487490
C_struct(~[p, sz])
488491
}

0 commit comments

Comments
 (0)