azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JS: (review fix) Header -> InlineData

Browse Source
This commit is contained in:
Anton Bannykh
2019-02-11 21:28:50 +03:00
parent 0fa87e3baa
commit 4b39e2df12
16 changed files with 157 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/src/org/jetbrains/kotlin/incremental/IncrementalJsCache.kt
+11 -11
View File
@@ -72,7 +72,7 @@ open class IncrementalJsCache(cachesDir: File) : AbstractIncrementalCache<FqName
for ((srcFile, data) in translatedFiles) { for ((srcFile, data) in translatedFiles) {
dirtySources.remove(srcFile) dirtySources.remove(srcFile)
val (binaryMetadata, binaryAst, header) = data val (binaryMetadata, binaryAst, inlineData) = data
val oldProtoMap = translationResults[srcFile]?.metadata?.let { getProtoData(srcFile, it) } ?: emptyMap() val oldProtoMap = translationResults[srcFile]?.metadata?.let { getProtoData(srcFile, it) } ?: emptyMap()
val newProtoMap = getProtoData(srcFile, binaryMetadata) val newProtoMap = getProtoData(srcFile, binaryMetadata)
@@ -89,7 +89,7 @@ open class IncrementalJsCache(cachesDir: File) : AbstractIncrementalCache<FqName
changesCollector.collectProtoChanges(oldProtoMap[classId], newProtoMap[classId]) changesCollector.collectProtoChanges(oldProtoMap[classId], newProtoMap[classId])
} }
translationResults.put(srcFile, binaryMetadata, binaryAst, header) translationResults.put(srcFile, binaryMetadata, binaryAst, inlineData)
} }
for ((srcFile, inlineDeclarations) in incrementalResults.inlineFunctions) { for ((srcFile, inlineDeclarations) in incrementalResults.inlineFunctions) {
@@ -131,8 +131,8 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation
output.writeInt(value.binaryAst.size) output.writeInt(value.binaryAst.size)
output.write(value.binaryAst) output.write(value.binaryAst)
output.writeInt(value.header.size) output.writeInt(value.inlineData.size)
output.write(value.header) output.write(value.inlineData)
} }
override fun read(input: DataInput): TranslationResultValue { override fun read(input: DataInput): TranslationResultValue {
@@ -144,20 +144,20 @@ private object TranslationResultValueExternalizer : DataExternalizer<Translation
val binaryAst = ByteArray(binaryAstSize) val binaryAst = ByteArray(binaryAstSize)
input.readFully(binaryAst) input.readFully(binaryAst)
val headerSize = input.readInt() val inlineDataSize = input.readInt()
val header = ByteArray(headerSize) val inlineData = ByteArray(inlineDataSize)
input.readFully(header) input.readFully(inlineData)
return TranslationResultValue(metadata = metadata, binaryAst = binaryAst, header = header) return TranslationResultValue(metadata = metadata, binaryAst = binaryAst, inlineData = inlineData)
} }
} }
private class TranslationResultMap(storageFile: File) : BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) { private class TranslationResultMap(storageFile: File) : BasicStringMap<TranslationResultValue>(storageFile, TranslationResultValueExternalizer) {
override fun dumpValue(value: TranslationResultValue): String = override fun dumpValue(value: TranslationResultValue): String =
"Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}, Header: ${value.header.md5()}" "Metadata: ${value.metadata.md5()}, Binary AST: ${value.binaryAst.md5()}, InlineData: ${value.inlineData.md5()}"
fun put(file: File, newMetadata: ByteArray, newBinaryAst: ByteArray, newHeader: ByteArray) { fun put(file: File, newMetadata: ByteArray, newBinaryAst: ByteArray, newInlineData: ByteArray) {
storage[file.canonicalPath] = TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst, header = newHeader) storage[file.canonicalPath] = TranslationResultValue(metadata = newMetadata, binaryAst = newBinaryAst, inlineData = newInlineData)
} }
operator fun get(file: File): TranslationResultValue? = operator fun get(file: File): TranslationResultValue? =
build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java
+72 -72
View File
@@ -52234,8 +52234,8 @@ public final class DebugJsAstProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Chunk) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Chunk)
} }
public interface HeaderOrBuilder extends public interface InlineDataOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlineData)
org.jetbrains.kotlin.protobuf.MessageOrBuilder { org.jetbrains.kotlin.protobuf.MessageOrBuilder {
/** /**
@@ -52258,25 +52258,25 @@ public final class DebugJsAstProtoBuf {
getInlineFunctionTagsBytes(int index); getInlineFunctionTagsBytes(int index);
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Header} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlineData}
*/ */
public static final class Header extends public static final class InlineData extends
org.jetbrains.kotlin.protobuf.GeneratedMessage implements org.jetbrains.kotlin.protobuf.GeneratedMessage implements
// @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlineData)
HeaderOrBuilder { InlineDataOrBuilder {
// Use Header.newBuilder() to construct. // Use InlineData.newBuilder() to construct.
private Header(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) { private InlineData(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields(); this.unknownFields = builder.getUnknownFields();
} }
private Header(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); } private InlineData(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); }
private static final Header defaultInstance; private static final InlineData defaultInstance;
public static Header getDefaultInstance() { public static InlineData getDefaultInstance() {
return defaultInstance; return defaultInstance;
} }
public Header getDefaultInstanceForType() { public InlineData getDefaultInstanceForType() {
return defaultInstance; return defaultInstance;
} }
@@ -52286,7 +52286,7 @@ public final class DebugJsAstProtoBuf {
getUnknownFields() { getUnknownFields() {
return this.unknownFields; return this.unknownFields;
} }
private Header( private InlineData(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -52335,28 +52335,28 @@ public final class DebugJsAstProtoBuf {
} }
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor; return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor;
} }
protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() { internalGetFieldAccessorTable() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_fieldAccessorTable return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_fieldAccessorTable
.ensureFieldAccessorsInitialized( .ensureFieldAccessorsInitialized(
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.Builder.class); org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.Builder.class);
} }
public static org.jetbrains.kotlin.protobuf.Parser<Header> PARSER = public static org.jetbrains.kotlin.protobuf.Parser<InlineData> PARSER =
new org.jetbrains.kotlin.protobuf.AbstractParser<Header>() { new org.jetbrains.kotlin.protobuf.AbstractParser<InlineData>() {
public Header parsePartialFrom( public InlineData parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return new Header(input, extensionRegistry); return new InlineData(input, extensionRegistry);
} }
}; };
@java.lang.Override @java.lang.Override
public org.jetbrains.kotlin.protobuf.Parser<Header> getParserForType() { public org.jetbrains.kotlin.protobuf.Parser<InlineData> getParserForType() {
return PARSER; return PARSER;
} }
@@ -52438,53 +52438,53 @@ public final class DebugJsAstProtoBuf {
return super.writeReplace(); return super.writeReplace();
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data) org.jetbrains.kotlin.protobuf.ByteString data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data); return PARSER.parseFrom(data);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ByteString data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry); return PARSER.parseFrom(data, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom(byte[] data) public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data); return PARSER.parseFrom(data);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
byte[] data, byte[] data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry); return PARSER.parseFrom(data, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom(java.io.InputStream input) public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(java.io.InputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input); return PARSER.parseFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
java.io.InputStream input, java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry); return PARSER.parseFrom(input, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseDelimitedFrom(java.io.InputStream input) public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseDelimitedFrom(input); return PARSER.parseDelimitedFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseDelimitedFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseDelimitedFrom(
java.io.InputStream input, java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry); return PARSER.parseDelimitedFrom(input, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input) org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input); return PARSER.parseFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
@@ -52493,7 +52493,7 @@ public final class DebugJsAstProtoBuf {
public static Builder newBuilder() { return Builder.create(); } public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); } public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header prototype) { public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData prototype) {
return newBuilder().mergeFrom(prototype); return newBuilder().mergeFrom(prototype);
} }
public Builder toBuilder() { return newBuilder(this); } public Builder toBuilder() { return newBuilder(this); }
@@ -52505,25 +52505,25 @@ public final class DebugJsAstProtoBuf {
return builder; return builder;
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Header} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlineData}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder<Builder> implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlineData)
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.HeaderOrBuilder { org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineDataOrBuilder {
public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptor() { getDescriptor() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor; return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor;
} }
protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() { internalGetFieldAccessorTable() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_fieldAccessorTable return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_fieldAccessorTable
.ensureFieldAccessorsInitialized( .ensureFieldAccessorsInitialized(
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.Builder.class); org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.Builder.class);
} }
// Construct using org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.newBuilder() // Construct using org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
} }
@@ -52554,23 +52554,23 @@ public final class DebugJsAstProtoBuf {
public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
getDescriptorForType() { getDescriptorForType() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor; return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor;
} }
public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header getDefaultInstanceForType() { public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData getDefaultInstanceForType() {
return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.getDefaultInstance(); return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.getDefaultInstance();
} }
public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header build() { public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData build() {
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header result = buildPartial(); org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData result = buildPartial();
if (!result.isInitialized()) { if (!result.isInitialized()) {
throw newUninitializedMessageException(result); throw newUninitializedMessageException(result);
} }
return result; return result;
} }
public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header buildPartial() { public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData buildPartial() {
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header result = new org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header(this); org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData result = new org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData(this);
int from_bitField0_ = bitField0_; int from_bitField0_ = bitField0_;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
inlineFunctionTags_ = inlineFunctionTags_.getUnmodifiableView(); inlineFunctionTags_ = inlineFunctionTags_.getUnmodifiableView();
@@ -52582,16 +52582,16 @@ public final class DebugJsAstProtoBuf {
} }
public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) {
if (other instanceof org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header) { if (other instanceof org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData) {
return mergeFrom((org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header)other); return mergeFrom((org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData)other);
} else { } else {
super.mergeFrom(other); super.mergeFrom(other);
return this; return this;
} }
} }
public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header other) { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData other) {
if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData.getDefaultInstance()) return this;
if (!other.inlineFunctionTags_.isEmpty()) { if (!other.inlineFunctionTags_.isEmpty()) {
if (inlineFunctionTags_.isEmpty()) { if (inlineFunctionTags_.isEmpty()) {
inlineFunctionTags_ = other.inlineFunctionTags_; inlineFunctionTags_ = other.inlineFunctionTags_;
@@ -52614,11 +52614,11 @@ public final class DebugJsAstProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header parsedMessage = null; org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData parsedMessage = null;
try { try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Header) e.getUnfinishedMessage(); parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlineData) e.getUnfinishedMessage();
throw e; throw e;
} finally { } finally {
if (parsedMessage != null) { if (parsedMessage != null) {
@@ -52722,15 +52722,15 @@ public final class DebugJsAstProtoBuf {
return this; return this;
} }
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlineData)
} }
static { static {
defaultInstance = new Header(true); defaultInstance = new InlineData(true);
defaultInstance.initFields(); defaultInstance.initFields();
} }
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlineData)
} }
private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
@@ -53024,10 +53024,10 @@ public final class DebugJsAstProtoBuf {
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_ast_Chunk_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_js_ast_Chunk_fieldAccessorTable;
private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor
internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor; internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor;
private static private static
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable
internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_fieldAccessorTable; internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_fieldAccessorTable;
public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor public static org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor
getDescriptor() { getDescriptor() {
@@ -53338,18 +53338,18 @@ public final class DebugJsAstProtoBuf {
"ringTable\022H\n\nname_table\030\002 \002(\01324.org.jetb" + "ringTable\022H\n\nname_table\030\002 \002(\01324.org.jetb" +
"rains.kotlin.serialization.js.ast.NameTa", "rains.kotlin.serialization.js.ast.NameTa",
"ble\022E\n\010fragment\030\003 \002(\01323.org.jetbrains.ko" + "ble\022E\n\010fragment\030\003 \002(\01323.org.jetbrains.ko" +
"tlin.serialization.js.ast.Fragment\"&\n\006He" + "tlin.serialization.js.ast.Fragment\"*\n\nIn" +
"ader\022\034\n\024inline_function_tags\030\001 \003(\t*@\n\013Si" + "lineData\022\034\n\024inline_function_tags\030\001 \003(\t*@" +
"deEffects\022\021\n\rAFFECTS_STATE\020\001\022\024\n\020DEPENDS_" + "\n\013SideEffects\022\021\n\rAFFECTS_STATE\020\001\022\024\n\020DEPE" +
"ON_STATE\020\002\022\010\n\004PURE\020\003*?\n\016InlineStrategy\022\017" + "NDS_ON_STATE\020\002\022\010\n\004PURE\020\003*?\n\016InlineStrate" +
"\n\013AS_FUNCTION\020\000\022\014\n\010IN_PLACE\020\001\022\016\n\nNOT_INL" + "gy\022\017\n\013AS_FUNCTION\020\000\022\014\n\010IN_PLACE\020\001\022\016\n\nNOT" +
"INE\020\002*\327\001\n\017SpecialFunction\022\032\n\026DEFINE_INLI" + "_INLINE\020\002*\327\001\n\017SpecialFunction\022\032\n\026DEFINE_" +
"NE_FUNCTION\020\001\022\021\n\rWRAP_FUNCTION\020\002\022\021\n\rTO_B" + "INLINE_FUNCTION\020\001\022\021\n\rWRAP_FUNCTION\020\002\022\021\n\r" +
"OXED_CHAR\020\003\022\016\n\nUNBOX_CHAR\020\004\022\020\n\014SUSPEND_C" + "TO_BOXED_CHAR\020\003\022\016\n\nUNBOX_CHAR\020\004\022\020\n\014SUSPE" +
"ALL\020\005\022\024\n\020COROUTINE_RESULT\020\006\022\030\n\024COROUTINE", "ND_CALL\020\005\022\024\n\020COROUTINE_RESULT\020\006\022\030\n\024COROU",
"_CONTROLLER\020\007\022\026\n\022COROUTINE_RECEIVER\020\010\022\030\n" + "TINE_CONTROLLER\020\007\022\026\n\022COROUTINE_RECEIVER\020" +
"\024SET_COROUTINE_RESULT\020\tB\024B\022DebugJsAstPro" + "\010\022\030\n\024SET_COROUTINE_RESULT\020\tB\024B\022DebugJsAs" +
"toBuf" "tProtoBuf"
}; };
org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -53711,11 +53711,11 @@ public final class DebugJsAstProtoBuf {
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable( org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_ast_Chunk_descriptor, internal_static_org_jetbrains_kotlin_serialization_js_ast_Chunk_descriptor,
new java.lang.String[] { "StringTable", "NameTable", "Fragment", }); new java.lang.String[] { "StringTable", "NameTable", "Fragment", });
internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor = internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor =
getDescriptor().getMessageTypes().get(58); getDescriptor().getMessageTypes().get(58);
internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_fieldAccessorTable = new internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_fieldAccessorTable = new
org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable( org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_org_jetbrains_kotlin_serialization_js_ast_Header_descriptor, internal_static_org_jetbrains_kotlin_serialization_js_ast_InlineData_descriptor,
new java.lang.String[] { "InlineFunctionTags", }); new java.lang.String[] { "InlineFunctionTags", });
} }
compiler/cli/src/org/jetbrains/kotlin/cli/js/K2JSCompiler.java
+1 -1
View File
@@ -143,7 +143,7 @@ public class K2JSCompiler extends CLICompiler<K2JSCompilerArguments> {
} }
else { else {
TranslationResultValue translatedValue = compiledParts.get(allSources[i]); TranslationResultValue translatedValue = compiledParts.get(allSources[i]);
translationUnits.add(new TranslationUnit.BinaryAst(translatedValue.getBinaryAst(), translatedValue.getHeader())); translationUnits.add(new TranslationUnit.BinaryAst(translatedValue.getBinaryAst(), translatedValue.getInlineData()));
} }
} }
return translator.translateUnits(reporter, translationUnits, mainCallParameters, jsAnalysisResult); return translator.translateUnits(reporter, translationUnits, mainCallParameters, jsAnalysisResult);
compiler/daemon/daemon-client/src/org/jetbrains/kotlin/daemon/client/CompilerCallbackServicesFacadeServer.kt
+3 -3
View File
@@ -125,9 +125,9 @@ open class CompilerCallbackServicesFacadeServer(
sourceFilePath: String, sourceFilePath: String,
packagePartMetadata: ByteArray, packagePartMetadata: ByteArray,
binaryAst: ByteArray, binaryAst: ByteArray,
header: ByteArray inlineData: ByteArray
) { ) {
incrementalResultsConsumer!!.processPackagePart(File(sourceFilePath), packagePartMetadata, binaryAst, header) incrementalResultsConsumer!!.processPackagePart(File(sourceFilePath), packagePartMetadata, binaryAst, inlineData)
} }
override fun incrementalResultsConsumer_processInlineFunctions(functions: Collection<JsInlineFunctionHash>) { override fun incrementalResultsConsumer_processInlineFunctions(functions: Collection<JsInlineFunctionHash>) {
@@ -140,6 +140,6 @@ open class CompilerCallbackServicesFacadeServer(
override fun incrementalDataProvider_getCompiledPackageParts() = override fun incrementalDataProvider_getCompiledPackageParts() =
incrementalDataProvider!!.compiledPackageParts.entries.map { incrementalDataProvider!!.compiledPackageParts.entries.map {
CompiledPackagePart(it.key.path, it.value.metadata, it.value.binaryAst, it.value.header) CompiledPackagePart(it.key.path, it.value.metadata, it.value.binaryAst, it.value.inlineData)
} }
} }
compiler/daemon/daemon-common/src/org/jetbrains/kotlin/daemon/common/CompilerCallbackServicesFacade.kt
+2 -2
View File
@@ -107,7 +107,7 @@ interface CompilerCallbackServicesFacade : Remote {
fun incrementalResultsConsumer_processHeader(headerMetadata: ByteArray) fun incrementalResultsConsumer_processHeader(headerMetadata: ByteArray)
@Throws(RemoteException::class) @Throws(RemoteException::class)
fun incrementalResultsConsumer_processPackagePart(sourceFilePath: String, packagePartMetadata: ByteArray, binaryAst: ByteArray, header: ByteArray) fun incrementalResultsConsumer_processPackagePart(sourceFilePath: String, packagePartMetadata: ByteArray, binaryAst: ByteArray, inlineData: ByteArray)
@Throws(RemoteException::class) @Throws(RemoteException::class)
fun incrementalResultsConsumer_processInlineFunctions(functions: Collection<JsInlineFunctionHash>) fun incrementalResultsConsumer_processInlineFunctions(functions: Collection<JsInlineFunctionHash>)
@@ -126,7 +126,7 @@ interface CompilerCallbackServicesFacade : Remote {
class CompiledPackagePart( class CompiledPackagePart(
val filePath: String, val filePath: String,
val metadata: ByteArray, val binaryAst: ByteArray, val header: ByteArray val metadata: ByteArray, val binaryAst: ByteArray, val inlineData: ByteArray
) : Serializable ) : Serializable
class RmiFriendlyCompilationCanceledException : Exception(), Serializable { class RmiFriendlyCompilationCanceledException : Exception(), Serializable {
compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalDataProvider.kt
+1 -1
View File
@@ -22,7 +22,7 @@ class RemoteIncrementalDataProvider(val facade: CompilerCallbackServicesFacade,
get() = rpcProfiler.withMeasure(this) { get() = rpcProfiler.withMeasure(this) {
val result = mutableMapOf<File, TranslationResultValue>() val result = mutableMapOf<File, TranslationResultValue>()
facade.incrementalDataProvider_getCompiledPackageParts().forEach { facade.incrementalDataProvider_getCompiledPackageParts().forEach {
val prev = result.put(File(it.filePath), TranslationResultValue(it.metadata, it.binaryAst, it.header)) val prev = result.put(File(it.filePath), TranslationResultValue(it.metadata, it.binaryAst, it.inlineData))
check(prev == null) { "compiledPackageParts: duplicated entry for file `${it.filePath}`" } check(prev == null) { "compiledPackageParts: duplicated entry for file `${it.filePath}`" }
} }
result result
compiler/daemon/src/org/jetbrains/kotlin/daemon/RemoteIncrementalResultsConsumer.kt
+2 -2
View File
@@ -24,9 +24,9 @@ class RemoteIncrementalResultsConsumer(val facade: CompilerCallbackServicesFacad
} }
} }
override fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, header: ByteArray) { override fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, inlineData: ByteArray) {
rpcProfiler.withMeasure(this) { rpcProfiler.withMeasure(this) {
facade.incrementalResultsConsumer_processPackagePart(sourceFile.path, packagePartMetadata, binaryAst, header) facade.incrementalResultsConsumer_processPackagePart(sourceFile.path, packagePartMetadata, binaryAst, inlineData)
} }
} }
js/js.frontend/src/org/jetbrains/kotlin/incremental/js/IncrementalResultsConsumer.kt
+3 -3
View File
@@ -25,7 +25,7 @@ interface IncrementalResultsConsumer {
fun processHeader(headerMetadata: ByteArray) fun processHeader(headerMetadata: ByteArray)
/** processes new package part metadata and binary tree for compiled source file */ /** processes new package part metadata and binary tree for compiled source file */
fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, header: ByteArray) fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, inlineData: ByteArray)
/** /**
* [inlineFunction] is expected to be a body of inline function (an instance of [JsNode]), * [inlineFunction] is expected to be a body of inline function (an instance of [JsNode]),
@@ -84,8 +84,8 @@ class IncrementalResultsConsumerImpl : IncrementalResultsConsumer {
this.headerMetadata = headerMetadata this.headerMetadata = headerMetadata
} }
override fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, header: ByteArray) { override fun processPackagePart(sourceFile: File, packagePartMetadata: ByteArray, binaryAst: ByteArray, inlineData: ByteArray) {
_packageParts.put(sourceFile, TranslationResultValue(packagePartMetadata, binaryAst, header)) _packageParts.put(sourceFile, TranslationResultValue(packagePartMetadata, binaryAst, inlineData))
} }
override fun processInlineFunctions(functions: Collection<JsInlineFunctionHash>) { override fun processInlineFunctions(functions: Collection<JsInlineFunctionHash>) {
js/js.frontend/src/org/jetbrains/kotlin/incremental/js/TranslationResultValue.kt
+1 -1
View File
@@ -16,5 +16,5 @@
package org.jetbrains.kotlin.incremental.js package org.jetbrains.kotlin.incremental.js
data class TranslationResultValue(val metadata: ByteArray, val binaryAst: ByteArray, val header: ByteArray) data class TranslationResultValue(val metadata: ByteArray, val binaryAst: ByteArray, val inlineData: ByteArray)
js/js.serializer/src/js-ast.proto
+2 -2
View File
@@ -476,9 +476,9 @@ message Chunk {
required Fragment fragment = 3; required Fragment fragment = 3;
} }
// Header // InlineData
// //
message Header { message InlineData {
repeated string inline_function_tags = 1; repeated string inline_function_tags = 1;
} }
js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstProtoBuf.java
+47 -47
View File
@@ -38776,8 +38776,8 @@ public final class JsAstProtoBuf {
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Chunk) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Chunk)
} }
public interface HeaderOrBuilder extends public interface InlineDataOrBuilder extends
// @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlineData)
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
@@ -38800,30 +38800,30 @@ public final class JsAstProtoBuf {
getInlineFunctionTagsBytes(int index); getInlineFunctionTagsBytes(int index);
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Header} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlineData}
*/ */
public static final class Header extends public static final class InlineData extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements
// @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlineData)
HeaderOrBuilder { InlineDataOrBuilder {
// Use Header.newBuilder() to construct. // Use InlineData.newBuilder() to construct.
private Header(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { private InlineData(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) {
super(builder); super(builder);
this.unknownFields = builder.getUnknownFields(); this.unknownFields = builder.getUnknownFields();
} }
private Header(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} private InlineData(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;}
private static final Header defaultInstance; private static final InlineData defaultInstance;
public static Header getDefaultInstance() { public static InlineData getDefaultInstance() {
return defaultInstance; return defaultInstance;
} }
public Header getDefaultInstanceForType() { public InlineData getDefaultInstanceForType() {
return defaultInstance; return defaultInstance;
} }
private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; private final org.jetbrains.kotlin.protobuf.ByteString unknownFields;
private Header( private InlineData(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
@@ -38879,18 +38879,18 @@ public final class JsAstProtoBuf {
makeExtensionsImmutable(); makeExtensionsImmutable();
} }
} }
public static org.jetbrains.kotlin.protobuf.Parser<Header> PARSER = public static org.jetbrains.kotlin.protobuf.Parser<InlineData> PARSER =
new org.jetbrains.kotlin.protobuf.AbstractParser<Header>() { new org.jetbrains.kotlin.protobuf.AbstractParser<InlineData>() {
public Header parsePartialFrom( public InlineData parsePartialFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return new Header(input, extensionRegistry); return new InlineData(input, extensionRegistry);
} }
}; };
@java.lang.Override @java.lang.Override
public org.jetbrains.kotlin.protobuf.Parser<Header> getParserForType() { public org.jetbrains.kotlin.protobuf.Parser<InlineData> getParserForType() {
return PARSER; return PARSER;
} }
@@ -38972,53 +38972,53 @@ public final class JsAstProtoBuf {
return super.writeReplace(); return super.writeReplace();
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data) org.jetbrains.kotlin.protobuf.ByteString data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data); return PARSER.parseFrom(data);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ByteString data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry); return PARSER.parseFrom(data, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom(byte[] data) public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(byte[] data)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data); return PARSER.parseFrom(data);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
byte[] data, byte[] data,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry); return PARSER.parseFrom(data, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom(java.io.InputStream input) public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(java.io.InputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input); return PARSER.parseFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
java.io.InputStream input, java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry); return PARSER.parseFrom(input, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseDelimitedFrom(java.io.InputStream input) public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseDelimitedFrom(input); return PARSER.parseDelimitedFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseDelimitedFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseDelimitedFrom(
java.io.InputStream input, java.io.InputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry); return PARSER.parseDelimitedFrom(input, extensionRegistry);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input) org.jetbrains.kotlin.protobuf.CodedInputStream input)
throws java.io.IOException { throws java.io.IOException {
return PARSER.parseFrom(input); return PARSER.parseFrom(input);
} }
public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parseFrom( public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parseFrom(
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
@@ -39027,21 +39027,21 @@ public final class JsAstProtoBuf {
public static Builder newBuilder() { return Builder.create(); } public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); } public Builder newBuilderForType() { return newBuilder(); }
public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header prototype) { public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData prototype) {
return newBuilder().mergeFrom(prototype); return newBuilder().mergeFrom(prototype);
} }
public Builder toBuilder() { return newBuilder(this); } public Builder toBuilder() { return newBuilder(this); }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Header} * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlineData}
*/ */
public static final class Builder extends public static final class Builder extends
org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder<
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header, Builder> org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData, Builder>
implements implements
// @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlineData)
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.HeaderOrBuilder { org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineDataOrBuilder {
// Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header.newBuilder() // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData.newBuilder()
private Builder() { private Builder() {
maybeForceBuilderInitialization(); maybeForceBuilderInitialization();
} }
@@ -39063,20 +39063,20 @@ public final class JsAstProtoBuf {
return create().mergeFrom(buildPartial()); return create().mergeFrom(buildPartial());
} }
public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header getDefaultInstanceForType() { public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData getDefaultInstanceForType() {
return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header.getDefaultInstance(); return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData.getDefaultInstance();
} }
public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header build() { public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData build() {
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header result = buildPartial(); org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData result = buildPartial();
if (!result.isInitialized()) { if (!result.isInitialized()) {
throw newUninitializedMessageException(result); throw newUninitializedMessageException(result);
} }
return result; return result;
} }
public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header buildPartial() { public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData buildPartial() {
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header(this); org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData(this);
int from_bitField0_ = bitField0_; int from_bitField0_ = bitField0_;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
inlineFunctionTags_ = inlineFunctionTags_.getUnmodifiableView(); inlineFunctionTags_ = inlineFunctionTags_.getUnmodifiableView();
@@ -39086,8 +39086,8 @@ public final class JsAstProtoBuf {
return result; return result;
} }
public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header other) { public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData other) {
if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData.getDefaultInstance()) return this;
if (!other.inlineFunctionTags_.isEmpty()) { if (!other.inlineFunctionTags_.isEmpty()) {
if (inlineFunctionTags_.isEmpty()) { if (inlineFunctionTags_.isEmpty()) {
inlineFunctionTags_ = other.inlineFunctionTags_; inlineFunctionTags_ = other.inlineFunctionTags_;
@@ -39111,11 +39111,11 @@ public final class JsAstProtoBuf {
org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.CodedInputStream input,
org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException { throws java.io.IOException {
org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header parsedMessage = null; org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData parsedMessage = null;
try { try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) {
parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Header) e.getUnfinishedMessage(); parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlineData) e.getUnfinishedMessage();
throw e; throw e;
} finally { } finally {
if (parsedMessage != null) { if (parsedMessage != null) {
@@ -39219,15 +39219,15 @@ public final class JsAstProtoBuf {
return this; return this;
} }
// @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlineData)
} }
static { static {
defaultInstance = new Header(true); defaultInstance = new InlineData(true);
defaultInstance.initFields(); defaultInstance.initFields();
} }
// @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Header) // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlineData)
} }
js/js.tests/test/org/jetbrains/kotlin/js/test/BasicBoxTest.kt
+1 -1
View File
@@ -382,7 +382,7 @@ abstract class BasicBoxTest(
} }
} }
for ((sourceFile, data) in incrementalData.translatedFiles) { for ((sourceFile, data) in incrementalData.translatedFiles) {
sourceToTranslationUnit[sourceFile] = TranslationUnit.BinaryAst(data.binaryAst, data.header) sourceToTranslationUnit[sourceFile] = TranslationUnit.BinaryAst(data.binaryAst, data.inlineData)
} }
val translationUnits = sourceToTranslationUnit.keys val translationUnits = sourceToTranslationUnit.keys
.sortedBy { it.canonicalPath } .sortedBy { it.canonicalPath }
js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt
+6 -6
View File
@@ -194,21 +194,21 @@ class K2JSTranslator @JvmOverloads constructor(
metadataVersion ?: JsMetadataVersion.INSTANCE metadataVersion ?: JsMetadataVersion.INSTANCE
) )
val header = serializeHeader(fileTranslationResult.inlineFunctionTags) val inlineData = serializeInlineData(fileTranslationResult.inlineFunctionTags)
val ioFile = VfsUtilCore.virtualToIoFile(file.virtualFile) val ioFile = VfsUtilCore.virtualToIoFile(file.virtualFile)
incrementalResults?.processPackagePart(ioFile, packagePart.toByteArray(), binaryAst, header) incrementalResults?.processPackagePart(ioFile, packagePart.toByteArray(), binaryAst, inlineData)
} }
val settings = config.configuration.languageVersionSettings val settings = config.configuration.languageVersionSettings
incrementalResults?.processHeader(KotlinJavascriptSerializationUtil.serializeHeader(moduleDescriptor, null, settings).toByteArray()) incrementalResults?.processHeader(KotlinJavascriptSerializationUtil.serializeHeader(moduleDescriptor, null, settings).toByteArray())
} }
private fun serializeHeader(importedTags: Set<String>): ByteArray { private fun serializeInlineData(importedTags: Set<String>): ByteArray {
val output = ByteArrayOutputStream() val output = ByteArrayOutputStream()
val headerBuilder = JsAstProtoBuf.Header.newBuilder() val inlineDataBuilder = JsAstProtoBuf.InlineData.newBuilder()
headerBuilder.addAllInlineFunctionTags(importedTags) inlineDataBuilder.addAllInlineFunctionTags(importedTags)
headerBuilder.build().writeTo(output) inlineDataBuilder.build().writeTo(output)
return output.toByteArray() return output.toByteArray()
} }
js/js.translator/src/org/jetbrains/kotlin/js/facade/TranslationUnit.kt
+1 -1
View File
@@ -21,5 +21,5 @@ import org.jetbrains.kotlin.psi.KtFile
sealed class TranslationUnit { sealed class TranslationUnit {
class SourceFile(val file: KtFile) : TranslationUnit() class SourceFile(val file: KtFile) : TranslationUnit()
class BinaryAst(val data: ByteArray, val header: ByteArray) : TranslationUnit() class BinaryAst(val data: ByteArray, val inlineData: ByteArray) : TranslationUnit()
} }
js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt
+2 -3
View File
@@ -50,12 +50,11 @@ class AstGenerationResult(
is TranslationUnit.SourceFile -> translatedSourceFiles[unit]!! is TranslationUnit.SourceFile -> translatedSourceFiles[unit]!!
is TranslationUnit.BinaryAst -> cache.getOrPut(unit) { is TranslationUnit.BinaryAst -> cache.getOrPut(unit) {
// TODO Don't deserialize header twice // TODO Don't deserialize header twice
val headerData = unit.header val inlineData = JsAstProtoBuf.InlineData.parseFrom(CodedInputStream.newInstance(unit.inlineData))
val header = JsAstProtoBuf.Header.parseFrom(CodedInputStream.newInstance(headerData))
DeserializedFileTranslationResult( DeserializedFileTranslationResult(
deserializer.deserialize(ByteArrayInputStream(unit.data)), deserializer.deserialize(ByteArrayInputStream(unit.data)),
HashSet(header.inlineFunctionTagsList) HashSet(inlineData.inlineFunctionTagsList)
) )
} }
} }
js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Translation.java
+2 -2
View File
@@ -347,8 +347,8 @@ public final class Translation {
translatedSourceFiles.put(sourceFileUnit, new SourceFileTranslationResult(fragment, staticContext.getInlineFunctionTags(), fileMemberScope)); translatedSourceFiles.put(sourceFileUnit, new SourceFileTranslationResult(fragment, staticContext.getInlineFunctionTags(), fileMemberScope));
} }
else if (unit instanceof TranslationUnit.BinaryAst) { else if (unit instanceof TranslationUnit.BinaryAst) {
byte[] headerData = ((TranslationUnit.BinaryAst) unit).getHeader(); byte[] inlineDataArray = ((TranslationUnit.BinaryAst) unit).getInlineData();
JsAstProtoBuf.Header h = JsAstProtoBuf.Header.parseFrom(CodedInputStream.newInstance(headerData)); JsAstProtoBuf.InlineData h = JsAstProtoBuf.InlineData.parseFrom(CodedInputStream.newInstance(inlineDataArray));
for (String tag : h.getInlineFunctionTagsList()) { for (String tag : h.getInlineFunctionTagsList()) {
assert !inlineFunctionTagMap.containsKey(tag) : "Duplicate inline function tag found: '" + tag + "'"; assert !inlineFunctionTagMap.containsKey(tag) : "Duplicate inline function tag found: '" + tag + "'";
inlineFunctionTagMap.put(tag, unit); inlineFunctionTagMap.put(tag, unit);