← all fixtures

c-protocolbuffers-protobuf-add-to-preproc-define

C View before/after files on GitHub Upstream commit protocolbuffers-protobuf.git@2c27e75 upb/wire/decode_fast/combinations.h
Code view:

A painting is a person's account of this edit as text, recorded independently of the node mapping - a rendering often has several equally defensible answers where the mapping has one. Deletions and insertions carry no position on the opposite side in a painting, so that panel draws no caret for them.

Before

…lines 1–195 unchanged (195 lines)
196// since we use it when initializing the fastdecode function array.
197//
198// This function only applies to field types that have been assigned a function
199// index. Some field types (eg. groups) do not even have a function index at
200// the moment, and so will be rejected by upb_DecodeFast_TryFillEntry() before
201// we even get here.
202#define UPB_DECODEFAST_COMBINATION_IS_ENABLED(type, card, size) \
203 (type == kUpb_DecodeFast_Fixed32 || type == kUpb_DecodeFast_Fixed64 || \
204 ((type == kUpb_DecodeFast_Varint32 || type == kUpb_DecodeFast_Varint64 || \
205 type == kUpb_DecodeFast_ZigZag32 || type == kUpb_DecodeFast_ZigZag64 || \
206 type == kUpb_DecodeFast_Bool)))
207
208#ifdef UPB_DECODEFAST_DISABLE_FUNCTIONS_ABOVE
…lines 209–221 unchanged (13 lines)

After

…lines 1–199 unchanged (199 lines)
200// the moment, and so will be rejected by upb_DecodeFast_TryFillEntry() before
201// we even get here.
202#define UPB_DECODEFAST_COMBINATION_IS_ENABLED(type, card, size) \
203 (type == kUpb_DecodeFast_Fixed32 || type == kUpb_DecodeFast_Fixed64 || \
204 ((type == kUpb_DecodeFast_Varint32 || type == kUpb_DecodeFast_Varint64 || \
205 type == kUpb_DecodeFast_ZigZag32 || type == kUpb_DecodeFast_ZigZag64 || \
206 type == kUpb_DecodeFast_Bool || type == kUpb_DecodeFast_Bytes || \
207 type == kUpb_DecodeFast_String)))
208
209#ifdef UPB_DECODEFAST_DISABLE_FUNCTIONS_ABOVE
210#define UPB_DECODEFAST_ISENABLED(type, card, size) \
211 (UPB_DECODEFAST_COMBINATION_IS_ENABLED(type, card, size) && \
212 (UPB_DECODEFAST_FUNCTION_IDX(type, card, size) <= \
213 UPB_DECODEFAST_DISABLE_FUNCTIONS_ABOVE))
…lines 214–222 unchanged (9 lines)

Before

