https://github.com/protocolbuffers/protobuf/issues/10158 PiperOrigin-RevId: 489285657pull/13171/head
Eric Salo
2 years ago
committed by
Copybara-Service
parent
fb7a67458f
commit
384ffc0af8
15 changed files with 566 additions and 18 deletions
@ -0,0 +1,85 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
#include "upb/reflection/def_builder_internal.h" |
||||
#include "upb/reflection/enum_def.h" |
||||
#include "upb/reflection/enum_reserved_range_internal.h" |
||||
// #include "upb/reflection/extension_range_internal.h"
|
||||
#include "upb/reflection/field_def.h" |
||||
// #include "upb/reflection/message_def.h"
|
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
struct upb_EnumReservedRange { |
||||
int32_t start; |
||||
int32_t end; |
||||
}; |
||||
|
||||
upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r, |
||||
int i) { |
||||
return (upb_EnumReservedRange*)&r[i]; |
||||
} |
||||
|
||||
int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r) { |
||||
return r->start; |
||||
} |
||||
int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r) { |
||||
return r->end; |
||||
} |
||||
|
||||
upb_EnumReservedRange* _upb_EnumReservedRanges_New( |
||||
upb_DefBuilder* ctx, int n, |
||||
const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* protos, |
||||
const upb_EnumDef* e) { |
||||
upb_EnumReservedRange* r = |
||||
_upb_DefBuilder_Alloc(ctx, sizeof(upb_EnumReservedRange) * n); |
||||
|
||||
for (int i = 0; i < n; i++) { |
||||
const int32_t start = |
||||
google_protobuf_EnumDescriptorProto_EnumReservedRange_start(protos[i]); |
||||
const int32_t end = |
||||
google_protobuf_EnumDescriptorProto_EnumReservedRange_end(protos[i]); |
||||
const int32_t max = kUpb_MaxFieldNumber + 1; |
||||
|
||||
// A full validation would also check that each range is disjoint, and that
|
||||
// none of the fields overlap with the extension ranges, but we are just
|
||||
// sanity checking here.
|
||||
|
||||
// Note: Not a typo! Unlike extension ranges and message reserved ranges,
|
||||
// the end value of an enum reserved range is *inclusive*!
|
||||
if (start < 1 || end < start || end > max) { |
||||
_upb_DefBuilder_Errf(ctx, "Reserved range (%d, %d) is invalid, enum=%s\n", |
||||
(int)start, (int)end, upb_EnumDef_FullName(e)); |
||||
} |
||||
|
||||
r[i].start = start; |
||||
r[i].end = end; |
||||
} |
||||
|
||||
return r; |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
|
||||
|
||||
#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ |
||||
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ |
||||
|
||||
#include "upb/reflection/common.h" |
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
int32_t upb_EnumReservedRange_Start(const upb_EnumReservedRange* r); |
||||
int32_t upb_EnumReservedRange_End(const upb_EnumReservedRange* r); |
||||
|
||||
#ifdef __cplusplus |
||||
} /* extern "C" */ |
||||
#endif |
||||
|
||||
#include "upb/port/undef.inc" |
||||
|
||||
#endif /* UPB_REFLECTION_ENUM_RESERVED_RANGE_H_ */ |
||||
@ -0,0 +1,55 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
#ifndef UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ |
||||
#define UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ |
||||
|
||||
#include "upb/reflection/enum_reserved_range.h" |
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
upb_EnumReservedRange* _upb_EnumReservedRange_At(const upb_EnumReservedRange* r, |
||||
int i); |
||||
|
||||
// Allocate and initialize an array of |n| reserved ranges owned by |e|.
|
||||
upb_EnumReservedRange* _upb_EnumReservedRanges_New( |
||||
upb_DefBuilder* ctx, int n, |
||||
const google_protobuf_EnumDescriptorProto_EnumReservedRange* const* protos, |
||||
const upb_EnumDef* e); |
||||
|
||||
#ifdef __cplusplus |
||||
} /* extern "C" */ |
||||
#endif |
||||
|
||||
#include "upb/port/undef.inc" |
||||
|
||||
#endif /* UPB_REFLECTION_ENUM_RESERVED_RANGE_INTERNAL_H_ */ |
||||
@ -0,0 +1,80 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
#include "upb/reflection/def_builder_internal.h" |
||||
#include "upb/reflection/enum_def.h" |
||||
#include "upb/reflection/extension_range_internal.h" |
||||
#include "upb/reflection/field_def.h" |
||||
#include "upb/reflection/message_def.h" |
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
struct upb_MessageReservedRange { |
||||
int32_t start; |
||||
int32_t end; |
||||
}; |
||||
|
||||
upb_MessageReservedRange* _upb_MessageReservedRange_At( |
||||
const upb_MessageReservedRange* r, int i) { |
||||
return (upb_MessageReservedRange*)&r[i]; |
||||
} |
||||
|
||||
int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r) { |
||||
return r->start; |
||||
} |
||||
int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r) { |
||||
return r->end; |
||||
} |
||||
|
||||
upb_MessageReservedRange* _upb_MessageReservedRanges_New( |
||||
upb_DefBuilder* ctx, int n, |
||||
const google_protobuf_DescriptorProto_ReservedRange* const* protos, |
||||
const upb_MessageDef* m) { |
||||
upb_MessageReservedRange* r = |
||||
_upb_DefBuilder_Alloc(ctx, sizeof(upb_MessageReservedRange) * n); |
||||
|
||||
for (int i = 0; i < n; i++) { |
||||
const int32_t start = google_protobuf_DescriptorProto_ReservedRange_start(protos[i]); |
||||
const int32_t end = google_protobuf_DescriptorProto_ReservedRange_end(protos[i]); |
||||
const int32_t max = kUpb_MaxFieldNumber + 1; |
||||
|
||||
// A full validation would also check that each range is disjoint, and that
|
||||
// none of the fields overlap with the extension ranges, but we are just
|
||||
// sanity checking here.
|
||||
if (start < 1 || end <= start || end > max) { |
||||
_upb_DefBuilder_Errf(ctx, |
||||
"Reserved range (%d, %d) is invalid, message=%s\n", |
||||
(int)start, (int)end, upb_MessageDef_FullName(m)); |
||||
} |
||||
|
||||
r[i].start = start; |
||||
r[i].end = end; |
||||
} |
||||
|
||||
return r; |
||||
} |
||||
@ -0,0 +1,51 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
// IWYU pragma: private, include "third_party/upb/upb/reflection/def.h"
|
||||
|
||||
#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_ |
||||
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_ |
||||
|
||||
#include "upb/reflection/common.h" |
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
int32_t upb_MessageReservedRange_Start(const upb_MessageReservedRange* r); |
||||
int32_t upb_MessageReservedRange_End(const upb_MessageReservedRange* r); |
||||
|
||||
#ifdef __cplusplus |
||||
} /* extern "C" */ |
||||
#endif |
||||
|
||||
#include "upb/port/undef.inc" |
||||
|
||||
#endif /* UPB_REFLECTION_MESSAGE_RESERVED_RANGE_H_ */ |
||||
@ -0,0 +1,55 @@ |
||||
/*
|
||||
* Copyright (c) 2009-2021, Google LLC |
||||
* All rights reserved. |
||||
* |
||||
* Redistribution and use in source and binary forms, with or without |
||||
* modification, are permitted provided that the following conditions are met: |
||||
* * Redistributions of source code must retain the above copyright |
||||
* notice, this list of conditions and the following disclaimer. |
||||
* * Redistributions in binary form must reproduce the above copyright |
||||
* notice, this list of conditions and the following disclaimer in the |
||||
* documentation and/or other materials provided with the distribution. |
||||
* * Neither the name of Google LLC nor the |
||||
* names of its contributors may be used to endorse or promote products |
||||
* derived from this software without specific prior written permission. |
||||
* |
||||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
||||
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||
* ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT, |
||||
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES |
||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND |
||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS |
||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||
*/ |
||||
|
||||
#ifndef UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ |
||||
#define UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ |
||||
|
||||
#include "upb/reflection/message_reserved_range.h" |
||||
|
||||
// Must be last.
|
||||
#include "upb/port/def.inc" |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
upb_MessageReservedRange* _upb_MessageReservedRange_At( |
||||
const upb_MessageReservedRange* r, int i); |
||||
|
||||
// Allocate and initialize an array of |n| reserved ranges owned by |m|.
|
||||
upb_MessageReservedRange* _upb_MessageReservedRanges_New( |
||||
upb_DefBuilder* ctx, int n, |
||||
const google_protobuf_DescriptorProto_ReservedRange* const* protos, |
||||
const upb_MessageDef* m); |
||||
|
||||
#ifdef __cplusplus |
||||
} /* extern "C" */ |
||||
#endif |
||||
|
||||
#include "upb/port/undef.inc" |
||||
|
||||
#endif /* UPB_REFLECTION_MESSAGE_RESERVED_RANGE_INTERNAL_H_ */ |
||||
Loading…
Reference in new issue