# HG changeset patch
# User Shinji KONO <kono@ie.u-ryukyu.ac.jp>
# Date 1623144027 -32400
# Node ID 286fdf80b38c78cb462495ef69f3247618303d17
# Parent  f6c5cecc8b03171ce1df797bff1eea91773d9ae7
...

diff -r f6c5cecc8b03 -r 286fdf80b38c clang/lib/AST/ExprConstant.cpp
--- a/clang/lib/AST/ExprConstant.cpp	Tue Jun 08 06:40:22 2021 +0900
+++ b/clang/lib/AST/ExprConstant.cpp	Tue Jun 08 18:20:27 2021 +0900
@@ -10959,6 +10959,9 @@
     case BuiltinType::ID: break;
 #include "clang/AST/BuiltinTypes.def"
     case BuiltinType::Void:
+#ifndef noCbC
+    case BuiltinType::__Code:
+#endif
       return GCCTypeClass::Void;
 
     case BuiltinType::Bool:
diff -r f6c5cecc8b03 -r 286fdf80b38c llvm/lib/IR/LLVMContextImpl.cpp
--- a/llvm/lib/IR/LLVMContextImpl.cpp	Tue Jun 08 06:40:22 2021 +0900
+++ b/llvm/lib/IR/LLVMContextImpl.cpp	Tue Jun 08 18:20:27 2021 +0900
@@ -35,6 +35,7 @@
     FP128Ty(C, Type::FP128TyID),
     PPC_FP128Ty(C, Type::PPC_FP128TyID),
     X86_MMXTy(C, Type::X86_MMXTyID),
+    X86_AMXTy(C, Type::X86_AMXTyID),
 #ifndef noCbC
     __CodeTy(C, Type::__CodeTyID),
 #endif