From 1e7f3607923d0a1da989d509dd0685e51152f731 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Wed, 14 Sep 2016 01:16:54 +0000 Subject: [PATCH] Follow-up to r281367: Compare uuids case-insensitively. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@281430 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDeclAttr.cpp | 2 +- test/SemaCXX/ms-uuid.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index c23db57141..a0c0e81d7e 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -4607,7 +4607,7 @@ static void handleObjCPreciseLifetimeAttr(Sema &S, Decl *D, UuidAttr *Sema::mergeUuidAttr(Decl *D, SourceRange Range, unsigned AttrSpellingListIndex, StringRef Uuid) { if (const auto *UA = D->getAttr()) { - if (UA->getGuid() == Uuid) + if (UA->getGuid().equals_lower(Uuid)) return nullptr; Diag(UA->getLocation(), diag::err_mismatched_uuid); Diag(Range.getBegin(), diag::note_previous_uuid); diff --git a/test/SemaCXX/ms-uuid.cpp b/test/SemaCXX/ms-uuid.cpp index 2192f67eab..461e3c12ff 100644 --- a/test/SemaCXX/ms-uuid.cpp +++ b/test/SemaCXX/ms-uuid.cpp @@ -29,7 +29,8 @@ namespace { // Both cl and clang-cl accept this: class __declspec(uuid("000000A0-0000-0000-C000-000000000049")) C1; -class __declspec(uuid("000000A0-0000-0000-C000-000000000049")) C1; +class __declspec(uuid("000000a0-0000-0000-c000-000000000049")) C1; +class __declspec(uuid("{000000a0-0000-0000-C000-000000000049}")) C1; class __declspec(uuid("000000A0-0000-0000-C000-000000000049")) C1 {}; // Both cl and clang-cl error out on this: -- 2.40.0