This is an archive of the discontinued LLVM Phabricator instance.

Differential D58640

[OpenMP 5.0] Fix argument dependent lookup of user-defined mapper
Needs ReviewPublic

Authored by lildmh on Feb 25 2019, 11:28 AM.

Details

Reviewers
ABataev
Meinersbur
Summary

This patch passes the correct ADL parameter when creating the mapper lookup expressions.

Diff Detail

Event Timeline

lildmh created this revision.Feb 25 2019, 11:28 AM
Herald added subscribers: jdoerfert, guansong. · View Herald TranscriptFeb 25 2019, 11:28 AM
ABataev added a comment.Feb 25 2019, 11:30 AM

A test is required

Revision Contents

PathSize
lib/
Sema/
2 lines

Diff 188228

lib/Sema/SemaOpenMP.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 13,052 Lines • ▼ Show 20 Lines if (SemaRef.CurContext->isDependentContext() || Type->isDependentType() ||
for (const UnresolvedSet<8> &Set : Lookups) { for (const UnresolvedSet<8> &Set : Lookups) {
if (Set.empty()) if (Set.empty())
continue; continue;
URS.append(Set.begin(), Set.end()); URS.append(Set.begin(), Set.end());
} }
return UnresolvedLookupExpr::Create( return UnresolvedLookupExpr::Create(
SemaRef.Context, /*NamingClass=*/nullptr, SemaRef.Context, /*NamingClass=*/nullptr,
MapperIdScopeSpec.getWithLocInContext(SemaRef.Context), MapperId, MapperIdScopeSpec.getWithLocInContext(SemaRef.Context), MapperId,
/*ADL=*/false, /*Overloaded=*/true, URS.begin(), URS.end()); /*ADL=*/true, /*Overloaded=*/true, URS.begin(), URS.end());
} }
// [OpenMP 5.0], 2.19.7.3 declare mapper Directive, Restrictions // [OpenMP 5.0], 2.19.7.3 declare mapper Directive, Restrictions
// The type must be of struct, union or class type in C and C++ // The type must be of struct, union or class type in C and C++
if (!Type->isStructureOrClassType() && !Type->isUnionType()) if (!Type->isStructureOrClassType() && !Type->isUnionType())
return ExprEmpty(); return ExprEmpty();
SourceLocation Loc = MapperId.getLoc(); SourceLocation Loc = MapperId.getLoc();
// Perform argument dependent lookup. // Perform argument dependent lookup.
if (SemaRef.getLangOpts().CPlusPlus && !MapperIdScopeSpec.isSet()) if (SemaRef.getLangOpts().CPlusPlus && !MapperIdScopeSpec.isSet())
▲ Show 20 Lines • Show All 1,292 Lines • Show Last 20 Lines