diff options
| author | Sven van Haastregt <sven.vanhaastregt@arm.com> | 2019-05-22 13:12:20 +0000 |
|---|---|---|
| committer | Sven van Haastregt <sven.vanhaastregt@arm.com> | 2019-05-22 13:12:20 +0000 |
| commit | e518bb43119bb194c70f57cb99e2b73933f71d33 (patch) | |
| tree | 9a1aef940abebf3c7e9fb6bf977a74ac25e36699 /clang/lib/Basic/Builtins.cpp | |
| parent | 7c72ca012d563415d7a36737d4c903f7ec988679 (diff) | |
| download | llvm-e518bb43119bb194c70f57cb99e2b73933f71d33.zip llvm-e518bb43119bb194c70f57cb99e2b73933f71d33.tar.gz llvm-e518bb43119bb194c70f57cb99e2b73933f71d33.tar.bz2 | |
[OpenCL] Support pipe keyword in C++ mode
Support the OpenCL C pipe feature in C++ for OpenCL mode, to preserve
backwards compatibility with OpenCL C.
Various changes had to be made in Parse and Sema to enable
pipe-specific diagnostics, so enable a SemaOpenCL test for C++.
Differential Revision: https://reviews.llvm.org/D62181
llvm-svn: 361382
Diffstat (limited to 'clang/lib/Basic/Builtins.cpp')
| -rw-r--r-- | clang/lib/Basic/Builtins.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Basic/Builtins.cpp b/clang/lib/Basic/Builtins.cpp index cfc5927..d23c280 100644 --- a/clang/lib/Basic/Builtins.cpp +++ b/clang/lib/Basic/Builtins.cpp @@ -70,8 +70,9 @@ bool Builtin::Context::builtinIsSupported(const Builtin::Info &BuiltinInfo, bool ObjCUnsupported = !LangOpts.ObjC && BuiltinInfo.Langs == OBJC_LANG; bool OclC1Unsupported = (LangOpts.OpenCLVersion / 100) != 1 && (BuiltinInfo.Langs & ALL_OCLC_LANGUAGES ) == OCLC1X_LANG; - bool OclC2Unsupported = LangOpts.OpenCLVersion != 200 && - (BuiltinInfo.Langs & ALL_OCLC_LANGUAGES) == OCLC20_LANG; + bool OclC2Unsupported = + (LangOpts.OpenCLVersion != 200 && !LangOpts.OpenCLCPlusPlus) && + (BuiltinInfo.Langs & ALL_OCLC_LANGUAGES) == OCLC20_LANG; bool OclCUnsupported = !LangOpts.OpenCL && (BuiltinInfo.Langs & ALL_OCLC_LANGUAGES); bool OpenMPUnsupported = !LangOpts.OpenMP && BuiltinInfo.Langs == OMP_LANG; |