Skip to content

Commit

Permalink
Integrate from upstream at revision llvmorg-19-init-2100-gbc66e0cf9feb.
Browse files Browse the repository at this point in the history
If this change breaks you, please see go/llvm-bad-integrate.

http://llvm-compilers/?start=bc66e0cf9feb8f3c38fa2e33850b6c6e5477fb21
199 revisions integrated
Upstream committed 2024-02-13 01:00:08 UTC

Integration branch: [llvm_integration_branch/606412338.1](https://source.corp.google.com/piper///depot/branches/llvm_integration_branch/606412338.1)
List of changes:
  cl/606563539: Add an empty BUILD file for the newly-added llvm/test/CodeGen/Xtensa dir.
  cl/606546600: Rebuild crosstool
  cl/606540726: Adapt upstream clang TemplateDeductionResult API change llvmorg-19-init-2051-gdfbe2bca1d8c
  cl/606533442: Automatic BUILD files update from bazel
  cl/606532721: Fixes for 73ce0aed35eaeaf7e2d5c464a68fca7d946834bf
  cl/606532178: Integrate from llvm-project_import_branch@606412338
  cl/606530799: Update LLVM METADATA

BEGIN_PUBLIC
Integrate LLVM at llvm/llvm-project@bc66e0cf9feb

Updates LLVM usage to match
[bc66e0cf9feb](llvm/llvm-project@bc66e0cf9feb)
END_PUBLIC

Tested:
https://sponge2.corp.google.com/label:guitar%20label:overview%20cl:606546873
https://test.corp.google.com/606546873
See also: go/llvm-sla
PiperOrigin-RevId: 606591018
  • Loading branch information
CLIF Team authored and rwgk committed Feb 19, 2024
1 parent c5bcd50 commit 6e09925
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions clif/backend/matcher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2989,20 +2989,20 @@ const clang::FunctionDecl* ClifMatcher::SpecializeFunctionTemplate(
}

std::string ClifMatcher::TemplateDeductionResult(
Sema::TemplateDeductionResult specialized_result) const {
clang::TemplateDeductionResult specialized_result) const {
switch (specialized_result) {
case Sema::TDK_Invalid:
case clang::TemplateDeductionResult::Invalid:
return "The template function declaration was invalid.";
case Sema::TDK_InstantiationDepth:
case clang::TemplateDeductionResult::InstantiationDepth:
return "Template argument deduction exceeded the maximum template "
"instantiation depth.";
case Sema::TDK_Incomplete:
case clang::TemplateDeductionResult::Incomplete:
return "Template argument deduction did not deduce a value for every "
"template parameter.";
case Sema::TDK_Inconsistent:
case clang::TemplateDeductionResult::Inconsistent:
return "Template argument deduction produced inconsistent deduced "
"values.";
case Sema::TDK_Underqualified:
case clang::TemplateDeductionResult::Underqualified:
return "Template argument deduction failed due to inconsistent "
"cv-qualifiers.";
default:
Expand Down
2 changes: 1 addition & 1 deletion clif/backend/matcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ class ClifMatcher {

// Transform template type deduction error codes into error messages.
std::string TemplateDeductionResult(
clang::Sema::TemplateDeductionResult specialized_result) const;
clang::TemplateDeductionResult specialized_result) const;

// Add the class type as the first parameter to a function.
void AdjustForNonClassMethods(protos::FuncDecl* clif_func_decl) const;
Expand Down

0 comments on commit 6e09925

Please sign in to comment.