3 files changed, 7 insertions, 5 deletions

diff --git a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp
index aea672976017..0d0a357dce68 100644
--- a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp
+++ b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/CodeViewRecordIO.cpp
@@ -7,6 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/DebugInfo/CodeView/CodeViewRecordIO.h"
+#include "llvm/ADT/StringExtras.h"
 #include "llvm/DebugInfo/CodeView/CodeView.h"
 #include "llvm/DebugInfo/CodeView/GUID.h"
 #include "llvm/DebugInfo/CodeView/RecordSerialization.h"
diff --git a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/EnumTables.cpp b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/EnumTables.cpp
index 78a258600696..b2f0099bd01c 100644
--- a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/EnumTables.cpp
+++ b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/EnumTables.cpp
@@ -105,6 +105,7 @@ static const EnumEntry<codeview::SourceLanguage> SourceLanguages[] = {
     CV_ENUM_ENT(SourceLanguage, JScript), CV_ENUM_ENT(SourceLanguage, MSIL),
     CV_ENUM_ENT(SourceLanguage, HLSL),    CV_ENUM_ENT(SourceLanguage, D),
     CV_ENUM_ENT(SourceLanguage, Swift),   CV_ENUM_ENT(SourceLanguage, Rust),
+    CV_ENUM_ENT(SourceLanguage, ObjC),    CV_ENUM_ENT(SourceLanguage, ObjCpp),
 };
 
 static const EnumEntry<uint32_t> CompileSym2FlagNames[] = {
diff --git a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/TypeRecordHelpers.cpp b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/TypeRecordHelpers.cpp
index e44dec6d6396..046b660abfab 100644
--- a/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/TypeRecordHelpers.cpp
+++ b/contrib/llvm-project/llvm/lib/DebugInfo/CodeView/TypeRecordHelpers.cpp
@@ -144,15 +144,15 @@ uint64_t llvm::codeview::getSizeInBytesForTypeIndex(TypeIndex TI) {
 
   // Complex float.
   case SimpleTypeKind::Complex16:
-    return 2;
-  case SimpleTypeKind::Complex32:
     return 4;
-  case SimpleTypeKind::Complex64:
+  case SimpleTypeKind::Complex32:
     return 8;
+  case SimpleTypeKind::Complex64:
+    return 16;
   case SimpleTypeKind::Complex80:
-    return 10;
+    return 20;
   case SimpleTypeKind::Complex128:
-    return 16;
+    return 32;
 
   default:
     return 0;