diff --git a/clang/include/clang/Basic/TokenKinds.def b/clang/include/clang/Basic/TokenKinds.def
index 564d6010181cc..532ef6d79b2d0 100644
--- a/clang/include/clang/Basic/TokenKinds.def
+++ b/clang/include/clang/Basic/TokenKinds.def
@@ -354,7 +354,7 @@ KEYWORD(__ptrauth                   , KEYALL)
 UNARY_EXPR_OR_TYPE_TRAIT(_Countof, CountOf, KEYNOCXX)
 
 // C++ 2.11p1: Keywords.
-KEYWORD(asm                         , KEYCXX|KEYGNU)
+KEYWORD(asm                         , KEYCXX|KEYGNU|KEYOPENCLC|KEYOPENCLCXX)
 KEYWORD(bool                        , BOOLSUPPORT|KEYC23)
 KEYWORD(catch                       , KEYCXX)
 KEYWORD(class                       , KEYCXX)
diff --git a/clang/test/SemaOpenCL/inline-asm.cl b/clang/test/SemaOpenCL/inline-asm.cl
new file mode 100644
index 0000000000000..2c402c66ef1d2
--- /dev/null
+++ b/clang/test/SemaOpenCL/inline-asm.cl
@@ -0,0 +1,11 @@
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=CL1.2
+// RUN: %clang_cc1 %s -verify -pedantic -fsyntax-only -cl-std=clc++
+
+// expected-no-diagnostics
+
+void test(void)
+{
+  asm("");
+loop:
+  asm goto(""::::loop);
+}