[clang] Revert "[Clang][Sema] Handle invalid variable template specialization whose type depends on itself (#134522)" (PR #139539)

[via cfe-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp,h -- 
clang/include/clang/AST/ASTContext.h clang/lib/AST/ASTContext.cpp 
clang/lib/Sema/SemaExpr.cpp clang/lib/Sema/SemaTemplate.cpp 
clang/lib/Sema/SemaTemplateDeduction.cpp 
clang/test/SemaCXX/cxx1y-variable-templates_in_class.cpp 
clang/test/SemaCXX/cxx1y-variable-templates_top_level.cpp 
clang/test/SemaTemplate/instantiate-var-template.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/clang/lib/Sema/SemaExpr.cpp b/clang/lib/Sema/SemaExpr.cpp
index 4af9b6f0a..cc8d5f1aa 100644
--- a/clang/lib/Sema/SemaExpr.cpp
+++ b/clang/lib/Sema/SemaExpr.cpp
@@ -251,7 +251,7 @@ bool Sema::DiagnoseUseOfDecl(NamedDecl *D, 
ArrayRef<SourceLocation> Locs,
         << D->getDeclName();
     } else {
       Diag(Loc, diag::err_auto_variable_cannot_appear_in_own_initializer)
-        << D->getDeclName() << cast<VarDecl>(D)->getType();
+          << D->getDeclName() << cast<VarDecl>(D)->getType();
     }
     return true;
   }
diff --git a/clang/lib/Sema/SemaTemplateDeduction.cpp 
b/clang/lib/Sema/SemaTemplateDeduction.cpp
index b3505bad2..26b21fe51 100644
--- a/clang/lib/Sema/SemaTemplateDeduction.cpp
+++ b/clang/lib/Sema/SemaTemplateDeduction.cpp
@@ -2835,50 +2835,50 @@ static bool isSameTemplateArg(ASTContext &Context, 
const TemplateArgument &X,
     return false;
 
   switch (X.getKind()) {
-    case TemplateArgument::Null:
-      llvm_unreachable("Comparing NULL template argument");
+  case TemplateArgument::Null:
+    llvm_unreachable("Comparing NULL template argument");
 
-    case TemplateArgument::Type:
-      return Context.getCanonicalType(X.getAsType()) ==
-             Context.getCanonicalType(Y.getAsType());
+  case TemplateArgument::Type:
+    return Context.getCanonicalType(X.getAsType()) ==
+           Context.getCanonicalType(Y.getAsType());
 
-    case TemplateArgument::Declaration:
-      return isSameDeclaration(X.getAsDecl(), Y.getAsDecl());
+  case TemplateArgument::Declaration:
+    return isSameDeclaration(X.getAsDecl(), Y.getAsDecl());
 
-    case TemplateArgument::NullPtr:
-      return Context.hasSameType(X.getNullPtrType(), Y.getNullPtrType());
+  case TemplateArgument::NullPtr:
+    return Context.hasSameType(X.getNullPtrType(), Y.getNullPtrType());
 
-    case TemplateArgument::Template:
-    case TemplateArgument::TemplateExpansion:
-      return Context.getCanonicalTemplateName(
-                    X.getAsTemplateOrTemplatePattern()).getAsVoidPointer() ==
-             Context.getCanonicalTemplateName(
-                    Y.getAsTemplateOrTemplatePattern()).getAsVoidPointer();
-
-    case TemplateArgument::Integral:
-      return hasSameExtendedValue(X.getAsIntegral(), Y.getAsIntegral());
-
-    case TemplateArgument::StructuralValue:
-      return X.structurallyEquals(Y);
-
-    case TemplateArgument::Expression: {
-      llvm::FoldingSetNodeID XID, YID;
-      X.getAsExpr()->Profile(XID, Context, true);
-      Y.getAsExpr()->Profile(YID, Context, true);
-      return XID == YID;
-    }
+  case TemplateArgument::Template:
+  case TemplateArgument::TemplateExpansion:
+    return Context.getCanonicalTemplateName(X.getAsTemplateOrTemplatePattern())
+               .getAsVoidPointer() ==
+           Context.getCanonicalTemplateName(Y.getAsTemplateOrTemplatePattern())
+               .getAsVoidPointer();
 
-    case TemplateArgument::Pack: {
-      unsigned PackIterationSize = X.pack_size();
-      if (X.pack_size() != Y.pack_size())
+  case TemplateArgument::Integral:
+    return hasSameExtendedValue(X.getAsIntegral(), Y.getAsIntegral());
+
+  case TemplateArgument::StructuralValue:
+    return X.structurallyEquals(Y);
+
+  case TemplateArgument::Expression: {
+    llvm::FoldingSetNodeID XID, YID;
+    X.getAsExpr()->Profile(XID, Context, true);
+    Y.getAsExpr()->Profile(YID, Context, true);
+    return XID == YID;
+  }
+
+  case TemplateArgument::Pack: {
+    unsigned PackIterationSize = X.pack_size();
+    if (X.pack_size() != Y.pack_size())
+      return false;
+    ArrayRef<TemplateArgument> XP = X.pack_elements();
+    ArrayRef<TemplateArgument> YP = Y.pack_elements();
+    for (unsigned i = 0; i < PackIterationSize; ++i)
+      if (!isSameTemplateArg(Context, XP[i], YP[i]))
         return false;
-      ArrayRef<TemplateArgument> XP = X.pack_elements();
-      ArrayRef<TemplateArgument> YP = Y.pack_elements();
-      for (unsigned i = 0; i < PackIterationSize; ++i)
-        if (!isSameTemplateArg(Context, XP[i], YP[i]))
-          return false;
-      return true;
-    }
+    return true;
+  }
   }
 
   llvm_unreachable("Invalid TemplateArgument Kind!");

``````````

</details>


https://github.com/llvm/llvm-project/pull/139539
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits