Internal changes

PiperOrigin-RevId: 516893867

src/google/protobuf/descriptor.cc

@@ -4993,7 +4993,7 @@ static void PlanAllocationSize(const FileDescriptorProto& proto,
   alloc.PlanArray<FileDescriptor>(1);
   alloc.PlanArray<FileDescriptorTables>(1);
   alloc.PlanArray<std::string>(2
-  );  // name + package
+  );    // name + package
   if (proto.has_options()) alloc.PlanArray<FileOptions>(1);
   if (proto.has_source_code_info()) alloc.PlanArray<SourceCodeInfo>(1);
 

src/google/protobuf/port_def.inc

@@ -221,6 +221,10 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
 // Owner: ezb@
 #define PROTOBUF_FUTURE_REMOVE_CONST_REPEATEDFIELD_GETARENA_API 1
 
+// Used to remove Protobuf editions feature.
+// Owner: mkruskal@
+#define PROTOBUF_FUTURE_EDITIONS 1
+
 #endif
 
 #ifdef PROTOBUF_VERSION