translation_unit
comment "// Protocol Buffers - Google's data interchange format"
comment "// Copyright 2025 Google LLC. All rights reserved."
comment "//"
comment "// Use of this source code is governed by a BSD-style"
comment "// license that can be found in the LICENSE file or at"
comment "// https://developers.google.com/open-source/licenses/bsd"
preproc_ifdef
#ifndef "#ifndef"
identifier "UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"
preproc_def
#define "#define"
identifier "UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"
preproc_include
#include "#include"
system_lib_string "<stdint.h>"
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/base/internal/log2.h"
" "\""
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/wire/types.h"
" "\""
comment "// Must be last."
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/port/def.inc"
" "\""
comment "// Each fast function is specialized for a cardinality, type"...
comment "// These macros enumerate all possibilities for each of thes"...
comment "//"
comment "// These can be generated in any combination, except that no"...
comment "// cannot be packed. So we have:"
comment "// {1bt,2bt} x {s,o,r,p} x {b,v32,v64,z32,z64,f32,f64,ce} "...
comment "// {1bt,2bt} x {s,o,r} x {s,b,m} "...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_CARDINALITIES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Scalar) \\\n F(__VA_ARGS__"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_TYPES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Bool) \\\n F(__VA_ARGS__, Varint"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_TAGSIZES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Tag1Byte) \\\n F(__VA_ARGS__, Tag"...
preproc_function_def
#define "#define"
identifier "ENUM_VAL"
preproc_params
( "("
identifier "_"
, ","
identifier "x"
) ")"
preproc_arg "kUpb_DecodeFast_##x,"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_CARDINALITIES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Scalar = 0, etc."
} "}"
type_identifier "upb_DecodeFast_Cardinality"
; ";"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_TYPES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Bool = 0, etc."
} "}"
type_identifier "upb_DecodeFast_Type"
; ";"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_TAGSIZES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Tag1Byte = 0, etc."
} "}"
type_identifier "upb_DecodeFast_TagSize"
; ";"
preproc_call
preproc_directive "#undef"
preproc_arg "ENUM_VAL"
preproc_function_def
#define "#define"
identifier "ADD"
preproc_params
( "("
identifier "_"
, ","
identifier "x"
) ")"
preproc_arg "+1"
enum_specifier (+36 nodes collapsed)
; ";"
preproc_call
preproc_directive "#undef"
preproc_arg "ADD"
comment "// Attributes of the various dimensions."
function_definition (+50 nodes collapsed)
function_definition (+90 nodes collapsed)
function_definition (+90 nodes collapsed)
function_definition (+29 nodes collapsed)
function_definition (+28 nodes collapsed)
function_definition (+43 nodes collapsed)
comment "// The canonical ordering of functions, used by the arrays o"...
comment "// and function names. This macro generates the full cross "...
comment "// cardinality, type, and tag size enums."
comment "//"
comment "// This ordering generates some combinations that are not ac"...
comment "// packed strings or messages), but it's simpler than trying"...
comment "// There are only 14 impossible combinations out of 120 tota"...
comment "// worth optimizing for."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCTIONS"
preproc_params
( "("
identifier "F"
) ")"
preproc_arg "UPB_DECODEFAST_TYPES(UPB_DECODEFAST_CARDINALITIES, UPB_DECOD"...
comment "// The canonical index of a given function. This must be ke"...
comment "// ordering above, such that this index selects the same fun"...
comment "// corresponding UPB_DECODEFAST_FUNCNAME() macro."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCTION_IDX"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "(((uint32_t)type * kUpb_DecodeFast_CardinalityCount * \\\n "...
comment "// Functions to decompose a function index into its constitu"...
function_definition (+30 nodes collapsed)
function_definition (+36 nodes collapsed)
function_definition (+36 nodes collapsed)
comment "// The canonical function name for a given cardinality, type"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCNAME"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "upb_DecodeFast_##type##_##card##_##size"
comment "// Returns true if we should disable fast decode for this fu"...
comment "// useful for field types that are known not to work yet. I"...
comment "// bisecting a test failure to find which function(s) are br"...
comment "//"
comment "// This must be a macro because it must evaluate to a compil"...
comment "// since we use it when initializing the fastdecode function"...
comment "//"
comment "// This function only applies to field types that have been "...
comment "// index. Some field types (eg. groups) do not even have a "...
comment "// the moment, and so will be rejected by upb_DecodeFast_Try"...
comment "// we even get here."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_COMBINATION_IS_ENABLED"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "(type == kUpb_DecodeFast_Fixed32 || type == kUpb_DecodeFast_"...
preproc_ifdef (+30 nodes collapsed)
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/port/undef.inc"
" "\""
#endif "#endif"
comment "// UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"

After

translation_unit
comment "// Protocol Buffers - Google's data interchange format"
comment "// Copyright 2025 Google LLC. All rights reserved."
comment "//"
comment "// Use of this source code is governed by a BSD-style"
comment "// license that can be found in the LICENSE file or at"
comment "// https://developers.google.com/open-source/licenses/bsd"
preproc_ifdef
#ifndef "#ifndef"
identifier "UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"
preproc_def
#define "#define"
identifier "UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"
preproc_include
#include "#include"
system_lib_string "<stdint.h>"
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/base/internal/log2.h"
" "\""
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/wire/types.h"
" "\""
comment "// Must be last."
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/port/def.inc"
" "\""
comment "// Each fast function is specialized for a cardinality, type"...
comment "// These macros enumerate all possibilities for each of thes"...
comment "//"
comment "// These can be generated in any combination, except that no"...
comment "// cannot be packed. So we have:"
comment "// {1bt,2bt} x {s,o,r,p} x {b,v32,v64,z32,z64,f32,f64,ce} "...
comment "// {1bt,2bt} x {s,o,r} x {s,b,m} "...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_CARDINALITIES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Scalar) \\\n F(__VA_ARGS__"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_TYPES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Bool) \\\n F(__VA_ARGS__, Varint"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_TAGSIZES"
preproc_params
( "("
identifier "F"
, ","
... "..."
) ")"
preproc_arg "F(__VA_ARGS__, Tag1Byte) \\\n F(__VA_ARGS__, Tag"...
preproc_function_def
#define "#define"
identifier "ENUM_VAL"
preproc_params
( "("
identifier "_"
, ","
identifier "x"
) ")"
preproc_arg "kUpb_DecodeFast_##x,"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_CARDINALITIES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Scalar = 0, etc."
} "}"
type_identifier "upb_DecodeFast_Cardinality"
; ";"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_TYPES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Bool = 0, etc."
} "}"
type_identifier "upb_DecodeFast_Type"
; ";"
type_definition
typedef "typedef"
enum_specifier
enum "enum"
enumerator_list
{ "{"
enumerator
identifier "UPB_DECODEFAST_TAGSIZES"
ERROR
( "("
identifier "ENUM_VAL"
) ")"
comment "// kUpb_DecodeFast_Tag1Byte = 0, etc."
} "}"
type_identifier "upb_DecodeFast_TagSize"
; ";"
preproc_call
preproc_directive "#undef"
preproc_arg "ENUM_VAL"
preproc_function_def
#define "#define"
identifier "ADD"
preproc_params
( "("
identifier "_"
, ","
identifier "x"
) ")"
preproc_arg "+1"
enum_specifier (+36 nodes collapsed)
; ";"
preproc_call
preproc_directive "#undef"
preproc_arg "ADD"
comment "// Attributes of the various dimensions."
function_definition (+50 nodes collapsed)
function_definition (+90 nodes collapsed)
function_definition (+90 nodes collapsed)
function_definition (+29 nodes collapsed)
function_definition (+28 nodes collapsed)
function_definition (+43 nodes collapsed)
comment "// The canonical ordering of functions, used by the arrays o"...
comment "// and function names. This macro generates the full cross "...
comment "// cardinality, type, and tag size enums."
comment "//"
comment "// This ordering generates some combinations that are not ac"...
comment "// packed strings or messages), but it's simpler than trying"...
comment "// There are only 14 impossible combinations out of 120 tota"...
comment "// worth optimizing for."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCTIONS"
preproc_params
( "("
identifier "F"
) ")"
preproc_arg "UPB_DECODEFAST_TYPES(UPB_DECODEFAST_CARDINALITIES, UPB_DECOD"...
comment "// The canonical index of a given function. This must be ke"...
comment "// ordering above, such that this index selects the same fun"...
comment "// corresponding UPB_DECODEFAST_FUNCNAME() macro."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCTION_IDX"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "(((uint32_t)type * kUpb_DecodeFast_CardinalityCount * \\\n "...
comment "// Functions to decompose a function index into its constitu"...
function_definition (+30 nodes collapsed)
function_definition (+36 nodes collapsed)
function_definition (+36 nodes collapsed)
comment "// The canonical function name for a given cardinality, type"...
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_FUNCNAME"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "upb_DecodeFast_##type##_##card##_##size"
comment "// Returns true if we should disable fast decode for this fu"...
comment "// useful for field types that are known not to work yet. I"...
comment "// bisecting a test failure to find which function(s) are br"...
comment "//"
comment "// This must be a macro because it must evaluate to a compil"...
comment "// since we use it when initializing the fastdecode function"...
comment "//"
comment "// This function only applies to field types that have been "...
comment "// index. Some field types (eg. groups) do not even have a "...
comment "// the moment, and so will be rejected by upb_DecodeFast_Try"...
comment "// we even get here."
preproc_function_def
#define "#define"
identifier "UPB_DECODEFAST_COMBINATION_IS_ENABLED"
preproc_params
( "("
identifier "type"
, ","
identifier "card"
, ","
identifier "size"
) ")"
preproc_arg "(type == kUpb_DecodeFast_Fixed32 || type == kUpb_DecodeFast_"...
preproc_ifdef (+30 nodes collapsed)
preproc_include
#include "#include"
string_literal
" "\""
string_content "upb/port/undef.inc"
" "\""
#endif "#endif"
comment "// UPB_WIRE_INTERNAL_DECODE_FAST_COMBINATIONS_H_"