diff options
| author | bors <bors@rust-lang.org> | 2017-06-14 08:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-14 08:46:14 +0000 |
| commit | dfa7e21e4ee555d04c0fb86069f5acffee3550ad (patch) | |
| tree | 8e29f75d4d8a37b5205a1ae76c9f0a4588ddec43 /src/libsyntax | |
| parent | e40ef964fe491b19c22dfb8dd36d1eab14223c36 (diff) | |
| parent | 5c084fd8edd986d8a4bd9ff37b303f8777623a56 (diff) | |
| download | rust-dfa7e21e4ee555d04c0fb86069f5acffee3550ad.tar.gz rust-dfa7e21e4ee555d04c0fb86069f5acffee3550ad.zip | |
Auto merge of #42433 - marco-c:profiling, r=alexcrichton
Build instruction profiler runtime as part of compiler-rt r? @alexcrichton This is #38608 with some fixes. Still missing: - [x] testing with profiler enabled on some builders (on which ones? Should I add the option to some of the already existing configurations, or create a new configuration?); - [x] enabling distribution (on which builders?); - [x] documentation.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index b2f52d11db2..7ab0529f518 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -325,6 +325,10 @@ declare_features! ( // rustc internal (active, sanitizer_runtime, "1.17.0", None), + // Used to identify crates that contain the profiler runtime + // rustc internal + (active, profiler_runtime, "1.18.0", None), + // `extern "x86-interrupt" fn()` (active, abi_x86_interrupt, "1.17.0", Some(40180)), @@ -691,6 +695,13 @@ pub const BUILTIN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeG identify crates that contain the runtime of a \ sanitizer and will never be stable", cfg_fn!(sanitizer_runtime))), + ("profiler_runtime", Whitelisted, Gated(Stability::Unstable, + "profiler_runtime", + "the `#[profiler_runtime]` attribute is used to \ + identify the `profiler_builtins` crate which \ + contains the profiler runtime and will never be \ + stable", + cfg_fn!(profiler_runtime))), ("allow_internal_unstable", Normal, Gated(Stability::Unstable, "allow_internal_unstable", |