diff options
| author | bors <bors@rust-lang.org> | 2015-09-13 00:01:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-09-13 00:01:28 +0000 |
| commit | fd230ff12481ebeba720fb1ac1f610d93bb74920 (patch) | |
| tree | 8b06a122842f00a7fb0b95f3479b2695cda2f2b5 | |
| parent | f710aae2eff6a738caa5991e62267c3a5f70b1c9 (diff) | |
| parent | 9aa1289a67b6682568b94c6de74d411cdf87d9ee (diff) | |
| download | rust-fd230ff12481ebeba720fb1ac1f610d93bb74920.tar.gz rust-fd230ff12481ebeba720fb1ac1f610d93bb74920.zip | |
Auto merge of #28370 - ranma42:slow_pat_gen, r=alexcrichton
Commit 9104a902c052c1ad7fd5c1245cb1e03f88aa2f70 fixed the generated files, but that change would be lost (or require additional manual intervention) if they are re-generated of if new architectures are added. cc #28273
| -rw-r--r-- | src/etc/platform-intrinsics/generator.py | 3 | ||||
| -rw-r--r-- | src/librustc_platform_intrinsics/aarch64.rs | 2 | ||||
| -rw-r--r-- | src/librustc_platform_intrinsics/arm.rs | 4 | ||||
| -rw-r--r-- | src/librustc_platform_intrinsics/x86.rs | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/src/etc/platform-intrinsics/generator.py b/src/etc/platform-intrinsics/generator.py index d1217c1fb2b..e3aa4e688d3 100644 --- a/src/etc/platform-intrinsics/generator.py +++ b/src/etc/platform-intrinsics/generator.py @@ -737,6 +737,9 @@ use {{Intrinsic, i, i_, u, u_, f, v, v_, agg, p, void}}; use IntrinsicDef::Named; use rustc::middle::ty; +// The default inlining settings trigger a pathological behaviour in +// LLVM, which causes makes compilation very slow. See #28273. +#[inline(never)] pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> {{ if !name.starts_with("{0}") {{ return None }} Some(match &name["{0}".len()..] {{'''.format(platform.intrinsic_prefix()) diff --git a/src/librustc_platform_intrinsics/aarch64.rs b/src/librustc_platform_intrinsics/aarch64.rs index 1db5b3cb9ea..fda65554cd2 100644 --- a/src/librustc_platform_intrinsics/aarch64.rs +++ b/src/librustc_platform_intrinsics/aarch64.rs @@ -17,6 +17,8 @@ use {Intrinsic, i, i_, u, u_, f, v, v_, agg, p, void}; use IntrinsicDef::Named; use rustc::middle::ty; +// The default inlining settings trigger a pathological behaviour in +// LLVM, which causes makes compilation very slow. See #28273. #[inline(never)] pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> { if !name.starts_with("aarch64_v") { return None } diff --git a/src/librustc_platform_intrinsics/arm.rs b/src/librustc_platform_intrinsics/arm.rs index eae5c520883..166bf66d819 100644 --- a/src/librustc_platform_intrinsics/arm.rs +++ b/src/librustc_platform_intrinsics/arm.rs @@ -13,10 +13,12 @@ #![allow(unused_imports)] -use {Intrinsic, i, i_, u, u_, f, v, agg, p}; +use {Intrinsic, i, i_, u, u_, f, v, v_, agg, p, void}; use IntrinsicDef::Named; use rustc::middle::ty; +// The default inlining settings trigger a pathological behaviour in +// LLVM, which causes makes compilation very slow. See #28273. #[inline(never)] pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> { if !name.starts_with("arm_v") { return None } diff --git a/src/librustc_platform_intrinsics/x86.rs b/src/librustc_platform_intrinsics/x86.rs index 19aeb589e70..144fd5f4e76 100644 --- a/src/librustc_platform_intrinsics/x86.rs +++ b/src/librustc_platform_intrinsics/x86.rs @@ -17,6 +17,8 @@ use {Intrinsic, i, i_, u, u_, f, v, v_, agg, p, void}; use IntrinsicDef::Named; use rustc::middle::ty; +// The default inlining settings trigger a pathological behaviour in +// LLVM, which causes makes compilation very slow. See #28273. #[inline(never)] pub fn find<'tcx>(_tcx: &ty::ctxt<'tcx>, name: &str) -> Option<Intrinsic> { if !name.starts_with("x86_mm") { return None } |