diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 40e58d156270a..80e769a06e50d 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -101,7 +101,7 @@ namespace {
     KEYOPENCLCXX  = 0x400000,
     KEYMSCOMPAT   = 0x800000,
     KEYSYCL       = 0x1000000,
-    KEYALLCXX = KEYSYCL | KEYCXX | KEYCXX11 | KEYCXX2A,
+    KEYALLCXX = KEYCXX | KEYCXX11 | KEYCXX2A,
     KEYALL = (0x1ffffff & ~KEYNOMS18 &
               ~KEYNOOPENCL) // KEYNOMS18 and KEYNOOPENCL are used to exclude.
   };
diff --git a/clang/test/SemaSYCL/keyword.cpp b/clang/test/SemaSYCL/keyword.cpp
new file mode 100644
index 0000000000000..a5d9ba1b6ded8
--- /dev/null
+++ b/clang/test/SemaSYCL/keyword.cpp
@@ -0,0 +1,6 @@
+// RUN: %clang_cc1 -verify -fsyntax-only -std=c++11 %s
+//
+// expected-no-diagnostics 
+int foo(bool __pipe);
+int foo(bool __read_only);
+int foo(bool __write_only);