Added const qualifier to iterator to enable compiling with VS2008 #1

dhirschfeld · 2014-08-27T08:10:14Z

No description provided.

xfxyjwf · 2014-08-27T17:39:34Z

Hi, please sign this Google Individual Contributor License Agreement:
https://developers.google.com/open-source/cla/individual
and update this thread when you are done. This is required for us to use your code.

dhirschfeld · 2014-09-01T18:33:43Z

I've submitted the form electronically so we'll see where we go from there...

Added const qualifier to iterator to enable compiling with VS2008

Rewrite of C# protogen to C++ (initial version)

Csharp update

A few corrections to the proposed podspec

5.25 merge

Few fixes.

Beta 3

Added instruction for existing ZLIB configuration

PiperOrigin-RevId: 661433949

PiperOrigin-RevId: 663974332

Loop body before: ``` .LBB0_2: add w8, w12, #1 cmp w8, w11 b.gt .LBB0_6 // Predictable branch, ends the loop .LBB0_3: add w12, w8, w11 add w12, w12, w12, lsr #31 asr w12, w12, #1 smaddl x0, w12, w10, x9 ldr w13, [x0] cmp w13, w1 b.lo .LBB0_2 // Unpredictable branch here! Will be hit 50/50 in prod b.ls .LBB0_7 // Predictable branch - ends the loop sub w11, w12, #1 cmp w8, w11 b.le .LBB0_3 // Predictable branch - continues the loop ``` Loop body after: ``` .LBB7_1: cmp w9, w11 b.hi .LBB7_4 // Predictable branch - ends the loop add w12, w9, w11 lsr w12, w12, #1 umaddl x0, w12, w8, x10 sub w14, w12, #1 ldr w13, [x0] cmp w13, w1 csel w11, w14, w11, hs csinc w9, w9, w12, hs b.ne .LBB7_1 // Predictable branch - continues the loop ``` PiperOrigin-RevId: 700864625

On a Cortex-A55 this resulted in a 28.30% reduction in CPU and wall time for the binary search path. Loop body before: ``` .LBB0_2: add w8, w12, #1 cmp w8, w11 b.gt .LBB0_6 // Predictable branch, ends the loop .LBB0_3: add w12, w8, w11 add w12, w12, w12, lsr #31 asr w12, w12, #1 smaddl x0, w12, w10, x9 ldr w13, [x0] cmp w13, w1 b.lo .LBB0_2 // Unpredictable branch here! Will be hit 50/50 in prod b.ls .LBB0_7 // Predictable branch - ends the loop sub w11, w12, #1 cmp w8, w11 b.le .LBB0_3 // Predictable branch - continues the loop ``` Loop body after: ``` .LBB7_1: cmp w9, w11 b.hi .LBB7_4 // Predictable branch - ends the loop add w12, w9, w11 lsr w12, w12, #1 umaddl x0, w12, w8, x10 sub w14, w12, #1 ldr w13, [x0] cmp w13, w1 csel w11, w14, w11, hs csinc w9, w9, w12, hs b.ne .LBB7_1 // Predictable branch - continues the loop ``` PiperOrigin-RevId: 700864625

On a Cortex-A55 this resulted in a 28.30% reduction in CPU and wall time for the binary search path. Loop body before: ``` .LBB0_2: add w8, w12, #1 cmp w8, w11 b.gt .LBB0_6 // Predictable branch, ends the loop .LBB0_3: add w12, w8, w11 add w12, w12, w12, lsr #31 asr w12, w12, #1 smaddl x0, w12, w10, x9 ldr w13, [x0] cmp w13, w1 b.lo .LBB0_2 // Unpredictable branch here! Will be hit 50/50 in prod b.ls .LBB0_7 // Predictable branch - ends the loop sub w11, w12, #1 cmp w8, w11 b.le .LBB0_3 // Predictable branch - continues the loop ``` Loop body after: ``` .LBB7_1: cmp w9, w11 b.hi .LBB7_4 // Predictable branch - ends the loop add w12, w9, w11 lsr w12, w12, #1 umaddl x0, w12, w8, x10 sub w14, w12, #1 ldr w13, [x0] cmp w13, w1 csel w11, w14, w11, hs csinc w9, w9, w12, hs b.ne .LBB7_1 // Predictable branch - continues the loop ``` PiperOrigin-RevId: 703213921

