From 195d2d727e374b95815cab7109f2a7a89e1fcded Mon Sep 17 00:00:00 2001 From: CLIF Team Date: Thu, 18 Jan 2024 18:08:11 -0800 Subject: [PATCH] Integrate from upstream at revision llvmorg-18-init-17629-g05e85e4fc5ac. If this change breaks you, please see go/llvm-bad-integrate. http://llvm-compilers/?start=05e85e4fc5ac67612245efe56c3423cc9b47bc6d 153 revisions integrated Upstream committed 2024-01-18 15:38:35 UTC Integration branch: [llvm_integration_branch/599503093.2](https://source.corp.google.com/piper///depot/branches/llvm_integration_branch/599503093.2) List of changes: cl/599633393: Update usage to match LLVM@e90e43fb9cd1d305f7196cd526aa503374e0f616 cl/599630409: Apply patches to [llvm_integration_branch/599503093.2](https://source.corp.google.com/piper///depot/branches/llvm_integration_branch/599503093.2) cl/599620502: Update usage to match https://github.com/llvm/llvm-project/commit/e90e43fb9cd1d305f7196cd526aa503374e0f616 cl/599607788: Rebuild crosstool cl/599596631: Update usage to match LLVM@e90e43fb9cd1d305f7196cd526aa503374e0f616 cl/599595304: Update usage to match LLVM@e90e43fb9cd1d305f7196cd526aa503374e0f616 cl/599586466: Include __assertion_handler in filegroup cl/599564615: Generate staging/include/__assertion_handler cl/599544740: Apply patches to [llvm_integration_branch/599503093.2](https://source.corp.google.com/piper///depot/branches/llvm_integration_branch/599503093.2) cl/599543975: Integrate from llvm-project_import_branch@599503093 cl/599538961: Update LLVM METADATA BEGIN_PUBLIC Integrate LLVM at llvm/llvm-project@05e85e4fc5ac Updates LLVM usage to match [05e85e4fc5ac](https://github.com/llvm/llvm-project/commit/05e85e4fc5ac) END_PUBLIC Tested: https://sponge2.corp.google.com/label:guitar%20label:overview%20cl:599608501 https://test.corp.google.com/599608501 See also: go/llvm-sla PiperOrigin-RevId: 599679763 --- clif/backend/matcher.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clif/backend/matcher.cc b/clif/backend/matcher.cc index 6c734bdf..31c5fc5b 100644 --- a/clif/backend/matcher.cc +++ b/clif/backend/matcher.cc @@ -2737,7 +2737,7 @@ const FunctionDecl* ClifMatcher::MatchAndSetFuncFromCandidates( if (auto method_decl = llvm::dyn_cast(clang_decl)) { func_decl->set_cpp_const_method(method_decl->isConst()); - func_decl->set_is_pure_virtual(method_decl->isPure()); + func_decl->set_is_pure_virtual(method_decl->isPureVirtual()); } if (auto named_decl = llvm::dyn_cast(clang_decl)) {