Merge tag 'refs/tags/sync-piper' into sync-stage

bithium · Jul 11, 2022 · 9931365 · 9931365
2 parents f1f71e2 + f4dfa1a
commit 9931365
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/google/protobuf/descriptor.proto b/google/protobuf/descriptor.proto
@@ -916,8 +916,20 @@ message GeneratedCodeInfo {
     optional int32 begin = 3;
 
     // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
+    // relates to the identified object. The end offset should be one past
     // the last relevant byte (so the length of the text = end - begin).
     optional int32 end = 4;
+
+    // Represents the identified object's effect on the element in the original
+    // .proto file.
+    enum Semantic {
+      // There is no effect or the effect is indescribable.
+      NONE = 0;
+      // The element is set or otherwise mutated.
+      SET = 1;
+      // An alias to the element is returned.
+      ALIAS = 2;
+    }
+    optional Semantic semantic = 5;
   }
 }
diff --git a/google/protobuf/util/json_format_proto3.proto b/google/protobuf/util/json_format_proto3.proto
@@ -46,6 +46,7 @@ option java_outer_classname = "JsonFormatProto3";
 enum EnumType {
   FOO = 0;
   BAR = 1;
+  TLSv1_2 = 2;
 }
 
 message MessageType {
@@ -179,6 +180,11 @@ message TestBoolValue {
   map<bool, int32> bool_map = 2;
 }
 
+message TestNullValue {
+  google.protobuf.NullValue null_value = 20;
+  repeated google.protobuf.NullValue repeated_null_value = 21;
+}
+
 message TestCustomJsonName {
   int32 value = 1 [json_name = "@value"];
 }