Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove no-op byte & 0xFF in CodedOutputStream

Browse Source 
https://docs.oracle.com/javase/specs/jls/se10/html/jls-5.html#jls-5.1.3

The JLS guarantees this is the same:

> A narrowing conversion of a signed integer to an integral type T simply discards all but the n lowest order bits, where n is the number of bits used to represent type T. In addition to a possible loss of information about the magnitude of the numeric value, this may cause the sign of the resulting value to differ from the sign of the input value.

In practice, Android's optimising compiler saw that this was unnecessary, and skipped generating 'and' instructions. So this isn't a performance boost, just a cleanup.

PiperOrigin-RevId: 683389646
pull/18536/head
Mark Hansen 4 months ago committed by Copybara-Service
parent 6838392f5a
commit 50c08eea1a
1 changed files with 37 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 74
      java/core/src/main/java/com/google/protobuf/CodedOutputStream.java

74
java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
Unescape View File

@ -1354,7 +1354,7 @@ public abstract class CodedOutputStream extends ByteOutput {
buffer[position++] = (byte) value;
break;
} else {
buffer[position++] = (byte) ((value | 0x80) & 0xFF);
buffer[position++] = (byte) (value | 0x80);
value >>>= 7;
}
}
@ -1368,10 +1368,10 @@ public abstract class CodedOutputStream extends ByteOutput {
public final void writeFixed32NoTag(int value) throws IOException {
int position = this.position; // Perf: hoist field to register to avoid load/stores.
try {
buffer[position] = (byte) (value & 0xFF);
buffer[position + 1] = (byte) ((value >> 8) & 0xFF);
buffer[position + 2] = (byte) ((value >> 16) & 0xFF);
buffer[position + 3] = (byte) ((value >> 24) & 0xFF);
buffer[position] = (byte) value;
buffer[position + 1] = (byte) (value >> 8);
buffer[position + 2] = (byte) (value >> 16);
buffer[position + 3] = (byte) (value >> 24);
} catch (IndexOutOfBoundsException e) {
throw new OutOfSpaceException(position, limit, FIXED32_SIZE, e);
}
@ -1388,7 +1388,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(buffer, position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(buffer, position++, (byte) (((int) value | 0x80) & 0xFF));
UnsafeUtil.putByte(buffer, position++, (byte) ((int) value | 0x80));
value >>>= 7;
}
}
@ -1399,7 +1399,7 @@ public abstract class CodedOutputStream extends ByteOutput {
buffer[position++] = (byte) value;
break;
} else {
buffer[position++] = (byte) (((int) value | 0x80) & 0xFF);
buffer[position++] = (byte) ((int) value | 0x80);
value >>>= 7;
}
}
@ -1414,14 +1414,14 @@ public abstract class CodedOutputStream extends ByteOutput {
public final void writeFixed64NoTag(long value) throws IOException {
int position = this.position; // Perf: hoist field to register to avoid load/stores.
try {
buffer[position] = (byte) ((int) (value) & 0xFF);
buffer[position + 1] = (byte) ((int) (value >> 8) & 0xFF);
buffer[position + 2] = (byte) ((int) (value >> 16) & 0xFF);
buffer[position + 3] = (byte) ((int) (value >> 24) & 0xFF);
buffer[position + 4] = (byte) ((int) (value >> 32) & 0xFF);
buffer[position + 5] = (byte) ((int) (value >> 40) & 0xFF);
buffer[position + 6] = (byte) ((int) (value >> 48) & 0xFF);
buffer[position + 7] = (byte) ((int) (value >> 56) & 0xFF);
buffer[position] = (byte) ((int) value);
buffer[position + 1] = (byte) ((int) (value >> 8));
buffer[position + 2] = (byte) ((int) (value >> 16));
buffer[position + 3] = (byte) ((int) (value >> 24));
buffer[position + 4] = (byte) ((int) (value >> 32));
buffer[position + 5] = (byte) ((int) (value >> 40));
buffer[position + 6] = (byte) ((int) (value >> 48));
buffer[position + 7] = (byte) ((int) (value >> 56));
} catch (IndexOutOfBoundsException e) {
throw new OutOfSpaceException(position, limit, FIXED64_SIZE, e);
}
@ -1715,7 +1715,7 @@ public abstract class CodedOutputStream extends ByteOutput {
buffer.put((byte) value);
return;
} else {
buffer.put((byte) ((value | 0x80) & 0xFF));
buffer.put((byte) (value | 0x80));
value >>>= 7;
}
}
@ -1741,7 +1741,7 @@ public abstract class CodedOutputStream extends ByteOutput {
buffer.put((byte) value);
return;
} else {
buffer.put((byte) (((int) value | 0x80) & 0xFF));
buffer.put((byte) ((int) value | 0x80));
value >>>= 7;
}
}
@ -2046,7 +2046,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(position++, (byte) ((value | 0x80) & 0xFF));
UnsafeUtil.putByte(position++, (byte) (value | 0x80));
value >>>= 7;
}
}
@ -2060,7 +2060,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(position++, (byte) ((value | 0x80) & 0xFF));
UnsafeUtil.putByte(position++, (byte) (value | 0x80));
value >>>= 7;
}
}
@ -2088,7 +2088,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(position++, (byte) (((int) value | 0x80) & 0xFF));
UnsafeUtil.putByte(position++, (byte) ((int) value | 0x80));
value >>>= 7;
}
}
@ -2101,7 +2101,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(position++, (byte) (((int) value | 0x80) & 0xFF));
UnsafeUtil.putByte(position++, (byte) ((int) value | 0x80));
value >>>= 7;
}
}
@ -2306,7 +2306,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(buffer, position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(buffer, position++, (byte) ((value | 0x80) & 0xFF));
UnsafeUtil.putByte(buffer, position++, (byte) (value | 0x80));
value >>>= 7;
}
}
@ -2319,7 +2319,7 @@ public abstract class CodedOutputStream extends ByteOutput {
totalBytesWritten++;
return;
} else {
buffer[position++] = (byte) ((value | 0x80) & 0xFF);
buffer[position++] = (byte) (value | 0x80);
totalBytesWritten++;
value >>>= 7;
}
@ -2339,7 +2339,7 @@ public abstract class CodedOutputStream extends ByteOutput {
UnsafeUtil.putByte(buffer, position++, (byte) value);
break;
} else {
UnsafeUtil.putByte(buffer, position++, (byte) (((int) value | 0x80) & 0xFF));
UnsafeUtil.putByte(buffer, position++, (byte) ((int) value | 0x80));
value >>>= 7;
}
}
@ -2352,7 +2352,7 @@ public abstract class CodedOutputStream extends ByteOutput {
totalBytesWritten++;
return;
} else {
buffer[position++] = (byte) (((int) value | 0x80) & 0xFF);
buffer[position++] = (byte) ((int) value | 0x80);
totalBytesWritten++;
value >>>= 7;
}
@ -2366,10 +2366,10 @@ public abstract class CodedOutputStream extends ByteOutput {
*/
final void bufferFixed32NoTag(int value) {
int position = this.position; // Perf: hoist field to register to avoid load/stores.
buffer[position++] = (byte) (value & 0xFF);
buffer[position++] = (byte) ((value >> 8) & 0xFF);
buffer[position++] = (byte) ((value >> 16) & 0xFF);
buffer[position++] = (byte) ((value >> 24) & 0xFF);
buffer[position++] = (byte) value;
buffer[position++] = (byte) (value >> 8);
buffer[position++] = (byte) (value >> 16);
buffer[position++] = (byte) (value >> 24);
this.position = position;
totalBytesWritten += FIXED32_SIZE;
}
@ -2380,14 +2380,14 @@ public abstract class CodedOutputStream extends ByteOutput {
*/
final void bufferFixed64NoTag(long value) {
int position = this.position; // Perf: hoist field to register to avoid load/stores.
buffer[position++] = (byte) (value & 0xFF);
buffer[position++] = (byte) ((value >> 8) & 0xFF);
buffer[position++] = (byte) ((value >> 16) & 0xFF);
buffer[position++] = (byte) ((value >> 24) & 0xFF);
buffer[position++] = (byte) ((int) (value >> 32) & 0xFF);
buffer[position++] = (byte) ((int) (value >> 40) & 0xFF);
buffer[position++] = (byte) ((int) (value >> 48) & 0xFF);
buffer[position++] = (byte) ((int) (value >> 56) & 0xFF);
buffer[position++] = (byte) value;
buffer[position++] = (byte) (value >> 8);
buffer[position++] = (byte) (value >> 16);
buffer[position++] = (byte) (value >> 24);
buffer[position++] = (byte) ((int) (value >> 32));
buffer[position++] = (byte) ((int) (value >> 40));
buffer[position++] = (byte) ((int) (value >> 48));
buffer[position++] = (byte) ((int) (value >> 56));
this.position = position;
totalBytesWritten += FIXED64_SIZE;
}

Write Preview
Loading…
Cancel
Save