Anastasia updated this revision to Diff 182084. Anastasia added a comment. - Changed the condition to use all qualifiers except for ObjC ownership ones.
CHANGES SINCE LAST ACTION https://reviews.llvm.org/D56735/new/ https://reviews.llvm.org/D56735 Files: lib/Sema/SemaOverload.cpp test/SemaOpenCLCXX/address_space_overloading.cl Index: test/SemaOpenCLCXX/address_space_overloading.cl =================================================================== --- /dev/null +++ test/SemaOpenCLCXX/address_space_overloading.cl @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++ + +// expected-no-diagnostics +void foo(const __global int *a); +void foo(const __generic int *a); + +void kernel ker() { + __global int *a; + __generic int *c; + __local int *d; + foo(a); + foo(c); + foo(d); +} Index: lib/Sema/SemaOverload.cpp =================================================================== --- lib/Sema/SemaOverload.cpp +++ lib/Sema/SemaOverload.cpp @@ -4019,9 +4019,12 @@ // to unwrap. This essentially mimics what // IsQualificationConversion does, but here we're checking for a // strict subset of qualifiers. - if (T1.getCVRQualifiers() == T2.getCVRQualifiers()) + if (T1.getQualifiers().withoutObjCLifetime() == + T2.getQualifiers().withoutObjCLifetime()) // The qualifiers are the same, so this doesn't tell us anything // about how the sequences rank. + // ObjC ownership quals are omitted above as they interfere with + // the ARC overload rule. ; else if (T2.isMoreQualifiedThan(T1)) { // T1 has fewer qualifiers, so it could be the better sequence.
Index: test/SemaOpenCLCXX/address_space_overloading.cl =================================================================== --- /dev/null +++ test/SemaOpenCLCXX/address_space_overloading.cl @@ -0,0 +1,14 @@ +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=c++ + +// expected-no-diagnostics +void foo(const __global int *a); +void foo(const __generic int *a); + +void kernel ker() { + __global int *a; + __generic int *c; + __local int *d; + foo(a); + foo(c); + foo(d); +} Index: lib/Sema/SemaOverload.cpp =================================================================== --- lib/Sema/SemaOverload.cpp +++ lib/Sema/SemaOverload.cpp @@ -4019,9 +4019,12 @@ // to unwrap. This essentially mimics what // IsQualificationConversion does, but here we're checking for a // strict subset of qualifiers. - if (T1.getCVRQualifiers() == T2.getCVRQualifiers()) + if (T1.getQualifiers().withoutObjCLifetime() == + T2.getQualifiers().withoutObjCLifetime()) // The qualifiers are the same, so this doesn't tell us anything // about how the sequences rank. + // ObjC ownership quals are omitted above as they interfere with + // the ARC overload rule. ; else if (T2.isMoreQualifiedThan(T1)) { // T1 has fewer qualifiers, so it could be the better sequence.
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits