Skip to content

Commit 83cff4e

Browse files
committed
Merge pull request swiftlang#819 from ezephir/basic-sil-linux
Always print UUIDs using uppercase.
2 parents 728ad26 + b013be9 commit 83cff4e

File tree

3 files changed

+1
-5
lines changed

3 files changed

+1
-5
lines changed

lib/Basic/UUID.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Optional<UUID> UUID::fromString(const char *s) {
4141

4242
void UUID::toString(llvm::SmallVectorImpl<char> &out) const {
4343
out.resize(UUID::StringBufferSize);
44-
uuid_unparse(Value, out.data());
44+
uuid_unparse_upper(Value, out.data());
4545
// Pop off the null terminator.
4646
assert(out.back() == '\0' && "did not null-terminate?!");
4747
out.pop_back();

test/SIL/Parser/basic.sil

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
// RUN: %target-swift-frontend %s -emit-silgen | FileCheck %s
22

3-
// XFAIL: linux
4-
53
sil_stage raw // CHECK: sil_stage raw
64

75
import Builtin

test/Serialization/basic_sil.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-module -Xfrontend -disable-diagnostic-passes -force-single-frontend-invocation -Xfrontend -sil-serialize-all -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil
1010
// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil
1111

12-
// XFAIL: linux
13-
1412
// This test currently is written such that no optimizations are assumed.
1513
// REQUIRES: swift_test_mode_optimize_none
1614

0 commit comments

Comments
 (0)