Skip to content

Commit 29476e1

Browse files
rishesh007copybara-github
authored andcommitted
test(proto): Add message to test oneof name conflict resolution
PiperOrigin-RevId: 891521448
1 parent f2221f8 commit 29476e1

2 files changed

Lines changed: 11 additions & 6 deletions

File tree

upb/message/test.proto

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,3 +219,11 @@ message TestRepeatedMessageBig {
219219
repeated TestRepeatedMessageBig repeated_message = 1;
220220
repeated bytes repeated_bytes = 2;
221221
}
222+
223+
message TestDuplicateFunctionNames {
224+
optional bool random = 6;
225+
oneof value {
226+
bytes body = 1;
227+
bool clear_body = 2;
228+
}
229+
}

upb_generator/c/names.cc

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,9 @@ constexpr uint32_t kAnyField = UINT32_MAX;
6969

7070
// Prefixes used by C code generator for field access.
7171
static constexpr std::array<Prefix, 7> kPrefixes{
72-
Prefix{"clear_", kContainerField | kStringField},
73-
Prefix{"delete_", kContainerField},
74-
Prefix{"add_", kContainerField},
75-
Prefix{"resize_", kContainerField},
76-
Prefix{"set_", kAnyField},
77-
Prefix{"has_", kAnyField},
72+
Prefix{"clear_", kAnyField}, Prefix{"delete_", kContainerField},
73+
Prefix{"add_", kContainerField}, Prefix{"resize_", kContainerField},
74+
Prefix{"set_", kAnyField}, Prefix{"has_", kAnyField},
7875
Prefix{"mutable_", kAnyField},
7976
};
8077

0 commit comments

Comments
 (0)