On a Cortex-A55 this resulted in a 28.30% reduction in CPU and wall time for the binary search path. Loop body before: ``` .LBB0_2: add w8, w12, #1 cmp w8, w11 b.gt .LBB0_6 // Predictable branch, ends the loop .LBB0_3: add w12, w8, w11 add w12, w12, w12, lsr #31 asr w12, w12, #1 smaddl x0, w12, w10, x9 ldr w13, [x0] cmp w13, w1 b.lo .LBB0_2 // Unpredictable branch here! Will be hit 50/50 in prod b.ls .LBB0_7 // Predictable branch - ends the loop sub w11, w12, #1 cmp w8, w11 b.le .LBB0_3 // Predictable branch - continues the loop ``` Loop body after: ``` .LBB7_1: cmp w9, w11 b.hi .LBB7_4 // Predictable branch - ends the loop add w12, w9, w11 lsr w12, w12, #1 umaddl x0, w12, w8, x10 sub w14, w12, #1 ldr w13, [x0] cmp w13, w1 csel w11, w14, w11, hs csinc w9, w9, w12, hs b.ne .LBB7_1 // Predictable branch - continues the loop ``` PiperOrigin-RevId: 703214356

There is no need to keep these inline as they are not specialized to the function. We also don't need branch prediction slots for them as the `ret` will always be correctly predicted, and the "end of buffer" branch is rarely taken. With these changes, the functions to parse fixed fields are about as short and optimal as they could be: <details> <summary>x86-64 Assembly</summary> ``` 0000000000000000 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte>: 0: 45 84 c9 test r9b, r9b 3: 0f 85 00 00 00 00 jne 0x9 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x9> 0000000000000005: R_X86_64_PLT32 _upb_FastDecoder_DecodeGeneric-0x4 9: 4c 89 c8 mov rax, r9 c: 48 c1 e8 30 shr rax, 0x30 10: 45 89 ca mov r10d, r9d 13: 41 c1 ea 18 shr r10d, 0x18 17: 4d 0f ab d0 bts r8, r10 1b: 44 8b 56 01 mov r10d, dword ptr [rsi + 0x1] 1f: 44 89 14 02 mov dword ptr [rdx + rax], r10d 23: 48 83 c6 05 add rsi, 0x5 27: 48 3b 77 08 cmp rsi, qword ptr [rdi + 0x8] 2b: 0f 83 00 00 00 00 jae 0x31 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x31> 000000000000002d: R_X86_64_PLT32 upb_DecodeFast_MessageIsDoneFallback-0x4 31: 0f b7 06 movzx eax, word ptr [rsi] 34: 49 89 c9 mov r9, rcx 37: 49 c1 f9 08 sar r9, 0x8 3b: 41 89 c2 mov r10d, eax 3e: 41 21 ca and r10d, ecx 41: 41 81 e2 f8 00 00 00 and r10d, 0xf8 48: 4f 8b 5c 51 20 mov r11, qword ptr [r9 + 2*r10 + 0x20] 4d: 4f 8b 4c 51 18 mov r9, qword ptr [r9 + 2*r10 + 0x18] 52: 49 31 c1 xor r9, rax 55: 41 ff e3 jmp r11 ``` </details> <details> <summary>ARM64 Assembly</summary> ``` 0000000000000000 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte>: 0: f2401cbf tst x5, #0xff 4: 54000040 b.eq 0xc <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0xc> 8: 14000000 b 0x8 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x8> 0000000000000008: R_AARCH64_JUMP26 _upb_FastDecoder_DecodeGeneric c: d370fca8 lsr x8, x5, #48 10: b840102 ldur w9, [x1, #0x1] 14: 5280002a mov w10, #0x1 // =1 18: 91001421 add x1, x1, #0x5 1c: b8286849 str w9, [x2, x8] 20: d358fca8 lsr x8, x5, #24 24: f9400409 ldr x9, [x0, #0x8] 28: 9ac82148 lsl x8, x10, x8 2c: eb01013f cmp x9, x1 30: 54000149 b.ls 0x58 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x58> 34: 79400029 ldrh w9, [x1] 38: 9348fc6a asr x10, x3, #8 3c: 12001c6b and w11, w3, #0xff 40: aa040104 orr x4, x8, x4 44: 8a09016b and x11, x11, x9 48: 8b0b054a add x10, x10, x11, lsl #1 4c: a941994b ldp x11, x6, [x10, #0x18] 50: ca090165 eor x5, x11, x9 54: d61f00c0 br x6 58: aa040104 orr x4, x8, x4 5c: 14000000 b 0x5c <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x5c> 000000000000005c: R_AARCH64_JUMP26 upb_DecodeFast_MessageIsDoneFallback ``` </details> PiperOrigin-RevId: 765574494

