Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rebase rust llvm patches on top of llvm HEAD #3628

Closed
wants to merge 5 commits into from
Closed

rebase rust llvm patches on top of llvm HEAD #3628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bc5270
rebase rust llvm patches onto llvm HEAD
erickt Sep 28, 2012
64fb345
rustc: uniquely mangle expr_fn names
erickt Sep 29, 2012
e6cd7ac
rustc: llvm grew some new enum variants
erickt Sep 29, 2012
421453c
Add bbrittain's llvm python fixes
brson Sep 29, 2012
4c753a9
Another llvm update, this time updating compiler-rt
erickt Sep 30, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/llvm
Open in desktop
Submodule llvm updated 1405 files
28 changes: 15 additions & 13 deletions src/rustc/lib/llvm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ enum Linkage {
AvailableExternallyLinkage = 1,
LinkOnceAnyLinkage = 2,
LinkOnceODRLinkage = 3,
WeakAnyLinkage = 4,
WeakODRLinkage = 5,
AppendingLinkage = 6,
InternalLinkage = 7,
PrivateLinkage = 8,
DLLImportLinkage = 9,
DLLExportLinkage = 10,
ExternalWeakLinkage = 11,
GhostLinkage = 12,
CommonLinkage = 13,
LinkerPrivateLinkage = 14,
LinkerPrivateWeakLinkage = 15,
LinkerPrivateWeakDefAutoLinkage = 16,
LinkOnceODRAutoHideLinkage = 4,
WeakAnyLinkage = 5,
WeakODRLinkage = 6,
AppendingLinkage = 7,
InternalLinkage = 8,
PrivateLinkage = 9,
DLLImportLinkage = 10,
DLLExportLinkage = 11,
ExternalWeakLinkage = 12,
GhostLinkage = 13,
CommonLinkage = 14,
LinkerPrivateLinkage = 15,
LinkerPrivateWeakLinkage = 16,
}

enum Attribute {
Expand Down Expand Up @@ -91,6 +91,7 @@ enum IntPredicate {

// enum for the LLVM RealPredicate type
enum RealPredicate {
RealPredicateFalse = 0,
RealOEQ = 1,
RealOGT = 2,
RealOGE = 3,
Expand All @@ -105,6 +106,7 @@ enum RealPredicate {
RealULT = 12,
RealULE = 13,
RealUNE = 14,
RealPredicateTrue = 15,
}

// enum for the LLVM TypeKind type - must stay in sync with the def of
Expand Down
2 changes: 1 addition & 1 deletion src/rustc/middle/trans/closure.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ fn trans_expr_fn(bcx: block,
let llfnty = type_of_fn_from_ty(ccx, fty);
let sub_path = vec::append_one(bcx.fcx.path,
path_name(special_idents::anon));
let s = mangle_internal_name_by_path(ccx, sub_path);
let s = mangle_internal_name_by_path_and_seq(ccx, sub_path, ~"expr_fn");
let llfn = decl_internal_cdecl_fn(ccx.llmod, s, llfnty);

let trans_closure_env = fn@(ck: ty::closure_kind) -> Result {
Expand Down