Remove most expansion-statement-specific code

Author: Sirraide

clang/lib/Sema/SemaStmt.cpp

@@ -2411,21 +2411,13 @@ void NoteForRangeBeginEndFunction(Sema &SemaRef, Expr *E,
 /// Build a variable declaration for a for-range statement.
 VarDecl *BuildForRangeVarDecl(Sema &SemaRef, SourceLocation Loc, QualType Type,
                               StringRef Name, bool ForExpansionStmt) {
-  // Making the variable constexpr doesn't automatically add 'const' to the
-  // type, so do that now.
-  if (ForExpansionStmt && !Type->isReferenceType())
-    Type = Type.withConst();
-
   DeclContext *DC = SemaRef.CurContext;
   IdentifierInfo *II = &SemaRef.PP.getIdentifierTable().get(Name);
   TypeSourceInfo *TInfo = SemaRef.Context.getTrivialTypeSourceInfo(Type, Loc);
   VarDecl *Decl = VarDecl::Create(SemaRef.Context, DC, Loc, Loc, II, Type,
                                   TInfo, SC_None);
   Decl->setImplicit();
   Decl->setCXXForRangeImplicitVar(true);
-  if (ForExpansionStmt)
-    // CWG 3044: Do not make the variable 'static'.
-    Decl->setConstexpr(true);
   return Decl;
 }
 }
@@ -2739,10 +2731,7 @@ Sema::ForRangeBeginEndInfo Sema::BuildCXXForRangeBeginEndVars(
     return {};
 
   // P2718R0 - Lifetime extension in range-based for loops.
-  //
-  // CWG 3043 – Do not apply lifetime extension to iterating
-  // expansion statements.
-  if (getLangOpts().CPlusPlus23 && !ForExpansionStmt)
+  if (getLangOpts().CPlusPlus23)
     ApplyForRangeOrExpansionStatementLifetimeExtension(RangeVar,
                                                        LifetimeExtendTemps);