protocolbuffers
diff --git a/‎src/google/protobuf/compiler/cpp/field.cc
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/field.cc
+1 b/‎src/google/protobuf/compiler/cpp/field.cc
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/field.cc
+1
diff --git a/‎src/google/protobuf/compiler/cpp/helpers.cc
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/helpers.cc
+9 b/‎src/google/protobuf/compiler/cpp/helpers.cc
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/helpers.cc
+9
diff --git a/‎src/google/protobuf/compiler/cpp/helpers.h
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/helpers.h
+2 b/‎src/google/protobuf/compiler/cpp/helpers.h
Copy file name to clipboardExpand all lines: src/google/protobuf/compiler/cpp/helpers.h
+2
@@ -58,6 +58,7 @@ std::vector<Sub> FieldVars(const FieldDescriptor* field, const Options& opts) {
       {"field_", FieldMemberName(field, split)},
       {"DeclaredType", DeclaredTypeMethodName(field->type())},
       {"DeclaredCppType", DeclaredCppTypeMethodName(field->cpp_type())},
+      {"Utf8", IsStrictUtf8String(field, opts) ? "Utf8" : "Raw"},
       {"kTagBytes", WireFormat::TagSize(field->number(), field->type())},
       Sub("PrepareSplitMessageForWrite",
           split ? "PrepareSplitMessageForWrite();" : "")
 
@@ -1469,6 +1469,15 @@ void NamespaceOpener::ChangeTo(absl::string_view name,
   name_stack_ = std::move(new_stack);
 }
 
+bool IsStrictUtf8String(const FieldDescriptor* field, const Options& options) {
+  if (field->type() != FieldDescriptor::TYPE_STRING) return false;
+
+  bool is_lite =
+      GetOptimizeFor(field->file(), options) == FileOptions::LITE_RUNTIME;
+  return internal::cpp::GetUtf8CheckMode(field, is_lite) ==
+         internal::cpp::Utf8CheckMode::kStrict;
+}
+
 static void GenerateUtf8CheckCode(io::Printer* p, const FieldDescriptor* field,
                                   const Options& options, bool for_parse,
                                   absl::string_view params,
 
@@ -1144,6 +1144,8 @@ void GenerateUtf8CheckCodeForCord(io::Printer* p, const FieldDescriptor* field,
                                   const Options& options, bool for_parse,
                                   absl::string_view parameters);
 
+bool IsStrictUtf8String(const FieldDescriptor* field, const Options& options);
+
 inline bool ShouldGenerateExternSpecializations(const Options& options) {
   // For OSS we omit the specializations to reduce codegen size.
   // Some compilers can't handle that much input in a single translation unit.