There is no need to keep these inline as they are not specialized to the function. We also don't need branch prediction slots for them as the `ret` will always be correctly predicted, and the "end of buffer" branch is rarely taken. With these changes, the functions to parse fixed fields are about as short and optimal as they could be: <details> <summary>x86-64 Assembly</summary> ``` 0000000000000000 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte>: 0: 45 84 c9 test r9b, r9b 3: 0f 85 00 00 00 00 jne 0x9 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x9> 0000000000000005: R_X86_64_PLT32 _upb_FastDecoder_DecodeGeneric-0x4 9: 4c 89 c8 mov rax, r9 c: 48 c1 e8 30 shr rax, 0x30 10: 45 89 ca mov r10d, r9d 13: 41 c1 ea 18 shr r10d, 0x18 17: 4d 0f ab d0 bts r8, r10 1b: 44 8b 56 01 mov r10d, dword ptr [rsi + 0x1] 1f: 44 89 14 02 mov dword ptr [rdx + rax], r10d 23: 48 83 c6 05 add rsi, 0x5 27: 48 3b 77 08 cmp rsi, qword ptr [rdi + 0x8] 2b: 0f 83 00 00 00 00 jae 0x31 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x31> 000000000000002d: R_X86_64_PLT32 upb_DecodeFast_MessageIsDoneFallback-0x4 31: 0f b7 06 movzx eax, word ptr [rsi] 34: 49 89 c9 mov r9, rcx 37: 49 c1 f9 08 sar r9, 0x8 3b: 41 89 c2 mov r10d, eax 3e: 41 21 ca and r10d, ecx 41: 41 81 e2 f8 00 00 00 and r10d, 0xf8 48: 4f 8b 5c 51 20 mov r11, qword ptr [r9 + 2*r10 + 0x20] 4d: 4f 8b 4c 51 18 mov r9, qword ptr [r9 + 2*r10 + 0x18] 52: 49 31 c1 xor r9, rax 55: 41 ff e3 jmp r11 ``` </details> <details> <summary>ARM64 Assembly</summary> ``` 0000000000000000 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte>: 0: f2401cbf tst x5, #0xff 4: 54000040 b.eq 0xc <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0xc> 8: 14000000 b 0x8 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x8> 0000000000000008: R_AARCH64_JUMP26 _upb_FastDecoder_DecodeGeneric c: d370fca8 lsr x8, x5, #48 10: b840102 ldur w9, [x1, #0x1] 14: 5280002a mov w10, #0x1 // =1 18: 91001421 add x1, x1, #0x5 1c: b8286849 str w9, [x2, x8] 20: d358fca8 lsr x8, x5, #24 24: f9400409 ldr x9, [x0, #0x8] 28: 9ac82148 lsl x8, x10, x8 2c: eb01013f cmp x9, x1 30: 54000149 b.ls 0x58 <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x58> 34: 79400029 ldrh w9, [x1] 38: 9348fc6a asr x10, x3, #8 3c: 12001c6b and w11, w3, #0xff 40: aa040104 orr x4, x8, x4 44: 8a09016b and x11, x11, x9 48: 8b0b054a add x10, x10, x11, lsl #1 4c: a941994b ldp x11, x6, [x10, #0x18] 50: ca090165 eor x5, x11, x9 54: d61f00c0 br x6 58: aa040104 orr x4, x8, x4 5c: 14000000 b 0x5c <upb_DecodeFast_Fixed32_Scalar_Tag1Byte+0x5c> 000000000000005c: R_AARCH64_JUMP26 upb_DecodeFast_MessageIsDoneFallback ``` </details> PiperOrigin-RevId: 765632464

Added const qualifier to iterator to enable compiling with VS2008

b7ec1a9

xfxyjwf added a commit that referenced this pull request Sep 2, 2014

Merge pull request #1 from dhirschfeld/vs2008-fix

6890263

Added const qualifier to iterator to enable compiling with VS2008

xfxyjwf merged commit 6890263 into protocolbuffers:master Sep 2, 2014

dhirschfeld deleted the vs2008-fix branch September 18, 2014 08:40

jspal mentioned this pull request Oct 24, 2014

protobuf-2.6.1 doesn't support Solaris on amd64. #63

Closed

cloudkey mentioned this pull request Feb 4, 2015

FileDescriptorTables *** glibc detected *** double free or corruption (out) #194

Closed

anandolee pushed a commit that referenced this pull request Apr 18, 2015

Merge pull request #1 from jtattermusch/csharp_protogen_rewrite

8394a8d

Rewrite of C# protogen to C++ (initial version)

anandolee added a commit that referenced this pull request May 1, 2015

