Skip to content

Commit 60e9507

Browse files
committed
Integrate new arm patch and fix an LLVM bug
Thanks @luqama!
1 parent bb93930 commit 60e9507

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/librustc/lib/llvm.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ pub enum Attribute {
8989
// Not added to LLVM yet, so may need to stay updated if LLVM changes.
9090
// FIXME(#8199): if this changes, be sure to change the relevant constant
9191
// down below
92-
FixedStackSegment = 1 << 41,
92+
// FixedStackSegment = 1 << 41,
9393
}
9494

9595
// enum for the LLVM IntPredicate type
@@ -2124,10 +2124,12 @@ pub fn SetFunctionAttribute(Fn: ValueRef, attr: Attribute) {
21242124
// Furthermore, if we use a match of any sort then an LLVM
21252125
// assertion is generated!
21262126
pub fn SetFixedStackSegmentAttribute(Fn: ValueRef) {
2127+
unsafe {
21272128
let attr = 1u64 << 41;
21282129
let lower = attr & 0xffffffff;
21292130
let upper = (attr >> 32) & 0xffffffff;
21302131
llvm::LLVMAddFunctionAttr(Fn, lower as c_uint, upper as c_uint);
2132+
}
21312133
}
21322134
/* Memory-managed object interface to type handles. */
21332135

src/llvm

Submodule llvm updated from e3abef3 to f67442e

0 commit comments

Comments
 (0)