r281430 - Follow-up to r281367: Compare uuids case-insensitively.
Nico Weber via cfe-commits
cfe-commits at lists.llvm.org
Tue Sep 13 18:16:54 PDT 2016
Author: nico
Date: Tue Sep 13 20:16:54 2016
New Revision: 281430
URL: http://llvm.org/viewvc/llvm-project?rev=281430&view=rev
Log:
Follow-up to r281367: Compare uuids case-insensitively.
Modified:
cfe/trunk/lib/Sema/SemaDeclAttr.cpp
cfe/trunk/test/SemaCXX/ms-uuid.cpp
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=281430&r1=281429&r2=281430&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Tue Sep 13 20:16:54 2016
@@ -4607,7 +4607,7 @@ static void handleObjCPreciseLifetimeAtt
UuidAttr *Sema::mergeUuidAttr(Decl *D, SourceRange Range,
unsigned AttrSpellingListIndex, StringRef Uuid) {
if (const auto *UA = D->getAttr<UuidAttr>()) {
- 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);
Modified: cfe/trunk/test/SemaCXX/ms-uuid.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/ms-uuid.cpp?rev=281430&r1=281429&r2=281430&view=diff
==============================================================================
--- cfe/trunk/test/SemaCXX/ms-uuid.cpp (original)
+++ cfe/trunk/test/SemaCXX/ms-uuid.cpp Tue Sep 13 20:16:54 2016
@@ -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:
More information about the cfe-commits
mailing list