diff options
| author | bors <bors@rust-lang.org> | 2017-01-17 10:10:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-17 10:10:32 +0000 |
| commit | 0825c96b14f0b5eb59da1c36f70fe410c7c6fce7 (patch) | |
| tree | 5e67f01dc514027fcb417f6af3fc496521505e9c | |
| parent | 7dfcac55bbaf83a247f133286006c5efa9df784a (diff) | |
| parent | 5add9b93d4c5365dd7e372741613864e2c549ae8 (diff) | |
| download | rust-0825c96b14f0b5eb59da1c36f70fe410c7c6fce7.tar.gz rust-0825c96b14f0b5eb59da1c36f70fe410c7c6fce7.zip | |
Auto merge of #39095 - nagisa:fix-ub-in-testhelp, r=alexcrichton
Fix UB in test helpers Macro expansion producing defined has undefined behavior in C/C++.
| -rw-r--r-- | src/rt/rust_test_helpers.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/rt/rust_test_helpers.c b/src/rt/rust_test_helpers.c index f2d9119a7d1..5900b21b612 100644 --- a/src/rt/rust_test_helpers.c +++ b/src/rt/rust_test_helpers.c @@ -269,10 +269,7 @@ LARGE_INTEGER increment_all_parts(LARGE_INTEGER li) { return li; } -#define DO_INT128_TEST !(defined(WIN32) || defined(_WIN32) || defined(__WIN32)) && \ - defined(__amd64__) - -#if DO_INT128_TEST +#if !(defined(WIN32) || defined(_WIN32) || defined(__WIN32)) && defined(__amd64__) unsigned __int128 identity(unsigned __int128 a) { return a; |