3 files changed, 9 insertions, 7 deletions
diff --git a/src/mongo/db/exec/sbe/expressions/expression.h b/src/mongo/db/exec/sbe/expressions/expression.h
index f52acef32ca..4e811337cc3 100644
--- a/src/mongo/db/exec/sbe/expressions/expression.h
+++ b/src/mongo/db/exec/sbe/expressions/expression.h
@@ -317,7 +317,7 @@ auto makeSV(Args&&... args) {
 class EConstant final : public EExpression {
 public:
     EConstant(value::TypeTags tag, value::Value val) : _tag(tag), _val(val) {}
-    EConstant(StringData str) {
+    EConstant(std::string_view str) {
         // Views are non-owning so we have to make a copy.
         std::tie(_tag, _val) = value::makeNewString(str);
     }
@@ -448,7 +448,7 @@ private:
  */
 class EFunction final : public EExpression {
 public:
-    EFunction(StringData name, std::vector<std::unique_ptr<EExpression>> args) : _name(name) {
+    EFunction(std::string_view name, std::vector<std::unique_ptr<EExpression>> args) : _name(name) {
         _nodes = std::move(args);
         validateNodes();
     }
@@ -513,7 +513,7 @@ private:
  */
 class EFail final : public EExpression {
 public:
-    EFail(ErrorCodes::Error code, StringData message) : _code(code) {
+    EFail(ErrorCodes::Error code, std::string_view message) : _code(code) {
         std::tie(_messageTag, _messageVal) = value::makeNewString(message);
     }
 
diff --git a/src/mongo/db/exec/sbe/expressions/sbe_concat_test.cpp b/src/mongo/db/exec/sbe/expressions/sbe_concat_test.cpp
index 4275ae03eee..857704fb5b5 100644
--- a/src/mongo/db/exec/sbe/expressions/sbe_concat_test.cpp
+++ b/src/mongo/db/exec/sbe/expressions/sbe_concat_test.cpp
@@ -33,7 +33,8 @@
 namespace mongo::sbe {
 class SBEConcatTest : public EExpressionTestFixture {
 protected:
-    void runAndAssertExpression(const vm::CodeFragment* compiledExpr, StringData expectedVal) {
+    void runAndAssertExpression(const vm::CodeFragment* compiledExpr,
+                                std::string_view expectedVal) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
 
diff --git a/src/mongo/db/exec/sbe/expressions/sbe_regex_test.cpp b/src/mongo/db/exec/sbe/expressions/sbe_regex_test.cpp
index 8486a7c65f8..2e3c87789cb 100644
--- a/src/mongo/db/exec/sbe/expressions/sbe_regex_test.cpp
+++ b/src/mongo/db/exec/sbe/expressions/sbe_regex_test.cpp
@@ -32,7 +32,8 @@
 namespace mongo::sbe {
 class SBERegexTest : public EExpressionTestFixture {
 protected:
-    void runAndAssertRegexCompile(const vm::CodeFragment* compiledExpr, StringData regexString) {
+    void runAndAssertRegexCompile(const vm::CodeFragment* compiledExpr,
+                                  std::string_view regexString) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
 
@@ -52,7 +53,7 @@ protected:
     }
 
     void runAndAssertFindExpression(const vm::CodeFragment* compiledExpr,
-                                    StringData expectedMatch,
+                                    std::string_view expectedMatch,
                                     int idx) {
         auto [tag, val] = runCompiledExpression(compiledExpr);
         value::ValueGuard guard(tag, val);
@@ -71,7 +72,7 @@ protected:
         ASSERT_EQUALS(value::numericCast<int32_t>(idxTag, idxVal), idx);
     }
 
-    void addMatchResult(value::Array* arrayPtr, StringData matchStr, int32_t idx) {
+    void addMatchResult(value::Array* arrayPtr, std::string_view matchStr, int32_t idx) {
         auto [objTag, objVal] = value::makeNewObject();
         value::ValueGuard objGuard{objTag, objVal};
         auto obj = value::getObjectView(objVal);