From a35fc4fa3c9fddb464551eae4ded534f5c480a8f Mon Sep 17 00:00:00 2001 From: Anton Bannykh Date: Fri, 1 Feb 2019 15:13:26 +0300 Subject: [PATCH] JS: use string table for module names and inline function tags --- .../js/ast/DebugJsAstProtoBuf.java | 262 ++++-------------- js/js.serializer/src/js-ast.proto | 4 +- .../serialization/js/ast/JsAstDeserializer.kt | 4 +- .../serialization/js/ast/JsAstProtoBuf.java | 258 ++++------------- .../serialization/js/ast/JsAstSerializer.kt | 4 +- 5 files changed, 108 insertions(+), 424 deletions(-) diff --git a/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java index 4562d0518a7..2d082f4c88f 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java @@ -831,18 +831,13 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** - * required string external_name = 1; + * required int32 external_name = 1; */ boolean hasExternalName(); /** - * required string external_name = 1; + * required int32 external_name = 1; */ - java.lang.String getExternalName(); - /** - * required string external_name = 1; - */ - org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes(); + int getExternalName(); /** * required int32 internal_name = 2; @@ -918,10 +913,9 @@ public final class DebugJsAstProtoBuf { } break; } - case 10: { - org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes(); + case 8: { bitField0_ |= 0x00000001; - externalName_ = bs; + externalName_ = input.readInt32(); break; } case 16: { @@ -983,45 +977,18 @@ public final class DebugJsAstProtoBuf { private int bitField0_; public static final int EXTERNAL_NAME_FIELD_NUMBER = 1; - private java.lang.Object externalName_; + private int externalName_; /** - * required string external_name = 1; + * required int32 external_name = 1; */ public boolean hasExternalName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public java.lang.String getExternalName() { - java.lang.Object ref = externalName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - externalName_ = s; - } - return s; - } - } - /** - * required string external_name = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes() { - java.lang.Object ref = externalName_; - if (ref instanceof java.lang.String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - externalName_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } + public int getExternalName() { + return externalName_; } public static final int INTERNAL_NAME_FIELD_NUMBER = 2; @@ -1061,7 +1028,7 @@ public final class DebugJsAstProtoBuf { } private void initFields() { - externalName_ = ""; + externalName_ = 0; internalName_ = 0; plainReference_ = org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Expression.getDefaultInstance(); } @@ -1093,7 +1060,7 @@ public final class DebugJsAstProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getExternalNameBytes()); + output.writeInt32(1, externalName_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt32(2, internalName_); @@ -1112,7 +1079,7 @@ public final class DebugJsAstProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBytesSize(1, getExternalNameBytes()); + .computeInt32Size(1, externalName_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -1240,7 +1207,7 @@ public final class DebugJsAstProtoBuf { public Builder clear() { super.clear(); - externalName_ = ""; + externalName_ = 0; bitField0_ = (bitField0_ & ~0x00000001); internalName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -1311,9 +1278,7 @@ public final class DebugJsAstProtoBuf { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.JsImportedModule other) { if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.JsImportedModule.getDefaultInstance()) return this; if (other.hasExternalName()) { - bitField0_ |= 0x00000001; - externalName_ = other.externalName_; - onChanged(); + setExternalName(other.getExternalName()); } if (other.hasInternalName()) { setInternalName(other.getInternalName()); @@ -1362,78 +1327,34 @@ public final class DebugJsAstProtoBuf { } private int bitField0_; - private java.lang.Object externalName_ = ""; + private int externalName_ ; /** - * required string external_name = 1; + * required int32 external_name = 1; */ public boolean hasExternalName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public java.lang.String getExternalName() { - java.lang.Object ref = externalName_; - if (!(ref instanceof java.lang.String)) { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - externalName_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } + public int getExternalName() { + return externalName_; } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes() { - java.lang.Object ref = externalName_; - if (ref instanceof String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - externalName_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - /** - * required string external_name = 1; - */ - public Builder setExternalName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setExternalName(int value) { + bitField0_ |= 0x00000001; externalName_ = value; onChanged(); return this; } /** - * required string external_name = 1; + * required int32 external_name = 1; */ public Builder clearExternalName() { bitField0_ = (bitField0_ & ~0x00000001); - externalName_ = getDefaultInstance().getExternalName(); - onChanged(); - return this; - } - /** - * required string external_name = 1; - */ - public Builder setExternalNameBytes( - org.jetbrains.kotlin.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - externalName_ = value; + externalName_ = 0; onChanged(); return this; } @@ -45140,18 +45061,13 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** - * required string tag = 1; + * required int32 tag = 1; */ boolean hasTag(); /** - * required string tag = 1; + * required int32 tag = 1; */ - java.lang.String getTag(); - /** - * required string tag = 1; - */ - org.jetbrains.kotlin.protobuf.ByteString - getTagBytes(); + int getTag(); /** * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; @@ -45218,10 +45134,9 @@ public final class DebugJsAstProtoBuf { } break; } - case 10: { - org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes(); + case 8: { bitField0_ |= 0x00000001; - tag_ = bs; + tag_ = input.readInt32(); break; } case 18: { @@ -45278,45 +45193,18 @@ public final class DebugJsAstProtoBuf { private int bitField0_; public static final int TAG_FIELD_NUMBER = 1; - private java.lang.Object tag_; + private int tag_; /** - * required string tag = 1; + * required int32 tag = 1; */ public boolean hasTag() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string tag = 1; + * required int32 tag = 1; */ - public java.lang.String getTag() { - java.lang.Object ref = tag_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - tag_ = s; - } - return s; - } - } - /** - * required string tag = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getTagBytes() { - java.lang.Object ref = tag_; - if (ref instanceof java.lang.String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tag_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } + public int getTag() { + return tag_; } public static final int BLOCK_FIELD_NUMBER = 2; @@ -45341,7 +45229,7 @@ public final class DebugJsAstProtoBuf { } private void initFields() { - tag_ = ""; + tag_ = 0; block_ = org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.GlobalBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -45370,7 +45258,7 @@ public final class DebugJsAstProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getTagBytes()); + output.writeInt32(1, tag_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, block_); @@ -45386,7 +45274,7 @@ public final class DebugJsAstProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBytesSize(1, getTagBytes()); + .computeInt32Size(1, tag_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -45510,7 +45398,7 @@ public final class DebugJsAstProtoBuf { public Builder clear() { super.clear(); - tag_ = ""; + tag_ = 0; bitField0_ = (bitField0_ & ~0x00000001); if (blockBuilder_ == null) { block_ = org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.GlobalBlock.getDefaultInstance(); @@ -45575,9 +45463,7 @@ public final class DebugJsAstProtoBuf { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations other) { if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()) return this; if (other.hasTag()) { - bitField0_ |= 0x00000001; - tag_ = other.tag_; - onChanged(); + setTag(other.getTag()); } if (other.hasBlock()) { mergeBlock(other.getBlock()); @@ -45621,78 +45507,34 @@ public final class DebugJsAstProtoBuf { } private int bitField0_; - private java.lang.Object tag_ = ""; + private int tag_ ; /** - * required string tag = 1; + * required int32 tag = 1; */ public boolean hasTag() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string tag = 1; + * required int32 tag = 1; */ - public java.lang.String getTag() { - java.lang.Object ref = tag_; - if (!(ref instanceof java.lang.String)) { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - tag_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } + public int getTag() { + return tag_; } /** - * required string tag = 1; + * required int32 tag = 1; */ - public org.jetbrains.kotlin.protobuf.ByteString - getTagBytes() { - java.lang.Object ref = tag_; - if (ref instanceof String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tag_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - /** - * required string tag = 1; - */ - public Builder setTag( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setTag(int value) { + bitField0_ |= 0x00000001; tag_ = value; onChanged(); return this; } /** - * required string tag = 1; + * required int32 tag = 1; */ public Builder clearTag() { bitField0_ = (bitField0_ & ~0x00000001); - tag_ = getDefaultInstance().getTag(); - onChanged(); - return this; - } - /** - * required string tag = 1; - */ - public Builder setTagBytes( - org.jetbrains.kotlin.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - tag_ = value; + tag_ = 0; onChanged(); return this; } @@ -53199,7 +53041,7 @@ public final class DebugJsAstProtoBuf { "o\022)org.jetbrains.kotlin.serialization.js" + ".ast\"0\n\010Location\022\021\n\tstartLine\030\001 \002(\005\022\021\n\ts" + "tartChar\030\002 \002(\005\"\220\001\n\020JsImportedModule\022\025\n\re" + - "xternal_name\030\001 \002(\t\022\025\n\rinternal_name\030\002 \002(" + + "xternal_name\030\001 \002(\005\022\025\n\rinternal_name\030\002 \002(" + "\005\022N\n\017plain_reference\030\003 \001(\01325.org.jetbrai" + "ns.kotlin.serialization.js.ast.Expressio" + "n\"\203\016\n\nExpression\022\016\n\006fileId\030\001 \001(\005\022E\n\010loca" + @@ -53465,7 +53307,7 @@ public final class DebugJsAstProtoBuf { "tatement\022g\n\032inlined_local_declarations\030\r" + " \003(\0132C.org.jetbrains.kotlin.serializatio" + "n.js.ast.InlinedLocalDeclarations\"n\n\030Inl", - "inedLocalDeclarations\022\013\n\003tag\030\001 \002(\t\022E\n\005bl" + + "inedLocalDeclarations\022\013\n\003tag\030\001 \002(\005\022E\n\005bl" + "ock\030\002 \002(\01326.org.jetbrains.kotlin.seriali" + "zation.js.ast.GlobalBlock\"\224\001\n\016ImportedMo" + "dule\022\030\n\020external_name_id\030\001 \002(\005\022\030\n\020intern" + diff --git a/js/js.serializer/src/js-ast.proto b/js/js.serializer/src/js-ast.proto index 82537f455ae..8a071d133ad 100644 --- a/js/js.serializer/src/js-ast.proto +++ b/js/js.serializer/src/js-ast.proto @@ -32,7 +32,7 @@ enum SideEffects { } message JsImportedModule { - required string external_name = 1; + required int32 external_name = 1; required int32 internal_name = 2; optional Expression plain_reference = 3; } @@ -398,7 +398,7 @@ message Fragment { } message InlinedLocalDeclarations { - required string tag = 1; + required int32 tag = 1; required GlobalBlock block = 2; } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt index a50df293637..ea535c21ab9 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt @@ -108,7 +108,7 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterablerequired string external_name = 1; + * required int32 external_name = 1; */ boolean hasExternalName(); /** - * required string external_name = 1; + * required int32 external_name = 1; */ - java.lang.String getExternalName(); - /** - * required string external_name = 1; - */ - org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes(); + int getExternalName(); /** * required int32 internal_name = 2; @@ -789,10 +784,9 @@ public final class JsAstProtoBuf { } break; } - case 10: { - org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes(); + case 8: { bitField0_ |= 0x00000001; - externalName_ = bs; + externalName_ = input.readInt32(); break; } case 16: { @@ -848,45 +842,18 @@ public final class JsAstProtoBuf { private int bitField0_; public static final int EXTERNAL_NAME_FIELD_NUMBER = 1; - private java.lang.Object externalName_; + private int externalName_; /** - * required string external_name = 1; + * required int32 external_name = 1; */ public boolean hasExternalName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public java.lang.String getExternalName() { - java.lang.Object ref = externalName_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - externalName_ = s; - } - return s; - } - } - /** - * required string external_name = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes() { - java.lang.Object ref = externalName_; - if (ref instanceof java.lang.String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - externalName_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } + public int getExternalName() { + return externalName_; } public static final int INTERNAL_NAME_FIELD_NUMBER = 2; @@ -920,7 +887,7 @@ public final class JsAstProtoBuf { } private void initFields() { - externalName_ = ""; + externalName_ = 0; internalName_ = 0; plainReference_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Expression.getDefaultInstance(); } @@ -952,7 +919,7 @@ public final class JsAstProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getExternalNameBytes()); + output.writeInt32(1, externalName_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeInt32(2, internalName_); @@ -971,7 +938,7 @@ public final class JsAstProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBytesSize(1, getExternalNameBytes()); + .computeInt32Size(1, externalName_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -1075,7 +1042,7 @@ public final class JsAstProtoBuf { public Builder clear() { super.clear(); - externalName_ = ""; + externalName_ = 0; bitField0_ = (bitField0_ & ~0x00000001); internalName_ = 0; bitField0_ = (bitField0_ & ~0x00000002); @@ -1123,9 +1090,7 @@ public final class JsAstProtoBuf { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.JsImportedModule other) { if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.JsImportedModule.getDefaultInstance()) return this; if (other.hasExternalName()) { - bitField0_ |= 0x00000001; - externalName_ = other.externalName_; - + setExternalName(other.getExternalName()); } if (other.hasInternalName()) { setInternalName(other.getInternalName()); @@ -1175,78 +1140,34 @@ public final class JsAstProtoBuf { } private int bitField0_; - private java.lang.Object externalName_ = ""; + private int externalName_ ; /** - * required string external_name = 1; + * required int32 external_name = 1; */ public boolean hasExternalName() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public java.lang.String getExternalName() { - java.lang.Object ref = externalName_; - if (!(ref instanceof java.lang.String)) { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - externalName_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } + public int getExternalName() { + return externalName_; } /** - * required string external_name = 1; + * required int32 external_name = 1; */ - public org.jetbrains.kotlin.protobuf.ByteString - getExternalNameBytes() { - java.lang.Object ref = externalName_; - if (ref instanceof String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - externalName_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - /** - * required string external_name = 1; - */ - public Builder setExternalName( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setExternalName(int value) { + bitField0_ |= 0x00000001; externalName_ = value; return this; } /** - * required string external_name = 1; + * required int32 external_name = 1; */ public Builder clearExternalName() { bitField0_ = (bitField0_ & ~0x00000001); - externalName_ = getDefaultInstance().getExternalName(); - - return this; - } - /** - * required string external_name = 1; - */ - public Builder setExternalNameBytes( - org.jetbrains.kotlin.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - externalName_ = value; + externalName_ = 0; return this; } @@ -32926,18 +32847,13 @@ public final class JsAstProtoBuf { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** - * required string tag = 1; + * required int32 tag = 1; */ boolean hasTag(); /** - * required string tag = 1; + * required int32 tag = 1; */ - java.lang.String getTag(); - /** - * required string tag = 1; - */ - org.jetbrains.kotlin.protobuf.ByteString - getTagBytes(); + int getTag(); /** * required .org.jetbrains.kotlin.serialization.js.ast.GlobalBlock block = 2; @@ -32998,10 +32914,9 @@ public final class JsAstProtoBuf { } break; } - case 10: { - org.jetbrains.kotlin.protobuf.ByteString bs = input.readBytes(); + case 8: { bitField0_ |= 0x00000001; - tag_ = bs; + tag_ = input.readInt32(); break; } case 18: { @@ -33052,45 +32967,18 @@ public final class JsAstProtoBuf { private int bitField0_; public static final int TAG_FIELD_NUMBER = 1; - private java.lang.Object tag_; + private int tag_; /** - * required string tag = 1; + * required int32 tag = 1; */ public boolean hasTag() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string tag = 1; + * required int32 tag = 1; */ - public java.lang.String getTag() { - java.lang.Object ref = tag_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - tag_ = s; - } - return s; - } - } - /** - * required string tag = 1; - */ - public org.jetbrains.kotlin.protobuf.ByteString - getTagBytes() { - java.lang.Object ref = tag_; - if (ref instanceof java.lang.String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tag_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } + public int getTag() { + return tag_; } public static final int BLOCK_FIELD_NUMBER = 2; @@ -33109,7 +32997,7 @@ public final class JsAstProtoBuf { } private void initFields() { - tag_ = ""; + tag_ = 0; block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); } private byte memoizedIsInitialized = -1; @@ -33138,7 +33026,7 @@ public final class JsAstProtoBuf { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getTagBytes()); + output.writeInt32(1, tag_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeMessage(2, block_); @@ -33154,7 +33042,7 @@ public final class JsAstProtoBuf { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeBytesSize(1, getTagBytes()); + .computeInt32Size(1, tag_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream @@ -33254,7 +33142,7 @@ public final class JsAstProtoBuf { public Builder clear() { super.clear(); - tag_ = ""; + tag_ = 0; bitField0_ = (bitField0_ & ~0x00000001); block_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000002); @@ -33296,9 +33184,7 @@ public final class JsAstProtoBuf { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations other) { if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()) return this; if (other.hasTag()) { - bitField0_ |= 0x00000001; - tag_ = other.tag_; - + setTag(other.getTag()); } if (other.hasBlock()) { mergeBlock(other.getBlock()); @@ -33343,78 +33229,34 @@ public final class JsAstProtoBuf { } private int bitField0_; - private java.lang.Object tag_ = ""; + private int tag_ ; /** - * required string tag = 1; + * required int32 tag = 1; */ public boolean hasTag() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string tag = 1; + * required int32 tag = 1; */ - public java.lang.String getTag() { - java.lang.Object ref = tag_; - if (!(ref instanceof java.lang.String)) { - org.jetbrains.kotlin.protobuf.ByteString bs = - (org.jetbrains.kotlin.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - tag_ = s; - } - return s; - } else { - return (java.lang.String) ref; - } + public int getTag() { + return tag_; } /** - * required string tag = 1; + * required int32 tag = 1; */ - public org.jetbrains.kotlin.protobuf.ByteString - getTagBytes() { - java.lang.Object ref = tag_; - if (ref instanceof String) { - org.jetbrains.kotlin.protobuf.ByteString b = - org.jetbrains.kotlin.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - tag_ = b; - return b; - } else { - return (org.jetbrains.kotlin.protobuf.ByteString) ref; - } - } - /** - * required string tag = 1; - */ - public Builder setTag( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; + public Builder setTag(int value) { + bitField0_ |= 0x00000001; tag_ = value; return this; } /** - * required string tag = 1; + * required int32 tag = 1; */ public Builder clearTag() { bitField0_ = (bitField0_ & ~0x00000001); - tag_ = getDefaultInstance().getTag(); - - return this; - } - /** - * required string tag = 1; - */ - public Builder setTagBytes( - org.jetbrains.kotlin.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - tag_ = value; + tag_ = 0; return this; } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt index ea7ad570002..ef2d0929e57 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt @@ -117,7 +117,7 @@ class JsAstSerializer(private val jsAstValidator: ((JsProgramFragment, Set val builder = InlinedLocalDeclarations.newBuilder().apply { - setTag(tag) + setTag(serialize(tag)) setBlock(serializeBlock(block)) } @@ -474,7 +474,7 @@ class JsAstSerializer(private val jsAstValidator: ((JsProgramFragment, Set