Fix the main->next merge conflicts

This cleans up all of the merge conflicts from main into next after the
rebranch merge.
This commit is contained in:
Evan Wilde
2021-10-15 15:57:55 -07:00
parent 0b62e9e512
commit a5f11c4851
346 changed files with 7911 additions and 3862 deletions

View File

@@ -10,6 +10,9 @@
// REQUIRES: executable_test
// Freestanding doesn't support environment variables, and this test depends on SWIFT_DETERMINISTIC_HASHING=1
// UNSUPPORTED: freestanding
// This check verifies that the hash seed is randomly generated on every
// execution of a Swift program unless the SWIFT_DETERMINISTIC_HASHING
// environment variable is set.