Merge pull request #1 from google/csharp

8bae6c0

Csharp update

TeBoring pushed a commit that referenced this pull request Jun 2, 2015

Merge pull request #1 from jcanizales/podspec_fix

8cbb4cf

A few corrections to the proposed podspec

stoneStyle added a commit to stoneStyle/protobuf that referenced this pull request Dec 1, 2015

Merge pull request protocolbuffers#1 from google/master

fb82cc8

5.25 merge

haberman added a commit that referenced this pull request Feb 8, 2016

Merge pull request #1 from nicolasnoble/bin-gems

6efe3aa

Few fixes.

deeGraYve mentioned this pull request Feb 26, 2016

brew install failing for v3.0.0-beta-2 #1285

Closed

haberman mentioned this pull request Feb 29, 2016

No way to use custom options in Ruby #1198

Closed

lostindark mentioned this pull request Mar 15, 2016

[feature request] scoped enums with an option #1079

Closed

liujisi pushed a commit that referenced this pull request May 12, 2016

Merge pull request #1 from google/beta-3

e1f588a

Beta 3

ghost mentioned this pull request Sep 29, 2016

node-gyp rebuild #2200

Closed

jasonhe88 mentioned this pull request Nov 12, 2016

PHP package error #2359

Closed

pwtitle mentioned this pull request Dec 21, 2016

class Descriptor does not exists #2527

Closed

yingzong mentioned this pull request Feb 15, 2017

Python cpp_implementation segfaults during test #2724

Closed

gatkinso mentioned this pull request Apr 6, 2017

[C++] Intermittent Segmentation fault Mutex MacOS #2943

Closed

woding mentioned this pull request Jun 5, 2017

PHP package error #3182

Closed

roczpwu mentioned this pull request Jul 21, 2017

protobuf-3.3.2 segment fault: 11 #3402

Closed

FZUPotato mentioned this pull request Aug 21, 2017

coredump under the MIPS64 architecture #3532

Closed

jakiechris mentioned this pull request Nov 20, 2017

[solved, pls close this issue] protobuf crashes on android 4.4.2 on Huawei p7 #3922

Closed

E-HERO mentioned this pull request Dec 3, 2017

proto used by executable file and shared lib crash #3991

Closed

pjebs mentioned this pull request Dec 12, 2017

PHP: PROTOBUF NOT LOADING #4023

Closed

xfxyjwf pushed a commit that referenced this pull request Feb 22, 2018

Merge pull request #1 from abdul-sami/abdul-sami-patch-1

ac021a0

Added instruction for existing ZLIB configuration

kathyvs mentioned this pull request Apr 5, 2018

Add the ability to associate a message with an interface in Java #4481

Closed

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

ebab347

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

b2212c6

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

cf4b3d9

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

4e530ef

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

d696b00

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

0a4eee3

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 15, 2024

Add v2 FieldEntry #1.

7464a80

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

8708327

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

8780107

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

e9b87ca

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

a6f892c

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

f4a47d5

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

1cd89a9

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

ee6afa8

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 16, 2024

Add v2 FieldEntry #1.

c6e3cb3

PiperOrigin-RevId: 661433949

copybara-service bot pushed a commit that referenced this pull request Aug 17, 2024

Add v2 FieldEntry #1.

a6977fe

PiperOrigin-RevId: 663974332

fbucafusco mentioned this pull request Nov 19, 2024

[C++] core dump when ParsePartialFromArray is called #19315

Closed

ryium mentioned this pull request Jun 10, 2025

Iterating a \Google\Protobuf\Internal\Message PHP object segfaults when using the protobuf extension #22173

Open

xuquanwei2019 mentioned this pull request Jun 27, 2025

AddDescriptors is not thread safe, but multi-thread access may occur when the SO is opened through dlopen #22425

Open

osevan mentioned this pull request Jul 13, 2025

libprotobuf.so* not available after bazel build //:protoc //:protobuf #22599

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Added const qualifier to iterator to enable compiling with VS2008 #1

Added const qualifier to iterator to enable compiling with VS2008 #1

Uh oh!

dhirschfeld commented Aug 27, 2014

Uh oh!

xfxyjwf commented Aug 27, 2014

Uh oh!

dhirschfeld commented Sep 1, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Added const qualifier to iterator to enable compiling with VS2008 #1

Added const qualifier to iterator to enable compiling with VS2008 #1

Uh oh!

Conversation

dhirschfeld commented Aug 27, 2014

Uh oh!

xfxyjwf commented Aug 27, 2014

Uh oh!

dhirschfeld commented Sep 1, 2014

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants