Merge commit '1c85981e3770' from llvm.org/main into next

git apple-llvm automerger · git apple-llvm automerger · commit 2a8460ed125c · 2025-11-04T13:21:04.000-08:00
diff --git a/llvm/lib/Support/Mustache.cpp b/llvm/lib/Support/Mustache.cpp
@@ -51,7 +51,7 @@ static Accessor splitMustacheString(StringRef Str, MustacheContext &Ctx) {
       std::tie(Part, Str) = Str.split('.');
       // Each part of the accessor needs to be saved to the arena
       // to ensure it has a stable address.
-      Tokens.push_back(Ctx.Saver.save(Part.trim()));
+      Tokens.push_back(Part.trim());
     }
   }
   // Now, allocate memory for the array of StringRefs in the arena.

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ static Accessor splitMustacheString(StringRef Str, MustacheContext &Ctx) {`
`51`	`51`	`std::tie(Part, Str) = Str.split('.');`
`52`	`52`	`// Each part of the accessor needs to be saved to the arena`
`53`	`53`	`// to ensure it has a stable address.`
`54`		`- Tokens.push_back(Ctx.Saver.save(Part.trim()));`
	`54`	`+ Tokens.push_back(Part.trim());`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`// Now, allocate memory for the array of StringRefs in the arena.`