commit 997ff02c7beac845d1f7210f6ee6e89a6092c768
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Mar 18 22:43:19 2014 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Mar 18 22:43:19 2014 +0000
tree d73ad30be04a6eeed3a2dc4ed643ce2b936bc183
parent cb1c81afa0f319de56afddd1b13f6b1ce3cdec1a

Fix a typo in r204164 that made *all* keywords available in OpenCL mode.

llvm-svn: 204196

clang/lib/Basic/IdentifierTable.cpp

diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 0993b23..3b8aeec 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -130,7 +130,7 @@
   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;