Code review

Skip null check in VisitPseudoObjectExpr
Fix bad naming in VisitConceptSpecializationExpr
Simplify test for ImportCXXParenListInitExpr

Author: ganenkokb-yandex

clang/lib/AST/ASTImporter.cpp

@@ -9282,30 +9282,26 @@ ExpectedStmt ASTNodeImporter::VisitSubstNonTypeTemplateParmPackExpr(
     SubstNonTypeTemplateParmPackExpr *E) {
   Error Err = Error::success();
   auto ToType = importChecked(Err, E->getType());
-  auto ToNameLoc = importChecked(Err, E->getParameterPackLocation());
+  auto ToPackLoc = importChecked(Err, E->getParameterPackLocation());
   auto ToArgPack = importChecked(Err, E->getArgumentPack());
   auto ToAssociatedDecl = importChecked(Err, E->getAssociatedDecl());
   if (Err)
     return std::move(Err);
 
   return new (Importer.getToContext()) SubstNonTypeTemplateParmPackExpr(
-      ToType, E->getValueKind(), ToNameLoc, ToArgPack, ToAssociatedDecl,
+      ToType, E->getValueKind(), ToPackLoc, ToArgPack, ToAssociatedDecl,
       E->getIndex(), E->getFinal());
 }
 
 ExpectedStmt ASTNodeImporter::VisitPseudoObjectExpr(PseudoObjectExpr *E) {
   SmallVector<Expr *, 4> ToSemantics(E->getNumSemanticExprs());
   if (Error Err = ImportContainerChecked(E->semantics(), ToSemantics))
     return std::move(Err);
-  Expr *ToSynt = nullptr;
-  if (const Expr *FromSynt = E->getSyntacticForm()) {
-    if (auto ToSyntOrErr = import(FromSynt))
-      ToSynt = *ToSyntOrErr;
-    else
-      return ToSyntOrErr.takeError();
-  }
-  return PseudoObjectExpr::Create(Importer.getToContext(), ToSynt, ToSemantics,
-                                  E->getResultExprIndex());
+  auto ToSyntOrErr = import(E->getSyntacticForm());
+  if (!ToSyntOrErr)
+    return ToSyntOrErr.takeError();
+  return PseudoObjectExpr::Create(Importer.getToContext(), *ToSyntOrErr,
+                                  ToSemantics, E->getResultExprIndex());
 }
 
 ExpectedStmt

clang/unittests/AST/ASTImporterTest.cpp

@@ -3323,13 +3323,10 @@ TEST_P(ImportExpr, ImportCXXParenListInitExpr) {
       int val;
       double d;
     };
-    template <int N> struct Container {
-      Node* create() { return new Node(N, 3.14); }
-    };
-    using declToImport = Container<42>;
+    Node* declToImport() { return new Node(2, 3.14); }
   )";
   testImport(Code, Lang_CXX20, "", Lang_CXX20, Verifier,
-             typedefNameDecl(hasName("declToImport")));
+             functionDecl(hasName("declToImport")));
 }
 
 TEST_P(ImportExpr, ImportPseudoObjectExpr) {