Conditional compilation for sanitizers #66245

tmiasko · 2019-11-09T10:12:07Z

Configure sanitize option when compiling with a sanitizer to make
it possible to execute different code depending on whether given
sanitizer is enabled or not.

rust-highfive · 2019-11-09T10:12:17Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @GuillaumeGomez (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

parched · 2019-11-09T21:15:17Z

Would this work if you have more than one sanitizer enabled? For example, address and leak sanitizer can be used together (although I'm not sure if rustc currently supports that).

tmiasko · 2019-11-09T22:55:51Z

It is possible to configure multiple key-value pairs with the same key, so if
rustc were to support multiple sanitizers at the same time it should be non-issue.

bors · 2019-11-10T19:13:05Z

☔ The latest upstream changes (presumably #66070) made this pull request unmergeable. Please resolve the merge conflicts.

JohnCSimon · 2019-11-16T22:42:29Z

Ping from triage:
@tmiasko Can you please resolve the merge conflicts?
@GuillaumeGomez is this ready for review?

Thank you

tmiasko · 2019-11-17T09:32:48Z

Rebased.

bors · 2019-11-23T04:26:54Z

☔ The latest upstream changes (presumably #66507) made this pull request unmergeable. Please resolve the merge conflicts.

GuillaumeGomez · 2019-11-25T14:49:12Z

r? @oli-obk

oli-obk

The implementation looks fine to me. A tracking issue with some links to related work around sanitizers would be good though

oli-obk · 2019-11-26T09:14:54Z

src/doc/unstable-book/src/language-features/cfg-sanitize.md

+------------------------
+
+The `cfg_sanitize` feature makes it possible to execute different code
+depending on whether a particular is enabled or not.


a particular ... ?

src/librustc/session/config.rs

tmiasko · 2019-11-26T19:35:42Z

I used #39699 as a tracking issue.

oli-obk · 2019-11-27T09:27:17Z

@bors r+

bors · 2019-11-27T09:27:18Z

📌 Commit 41477cef469b97439bbb97dcc36d53aa55f494c9 has been approved by oli-obk

bors · 2019-11-27T11:10:27Z

⌛ Testing commit 41477cef469b97439bbb97dcc36d53aa55f494c9 with merge 40a2ad9697b29102bd4d637a4076fe384982374f...

rust-highfive · 2019-11-27T12:16:40Z

The job x86_64-apple of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2019-11-27T12:15:55.6287750Z failures:
2019-11-27T12:15:55.6287820Z 
2019-11-27T12:15:55.6288540Z ---- [ui] ui/sanitize-cfg.rs#leak stdout ----
2019-11-27T12:15:55.6289010Z 
2019-11-27T12:15:55.6289760Z error in revision `leak`: test compilation failed although it shouldn't!
2019-11-27T12:15:55.6289930Z status: exit code: 1
2019-11-27T12:15:55.6291530Z command: "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.160.1/work/1/s/src/test/ui/sanitize-cfg.rs" "-Zthreads=1" "--target=x86_64-apple-darwin" "--cfg" "leak" "--error-format" "json" "-Zui-testing" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/test/ui/sanitize-cfg.leak" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "-Zsanitizer=leak" "--cfg" "leak" "-L" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/test/ui/sanitize-cfg.leak/auxiliary" "-A" "unused"
2019-11-27T12:15:55.6292630Z ------------------------------------------
2019-11-27T12:15:55.6292730Z 
2019-11-27T12:15:55.6293410Z ------------------------------------------
2019-11-27T12:15:55.6293540Z stderr:
2019-11-27T12:15:55.6293540Z stderr:
2019-11-27T12:15:55.6294220Z ------------------------------------------
2019-11-27T12:15:55.6294960Z error: LeakSanitizer only works with the `x86_64-unknown-linux-gnu` target
2019-11-27T12:15:55.6295140Z error: aborting due to previous error
2019-11-27T12:15:55.6295210Z 
2019-11-27T12:15:55.6295260Z 
2019-11-27T12:15:55.6295930Z ------------------------------------------
2019-11-27T12:15:55.6295930Z ------------------------------------------
2019-11-27T12:15:55.6296010Z 
2019-11-27T12:15:55.6296050Z 
2019-11-27T12:15:55.6296720Z ---- [ui] ui/sanitize-cfg.rs#memory stdout ----
2019-11-27T12:15:55.6296800Z 
2019-11-27T12:15:55.6297500Z error in revision `memory`: test compilation failed although it shouldn't!
2019-11-27T12:15:55.6297630Z status: exit code: 1
2019-11-27T12:15:55.6299230Z command: "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.160.1/work/1/s/src/test/ui/sanitize-cfg.rs" "-Zthreads=1" "--target=x86_64-apple-darwin" "--cfg" "memory" "--error-format" "json" "-Zui-testing" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/test/ui/sanitize-cfg.memory" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "-Zsanitizer=memory" "--cfg" "memory" "-L" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/test/ui/sanitize-cfg.memory/auxiliary" "-A" "unused"
2019-11-27T12:15:55.6300340Z ------------------------------------------
2019-11-27T12:15:55.6300420Z 
2019-11-27T12:15:55.6301070Z ------------------------------------------
2019-11-27T12:15:55.6301200Z stderr:
2019-11-27T12:15:55.6301200Z stderr:
2019-11-27T12:15:55.6301960Z ------------------------------------------
2019-11-27T12:15:55.6302910Z error: MemorySanitizer only works with the `x86_64-unknown-linux-gnu` target
2019-11-27T12:15:55.6303240Z error: aborting due to previous error
2019-11-27T12:15:55.6303600Z 
2019-11-27T12:15:55.6303750Z 
2019-11-27T12:15:55.6304660Z ------------------------------------------
---
2019-11-27T12:15:55.6439510Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-11-27T12:15:55.6439780Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-11-27T12:15:55.6461730Z 
2019-11-27T12:15:55.6461870Z 
2019-11-27T12:15:55.6465740Z command did not execute successfully: "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage2/lib/rustlib/x86_64-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/runner/runners/2.160.1/work/1/s/src/test/ui" "--build-base" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/test/ui" "--stage-id" "stage2-x86_64-apple-darwin" "--mode" "ui" "--target" "x86_64-apple-darwin" "--host" "x86_64-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.160.1/work/1/s/build/x86_64-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-902.0.79.2\n  Swift-4.1\n" "--lldb-python-dir" "/Applications/Xcode_9.3.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "9.0.0-rust-1.41.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-11-27T12:15:55.6467220Z 
2019-11-27T12:15:55.6467270Z 
2019-11-27T12:15:55.6477090Z failed to run: /Users/runner/runners/2.160.1/work/1/s/build/bootstrap/debug/bootstrap test
2019-11-27T12:15:55.6477230Z Build completed unsuccessfully in 1:00:13
2019-11-27T12:15:55.6477230Z Build completed unsuccessfully in 1:00:13
2019-11-27T12:15:55.6548510Z == clock drift check ==
2019-11-27T12:15:55.6609680Z   local time: Wed Nov 27 12:15:55 UTC 2019
2019-11-27T12:15:55.7027030Z   network time: Wed, 27 Nov 2019 12:15:55 GMT
2019-11-27T12:15:55.7029590Z == end clock drift check ==
2019-11-27T12:15:55.7078380Z 
2019-11-27T12:15:55.7215620Z ##[error]Bash exited with code '1'.
2019-11-27T12:15:55.7266540Z ##[section]Starting: Checkout
2019-11-27T12:15:55.7269920Z ==============================================================================
2019-11-27T12:15:55.7270040Z Task         : Get sources
2019-11-27T12:15:55.7270230Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2019-11-27T12:16:47Z

💔 Test failed - checks-azure

bors · 2019-12-01T03:39:49Z

☔ The latest upstream changes (presumably #66908) made this pull request unmergeable. Please resolve the merge conflicts.

Configure sanitize option when compiling with a sanitizer to make it possible to execute different code depending on whether given sanitizer is enabled or not.

tmiasko · 2019-12-01T10:19:17Z

Rebased.

oli-obk · 2019-12-01T12:50:22Z

@bors r+

bors · 2019-12-01T12:50:23Z

📌 Commit c703ff2 has been approved by oli-obk

bors · 2019-12-01T12:50:24Z

🌲 The tree is currently closed for pull requests below priority 1000, this pull request will be tested once the tree is reopened

RalfJung · 2019-12-01T15:09:30Z

It is possible to configure multiple key-value pairs with the same key, so if
rustc were to support multiple sanitizers at the same time it should be non-issue.

Is there precedent for that, i.e., is there any existing cfg flag that uses this? It seems quite counter-intuitive that cfg(sanitizer = "a") and cfg(sanitizer = "b") can both be true. That looks like it implies "a" = "b".

tmiasko · 2019-12-01T15:57:47Z

A few examples: feature = "name" (configured by cargo), target_feature = "name", target_has_atomic = "size".

RalfJung · 2019-12-01T19:37:35Z

Hm, you are right. I guess that ship has sailed. Never mind then!

Conditional compilation for sanitizers Configure sanitize option when compiling with a sanitizer to make it possible to execute different code depending on whether given sanitizer is enabled or not.

bors · 2019-12-02T08:16:44Z

⌛ Testing commit c703ff2 with merge 3713ae778689813f687db44c370edbe028912552...

Conditional compilation for sanitizers Configure sanitize option when compiling with a sanitizer to make it possible to execute different code depending on whether given sanitizer is enabled or not.

RalfJung · 2019-12-02T08:35:18Z

@bors retry
rolled up

@ghost

Rollup of 5 pull requests Successful merges: - #66245 (Conditional compilation for sanitizers) - #66654 (Handle const-checks for `&mut` outside of `HasMutInterior`) - #66822 (libunwind_panic: adjust miri panic hack) - #66827 (handle diverging functions forwarding their return place) - #66834 (rustbuild fixes) Failed merges: r? @ghost

bors · 2019-12-02T11:43:14Z

⌛ Testing commit c703ff2 with merge 4af3ee8...

rust-highfive assigned GuillaumeGomez Nov 9, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 9, 2019

JohnCSimon added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 16, 2019

tmiasko force-pushed the cfg-sanitize branch from 459e604 to ea0c9eb Compare November 17, 2019 09:17

tmiasko force-pushed the cfg-sanitize branch from ea0c9eb to a3a3315 Compare November 24, 2019 20:26

rust-highfive assigned oli-obk and unassigned GuillaumeGomez Nov 25, 2019

oli-obk requested changes Nov 26, 2019

View reviewed changes

tmiasko force-pushed the cfg-sanitize branch 2 times, most recently from d7c840f to dc83d94 Compare November 26, 2019 19:32

tmiasko force-pushed the cfg-sanitize branch from dc83d94 to 41477ce Compare November 26, 2019 20:26

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 27, 2019

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 27, 2019

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 30, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 1, 2019

Conditional compilation for sanitizers

c703ff2

Configure sanitize option when compiling with a sanitizer to make it possible to execute different code depending on whether given sanitizer is enabled or not.

tmiasko force-pushed the cfg-sanitize branch from b4d06ed to c703ff2 Compare December 1, 2019 08:12

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 1, 2019

RalfJung mentioned this pull request Dec 2, 2019

Rollup of 4 pull requests #66948

Closed

RalfJung mentioned this pull request Dec 2, 2019

Rollup of 5 pull requests #66949

Closed

RalfJung mentioned this pull request Dec 2, 2019

Rollup of 5 pull requests #66950

Merged

bors merged commit c703ff2 into rust-lang:master Dec 2, 2019

tmiasko deleted the cfg-sanitize branch March 1, 2020 20:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Conditional compilation for sanitizers #66245

Conditional compilation for sanitizers #66245

tmiasko commented Nov 9, 2019 •

edited

Loading

rust-highfive commented Nov 9, 2019

parched commented Nov 9, 2019

tmiasko commented Nov 9, 2019

bors commented Nov 10, 2019

JohnCSimon commented Nov 16, 2019

tmiasko commented Nov 17, 2019

bors commented Nov 23, 2019

GuillaumeGomez commented Nov 25, 2019

oli-obk left a comment

oli-obk Nov 26, 2019

tmiasko commented Nov 26, 2019

oli-obk commented Nov 27, 2019

bors commented Nov 27, 2019

bors commented Nov 27, 2019

rust-highfive commented Nov 27, 2019

bors commented Nov 27, 2019

bors commented Dec 1, 2019

tmiasko commented Dec 1, 2019

oli-obk commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

tmiasko commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 2, 2019

RalfJung commented Dec 2, 2019

bors commented Dec 2, 2019

Conditional compilation for sanitizers #66245

Conditional compilation for sanitizers #66245

Conversation

tmiasko commented Nov 9, 2019 • edited Loading

rust-highfive commented Nov 9, 2019

parched commented Nov 9, 2019

tmiasko commented Nov 9, 2019

bors commented Nov 10, 2019

JohnCSimon commented Nov 16, 2019

tmiasko commented Nov 17, 2019

bors commented Nov 23, 2019

GuillaumeGomez commented Nov 25, 2019

oli-obk left a comment

Choose a reason for hiding this comment

oli-obk Nov 26, 2019

Choose a reason for hiding this comment

tmiasko commented Nov 26, 2019

oli-obk commented Nov 27, 2019

bors commented Nov 27, 2019

bors commented Nov 27, 2019

rust-highfive commented Nov 27, 2019

bors commented Nov 27, 2019

bors commented Dec 1, 2019

tmiasko commented Dec 1, 2019

oli-obk commented Dec 1, 2019

bors commented Dec 1, 2019

bors commented Dec 1, 2019

RalfJung commented Dec 1, 2019

tmiasko commented Dec 1, 2019

RalfJung commented Dec 1, 2019

bors commented Dec 2, 2019

RalfJung commented Dec 2, 2019

bors commented Dec 2, 2019

tmiasko commented Nov 9, 2019 •

edited

Loading