Index: include/lldb/lldb-enumerations.h
===================================================================
--- include/lldb/lldb-enumerations.h
+++ include/lldb/lldb-enumerations.h
@@ -463,6 +463,7 @@
   // be used as indexes into array g_languages.
   eLanguageTypeMipsAssembler = 0x0024,   ///< Mips_Assembler.
   eLanguageTypeExtRenderScript = 0x0025, ///< RenderScript.
+  eLanguageTypeKotlin = 0x0026,          ///< Kotlin.
   eNumLanguageTypes
 };
 
Index: source/Symbol/ClangASTContext.cpp
===================================================================
--- source/Symbol/ClangASTContext.cpp
+++ source/Symbol/ClangASTContext.cpp
@@ -121,6 +121,8 @@
          // Use Clang for Rust until there is a proper language plugin for it
          language == eLanguageTypeRust ||
          language == eLanguageTypeExtRenderScript ||
+          // Use Clang for Kotlin until there is a proper language plugin for it
+         language == eLanguageTypeKotlin ||
          // Use Clang for D until there is a proper language plugin for it
          language == eLanguageTypeD;
 }
Index: source/Target/Language.cpp
===================================================================
--- source/Target/Language.cpp
+++ source/Target/Language.cpp
@@ -200,6 +200,7 @@
     // Vendor Extensions
     {"mipsassem", eLanguageTypeMipsAssembler},
     {"renderscript", eLanguageTypeExtRenderScript},
+    {"kotlin", eLanguageTypeKotlin},
     // Now synonyms, in arbitrary order
     {"objc", eLanguageTypeObjC},
     {"objc++", eLanguageTypeObjC_plus_plus},