simplify code even more

on-behalf-of: @amd <[email protected]>

Author: jjmarr-amd

clang-tools-extra/clang-tidy/readability/AvoidDefaultLambdaCaptureCheck.cpp

@@ -13,28 +13,17 @@
 
 using namespace clang::tidy::readability;
 
-static std::optional<std::string>
-generateCaptureText(const clang::LambdaCapture &Capture) {
+static std::string generateCaptureText(const clang::LambdaCapture &Capture) {
   if (Capture.capturesThis()) {
     return Capture.getCaptureKind() == clang::LCK_StarThis ? "*this" : "this";
   }
 
-  if (Capture.capturesVariable()) {
-    std::string Result;
-    if (Capture.getCaptureKind() == clang::LCK_ByRef) {
-      Result += "&";
-    }
-    Result += Capture.getCapturedVar()->getName().str();
-    return Result;
+  std::string Result;
+  if (Capture.getCaptureKind() == clang::LCK_ByRef) {
+    Result += "&";
   }
-
-  if (Capture.capturesVLAType()) {
-    // VLA captures are rare and complex - for now we skip them
-    // A full implementation would need to handle the VLA type properly
-    return std::nullopt;
-  }
-
-  return std::nullopt;
+  Result += Capture.getCapturedVar()->getName().str();
+  return Result;
 }
 
 void AvoidDefaultLambdaCaptureCheck::registerMatchers(
@@ -59,24 +48,16 @@ void AvoidDefaultLambdaCaptureCheck::check(
                    "lambda default captures are discouraged; "
                    "prefer to capture specific variables explicitly");
 
-  std::vector<std::string> AllCaptures;
+  std::vector<std::string> ImplicitCaptures;
 
-  for (const auto &Capture : Lambda->captures()) {
-    if (const auto CaptureText = generateCaptureText(Capture)) {
-      AllCaptures.push_back(CaptureText.value());
-    }
+  for (const auto &Capture : Lambda->implicit_captures()) {
+    ImplicitCaptures.push_back(generateCaptureText(Capture));
   }
 
-  const auto ReplacementText = [&AllCaptures]() -> std::string {
-    if (AllCaptures.empty()) {
-      return "[]";
-    }
-    return "[" + llvm::join(AllCaptures, ", ") + "]";
+  const auto ReplacementText = [&ImplicitCaptures]() {
+    return llvm::join(ImplicitCaptures, ", ");
   }();
 
-  const clang::SourceRange IntroducerRange = Lambda->getIntroducerRange();
-  if (IntroducerRange.isValid()) {
-    Diag << clang::FixItHint::CreateReplacement(IntroducerRange,
-                                                ReplacementText);
-  }
+  Diag << clang::FixItHint::CreateReplacement(Lambda->getCaptureDefaultLoc(),
+                                              ReplacementText);
 }

clang-tools-extra/test/clang-tidy/checkers/readability/avoid-default-lambda-capture.cpp

@@ -14,11 +14,11 @@ void test_default_captures() {
 
   auto lambda3 = [=, &another](int x) { return value + another + x; };
   // CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
-  // CHECK-FIXES: auto lambda3 = [&another, value](int x) { return value + another + x; };
+  // CHECK-FIXES: auto lambda3 = [value, &another](int x) { return value + another + x; };
 
   auto lambda4 = [&, value](int x) { return value + another + x; };
   // CHECK-MESSAGES: :[[@LINE-1]]:19: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
-  // CHECK-FIXES: auto lambda4 = [value, &another](int x) { return value + another + x; };
+  // CHECK-FIXES: auto lambda4 = [&another, value](int x) { return value + another + x; };
 }
 
 void test_acceptable_captures() {
@@ -101,10 +101,31 @@ void test_template_lambdas() {
 
   auto lambda = [=](T x) { return value + x; };
   // CHECK-MESSAGES: :[[@LINE-1]]:18: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
-  // CHECK-FIXES: auto lambda = [](T x) { return value + x; };
+  // CHECK-FIXES: auto lambda = [value](T x) { return value + x; };
 }
 
 void instantiate_templates() {
   test_template_lambdas<int>();
   test_template_lambdas<double>();
 }
+
+void test_init_captures() {
+  int x = 3;
+  int nx = 5;
+
+  int y1 = [&, z = x + 5]() -> int {
+  // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
+  // CHECK-FIXES: int y1 = [&nx, z = x + 5]() -> int {
+    return z * z + nx;
+  }();
+
+  int y2 = [=, &ref = x]() {
+  // CHECK-MESSAGES: :[[@LINE-1]]:13: warning: lambda default captures are discouraged; prefer to capture specific variables explicitly [readability-avoid-default-lambda-capture]
+  // CHECK-FIXES: int y2 = [nx, &ref = x]() {
+    ref += 1;
+    return nx - ref;
+  }();
+
+  (void)y1;
+  (void)y2;
+}