Skip to content

Commit 70aed2c

Browse files
committed
---
yaml --- r: 15663 b: refs/heads/try c: 1c46ee3 h: refs/heads/master i: 15661: a823300 15659: 18c779b 15655: 24b3a6c 15647: c681d57 v: v3
1 parent d2fea94 commit 70aed2c

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 43751e45d90ed3a2f5a9d0208d50125d88af6dfc
5+
refs/heads/try: 1c46ee34beb7149b8a8b167340acf9fb7a12cd2e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/trans/shape.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,12 @@ fn llalign_of_pref(cx: @crate_ctxt, t: TypeRef) -> uint {
637637
ret llvm::LLVMPreferredAlignmentOfType(cx.td.lltd, t) as uint;
638638
}
639639

640+
// Returns the minimum alignment of a type required by the plattform.
641+
// This is the alignment that will be used for struct fields.
642+
fn llalign_of_min(cx: @crate_ctxt, t: TypeRef) -> uint {
643+
ret llvm::LLVMABIAlignmentOfType(cx.td.lltd, t) as uint;
644+
}
645+
640646
fn llsize_of(cx: @crate_ctxt, t: TypeRef) -> ValueRef {
641647
ret llvm::LLVMConstIntCast(lib::llvm::llvm::LLVMSizeOf(t), cx.int_type,
642648
False);

0 commit comments

Comments
 (0)