diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-18 22:43:19 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2014-03-18 22:43:19 +0000 |
| commit | 997ff02c7beac845d1f7210f6ee6e89a6092c768 (patch) | |
| tree | d73ad30be04a6eeed3a2dc4ed643ce2b936bc183 /clang | |
| parent | cb1c81afa0f319de56afddd1b13f6b1ce3cdec1a (diff) | |
| download | bcm5719-llvm-997ff02c7beac845d1f7210f6ee6e89a6092c768.tar.gz bcm5719-llvm-997ff02c7beac845d1f7210f6ee6e89a6092c768.zip | |
Fix a typo in r204164 that made *all* keywords available in OpenCL mode.
llvm-svn: 204196
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Parser/opencl-keywords.cl | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index 0993b2335e4..3b8aeec5b87 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -130,7 +130,7 @@ static void AddKeyword(StringRef Keyword, else if (LangOpts.MicrosoftExt && (Flags & KEYMS)) AddResult = 1; else if (LangOpts.Borland && (Flags & KEYBORLAND)) AddResult = 1; else if (LangOpts.Bool && (Flags & BOOLSUPPORT)) AddResult = 2; - else if (LangOpts.Half && (Flags && HALFSUPPORT)) AddResult = 2; + else if (LangOpts.Half && (Flags & HALFSUPPORT)) AddResult = 2; else if (LangOpts.WChar && (Flags & WCHARSUPPORT)) AddResult = 2; else if (LangOpts.AltiVec && (Flags & KEYALTIVEC)) AddResult = 2; else if (LangOpts.OpenCL && (Flags & KEYOPENCL)) AddResult = 2; diff --git a/clang/test/Parser/opencl-keywords.cl b/clang/test/Parser/opencl-keywords.cl new file mode 100644 index 00000000000..5bc70549373 --- /dev/null +++ b/clang/test/Parser/opencl-keywords.cl @@ -0,0 +1,8 @@ +// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only +// expected-no-diagnostics + +void f(half *h) { + bool b; + int wchar_t; + int constexpr; +} |
