Author: Aaron Ballman Date: 2020-11-16T14:23:04-05:00 New Revision: 1941d9651cc90948fa442584eec09bdb0cf01a33
URL: https://github.com/llvm/llvm-project/commit/1941d9651cc90948fa442584eec09bdb0cf01a33 DIFF: https://github.com/llvm/llvm-project/commit/1941d9651cc90948fa442584eec09bdb0cf01a33.diff LOG: Speculatively fix the lldb build Pick up the changes from 41b65f166b51760f77d0f9e465b3858f46e101f0. Added: Modified: lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp Removed: ################################################################################ diff --git a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp index 6e27386a233c..37ad7ff035c0 100644 --- a/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp +++ b/lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp @@ -2030,8 +2030,9 @@ FunctionDecl *TypeSystemClang::CreateFunctionDeclaration( func_decl->setStorageClass(storage); func_decl->setInlineSpecified(is_inline); func_decl->setHasWrittenPrototype(hasWrittenPrototype); - func_decl->setConstexprKind(isConstexprSpecified ? CSK_constexpr - : CSK_unspecified); + func_decl->setConstexprKind(isConstexprSpecified + ? ConstexprSpecKind::Constexpr + : ConstexprSpecKind::Unspecified); SetOwningModule(func_decl, owning_module); if (func_decl) decl_ctx->addDecl(func_decl); @@ -7425,7 +7426,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType( cxx_dtor_decl->setType(method_qual_type); cxx_dtor_decl->setImplicit(is_artificial); cxx_dtor_decl->setInlineSpecified(is_inline); - cxx_dtor_decl->setConstexprKind(CSK_unspecified); + cxx_dtor_decl->setConstexprKind(ConstexprSpecKind::Unspecified); cxx_method_decl = cxx_dtor_decl; } else if (decl_name == cxx_record_decl->getDeclName()) { cxx_ctor_decl = clang::CXXConstructorDecl::CreateDeserialized( @@ -7437,7 +7438,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType( cxx_ctor_decl->setType(method_qual_type); cxx_ctor_decl->setImplicit(is_artificial); cxx_ctor_decl->setInlineSpecified(is_inline); - cxx_ctor_decl->setConstexprKind(CSK_unspecified); + cxx_ctor_decl->setConstexprKind(ConstexprSpecKind::Unspecified); cxx_ctor_decl->setNumCtorInitializers(0); cxx_ctor_decl->setExplicitSpecifier(explicit_spec); cxx_method_decl = cxx_ctor_decl; @@ -7463,7 +7464,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType( cxx_method_decl->setType(method_qual_type); cxx_method_decl->setStorageClass(SC); cxx_method_decl->setInlineSpecified(is_inline); - cxx_method_decl->setConstexprKind(CSK_unspecified); + cxx_method_decl->setConstexprKind(ConstexprSpecKind::Unspecified); } else if (num_params == 0) { // Conversion operators don't take params... auto *cxx_conversion_decl = @@ -7476,7 +7477,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType( cxx_conversion_decl->setType(method_qual_type); cxx_conversion_decl->setInlineSpecified(is_inline); cxx_conversion_decl->setExplicitSpecifier(explicit_spec); - cxx_conversion_decl->setConstexprKind(CSK_unspecified); + cxx_conversion_decl->setConstexprKind(ConstexprSpecKind::Unspecified); cxx_method_decl = cxx_conversion_decl; } } @@ -7489,7 +7490,7 @@ clang::CXXMethodDecl *TypeSystemClang::AddMethodToCXXRecordType( cxx_method_decl->setType(method_qual_type); cxx_method_decl->setInlineSpecified(is_inline); cxx_method_decl->setStorageClass(SC); - cxx_method_decl->setConstexprKind(CSK_unspecified); + cxx_method_decl->setConstexprKind(ConstexprSpecKind::Unspecified); } } SetMemberOwningModule(cxx_method_decl, cxx_record_decl); _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
