Skip to content

Commit eaefd45

Browse files
authored
Merge pull request #14591 from tanishiking/update-generated-semanticdb-code
Update generated semanticdb code with the latest scalapb
2 parents 84f7250 + 6533141 commit eaefd45

18 files changed

+504
-449
lines changed

compiler/src/dotty/tools/dotc/semanticdb/Access.scala renamed to compiler/src/dotty/tools/dotc/semanticdb/generated/Access.scala

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ final case class AccessMessage(
5050
sealedValue: dotty.tools.dotc.semanticdb.AccessMessage.SealedValue = dotty.tools.dotc.semanticdb.AccessMessage.SealedValue.Empty
5151
) extends SemanticdbGeneratedMessage derives CanEqual {
5252
@transient @sharable
53-
private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
54-
private[this] def __computeSerializedValue(): _root_.scala.Int = {
53+
private[this] var __serializedSizeMemoized: _root_.scala.Int = 0
54+
private[this] def __computeSerializedSize(): _root_.scala.Int = {
5555
var __size = 0
5656
if (sealedValue.privateAccess.isDefined) {
5757
val __value = sealedValue.privateAccess.get
@@ -84,12 +84,13 @@ final case class AccessMessage(
8484
__size
8585
}
8686
override def serializedSize: _root_.scala.Int = {
87-
var read = __serializedSizeCachedValue
88-
if (read == 0) {
89-
read = __computeSerializedValue()
90-
__serializedSizeCachedValue = read
87+
var __size = __serializedSizeMemoized
88+
if (__size == 0) {
89+
__size = __computeSerializedSize() + 1
90+
__serializedSizeMemoized = __size
9191
}
92-
read
92+
__size - 1
93+
9394
}
9495
def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
9596
sealedValue.privateAccess.foreach { __v =>
@@ -378,8 +379,8 @@ final case class PrivateWithinAccess(
378379
symbol: _root_.scala.Predef.String = ""
379380
) extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage derives CanEqual {
380381
@transient @sharable
381-
private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
382-
private[this] def __computeSerializedValue(): _root_.scala.Int = {
382+
private[this] var __serializedSizeMemoized: _root_.scala.Int = 0
383+
private[this] def __computeSerializedSize(): _root_.scala.Int = {
383384
var __size = 0
384385

385386
{
@@ -391,12 +392,13 @@ final case class PrivateWithinAccess(
391392
__size
392393
}
393394
override def serializedSize: _root_.scala.Int = {
394-
var read = __serializedSizeCachedValue
395-
if (read == 0) {
396-
read = __computeSerializedValue()
397-
__serializedSizeCachedValue = read
395+
var __size = __serializedSizeMemoized
396+
if (__size == 0) {
397+
__size = __computeSerializedSize() + 1
398+
__serializedSizeMemoized = __size
398399
}
399-
read
400+
__size - 1
401+
400402
}
401403
def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
402404
{
@@ -537,8 +539,8 @@ final case class ProtectedWithinAccess(
537539
symbol: _root_.scala.Predef.String = ""
538540
) extends dotty.tools.dotc.semanticdb.Access.NonEmpty with SemanticdbGeneratedMessage derives CanEqual {
539541
@transient @sharable
540-
private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
541-
private[this] def __computeSerializedValue(): _root_.scala.Int = {
542+
private[this] var __serializedSizeMemoized: _root_.scala.Int = 0
543+
private[this] def __computeSerializedSize(): _root_.scala.Int = {
542544
var __size = 0
543545

544546
{
@@ -550,12 +552,13 @@ final case class ProtectedWithinAccess(
550552
__size
551553
}
552554
override def serializedSize: _root_.scala.Int = {
553-
var read = __serializedSizeCachedValue
554-
if (read == 0) {
555-
read = __computeSerializedValue()
556-
__serializedSizeCachedValue = read
555+
var __size = __serializedSizeMemoized
556+
if (__size == 0) {
557+
__size = __computeSerializedSize() + 1
558+
__serializedSizeMemoized = __size
557559
}
558-
read
560+
__size - 1
561+
559562
}
560563
def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
561564
{

compiler/src/dotty/tools/dotc/semanticdb/Annotation.scala renamed to compiler/src/dotty/tools/dotc/semanticdb/generated/Annotation.scala

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,31 @@ final case class Annotation(
1313
tpe: dotty.tools.dotc.semanticdb.Type = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toCustom(dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance)
1414
) extends SemanticdbGeneratedMessage derives CanEqual {
1515
@transient @sharable
16-
private[this] var __serializedSizeCachedValue: _root_.scala.Int = 0
17-
private[this] def __computeSerializedValue(): _root_.scala.Int = {
16+
private[this] var __serializedSizeMemoized: _root_.scala.Int = 0
17+
private[this] def __computeSerializedSize(): _root_.scala.Int = {
1818
var __size = 0
1919

2020
{
2121
val __value = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toBase(tpe)
22-
if (__value != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
22+
if (__value.serializedSize != 0) {
2323
__size += 1 + SemanticdbOutputStream.computeUInt32SizeNoTag(__value.serializedSize) + __value.serializedSize
2424
}
2525
};
2626
__size
2727
}
2828
override def serializedSize: _root_.scala.Int = {
29-
var read = __serializedSizeCachedValue
30-
if (read == 0) {
31-
read = __computeSerializedValue()
32-
__serializedSizeCachedValue = read
29+
var __size = __serializedSizeMemoized
30+
if (__size == 0) {
31+
__size = __computeSerializedSize() + 1
32+
__serializedSizeMemoized = __size
3333
}
34-
read
34+
__size - 1
35+
3536
}
3637
def writeTo(`_output__`: SemanticdbOutputStream): _root_.scala.Unit = {
3738
{
3839
val __v = dotty.tools.dotc.semanticdb.Annotation._typemapper_tpe.toBase(tpe)
39-
if (__v != dotty.tools.dotc.semanticdb.TypeMessage.defaultInstance) {
40+
if (__v.serializedSize != 0) {
4041
_output__.writeTag(1, 2)
4142
_output__.writeUInt32NoTag(__v.serializedSize)
4243
__v.writeTo(_output__)

0 commit comments

Comments
 (0)