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

[JS IR BE] Refactored klibs proto files

Browse Source
This commit is contained in:
Roman Artemev
2019-02-25 18:44:59 +03:00
committed by romanart
parent 52baf90518
commit a19bdd0c18
9 changed files with 5469 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build-common/test/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/DebugJsKlibMetadataProtoBuf.java
+5363
View File
File diff suppressed because it is too large Load Diff
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/ir.proto → compiler/ir/backend.js/src/ir.proto
+2 -2
View File
@@ -251,7 +251,7 @@ message IrPropertyReference {
optional IrSymbol setter = 3; optional IrSymbol setter = 3;
optional IrStatementOrigin origin = 4; optional IrStatementOrigin origin = 4;
required MemberAccessCommon member_access = 5; required MemberAccessCommon member_access = 5;
optional DescriptorReference descriptor = 6; // IrProperty doesn't have a symbol at all. Preserve this rudiment for now. optional DescriptorReference descriptor_reference = 6; // IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
} }
message IrComposite { message IrComposite {
@@ -550,7 +550,7 @@ message IrField {
} }
message IrProperty { message IrProperty {
optional DescriptorReference descriptor = 1; // IrProperty doesn't have a symbol at all. Preserve this rudiment for now. optional DescriptorReference descriptor_reference = 1; // IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
required String name = 2; required String name = 2;
required Visibility visibility = 3; required Visibility visibility = 3;
required ModalityKind modality = 4; required ModalityKind modality = 4;
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/js.proto → compiler/ir/backend.js/src/js.proto
View File
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/DeserializeDescriptorReference.kt
-22
View File
@@ -140,27 +140,5 @@ class DescriptorReferenceDeserializer(
} }
} ?: } ?:
error("Could not find serialized descriptor for index: ${index} ${packageFqName},${classFqName},${name}") error("Could not find serialized descriptor for index: ${index} ${packageFqName},${classFqName},${name}")
//
// members.forEach { member ->
// if (isDefaultConstructor && member is ClassConstructorDescriptor) return member
//
// val realMembers =
// if (isFakeOverride && member is CallableMemberDescriptor && member.kind == CallableMemberDescriptor.Kind.FAKE_OVERRIDE)
// member.resolveFakeOverrideMaybeAbstract().map { it.original }
// else
// setOf(member)
//
// val memberIndices = realMembers.map { it.getUniqId()?.index ?: checkerDesc(it) }.filterNotNull()
//
// if (memberIndices.contains(protoIndex)) {
// return when {
// member is PropertyDescriptor && isSetter -> member.setter!!
// member is PropertyDescriptor && isGetter -> member.getter!!
// else -> member
// }
// }
// }
//
// error("Could not find serialized descriptor for index: $index $packageFqName,$classFqName,$name")
} }
} }
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/IrKlibProtoBuf.java
+95 -95
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/ir.proto // source: compiler/ir/backend.js/src/ir.proto
package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir; package org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir;
@@ -18938,21 +18938,21 @@ public final class IrKlibProtoBuf {
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon getMemberAccess(); org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon getMemberAccess();
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
boolean hasDescriptor(); boolean hasDescriptorReference();
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor(); org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference();
} }
/** /**
* Protobuf type {@code org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrPropertyReference} * Protobuf type {@code org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrPropertyReference}
@@ -19072,12 +19072,12 @@ public final class IrKlibProtoBuf {
case 50: { case 50: {
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder subBuilder = null; org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder subBuilder = null;
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
subBuilder = descriptor_.toBuilder(); subBuilder = descriptorReference_.toBuilder();
} }
descriptor_ = input.readMessage(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.PARSER, extensionRegistry); descriptorReference_ = input.readMessage(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.PARSER, extensionRegistry);
if (subBuilder != null) { if (subBuilder != null) {
subBuilder.mergeFrom(descriptor_); subBuilder.mergeFrom(descriptorReference_);
descriptor_ = subBuilder.buildPartial(); descriptorReference_ = subBuilder.buildPartial();
} }
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
break; break;
@@ -19191,27 +19191,27 @@ public final class IrKlibProtoBuf {
return memberAccess_; return memberAccess_;
} }
public static final int DESCRIPTOR_FIELD_NUMBER = 6; public static final int DESCRIPTOR_REFERENCE_FIELD_NUMBER = 6;
private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptor_; private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptorReference_;
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public boolean hasDescriptor() { public boolean hasDescriptorReference() {
return ((bitField0_ & 0x00000020) == 0x00000020); return ((bitField0_ & 0x00000020) == 0x00000020);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor() { public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference() {
return descriptor_; return descriptorReference_;
} }
private void initFields() { private void initFields() {
@@ -19220,7 +19220,7 @@ public final class IrKlibProtoBuf {
setter_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrSymbol.getDefaultInstance(); setter_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrSymbol.getDefaultInstance();
origin_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrStatementOrigin.getDefaultInstance(); origin_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrStatementOrigin.getDefaultInstance();
memberAccess_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon.getDefaultInstance();
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@@ -19260,8 +19260,8 @@ public final class IrKlibProtoBuf {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasDescriptor()) { if (hasDescriptorReference()) {
if (!getDescriptor().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
@@ -19289,7 +19289,7 @@ public final class IrKlibProtoBuf {
output.writeMessage(5, memberAccess_); output.writeMessage(5, memberAccess_);
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeMessage(6, descriptor_); output.writeMessage(6, descriptorReference_);
} }
output.writeRawBytes(unknownFields); output.writeRawBytes(unknownFields);
} }
@@ -19322,7 +19322,7 @@ public final class IrKlibProtoBuf {
} }
if (((bitField0_ & 0x00000020) == 0x00000020)) { if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(6, descriptor_); .computeMessageSize(6, descriptorReference_);
} }
size += unknownFields.size(); size += unknownFields.size();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@@ -19428,7 +19428,7 @@ public final class IrKlibProtoBuf {
bitField0_ = (bitField0_ & ~0x00000008); bitField0_ = (bitField0_ & ~0x00000008);
memberAccess_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon.getDefaultInstance(); memberAccess_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.MemberAccessCommon.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000010); bitField0_ = (bitField0_ & ~0x00000010);
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
return this; return this;
} }
@@ -19476,7 +19476,7 @@ public final class IrKlibProtoBuf {
if (((from_bitField0_ & 0x00000020) == 0x00000020)) { if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
to_bitField0_ |= 0x00000020; to_bitField0_ |= 0x00000020;
} }
result.descriptor_ = descriptor_; result.descriptorReference_ = descriptorReference_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
return result; return result;
} }
@@ -19498,8 +19498,8 @@ public final class IrKlibProtoBuf {
if (other.hasMemberAccess()) { if (other.hasMemberAccess()) {
mergeMemberAccess(other.getMemberAccess()); mergeMemberAccess(other.getMemberAccess());
} }
if (other.hasDescriptor()) { if (other.hasDescriptorReference()) {
mergeDescriptor(other.getDescriptor()); mergeDescriptorReference(other.getDescriptorReference());
} }
setUnknownFields( setUnknownFields(
getUnknownFields().concat(other.unknownFields)); getUnknownFields().concat(other.unknownFields));
@@ -19539,8 +19539,8 @@ public final class IrKlibProtoBuf {
return false; return false;
} }
if (hasDescriptor()) { if (hasDescriptorReference()) {
if (!getDescriptor().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
return false; return false;
} }
@@ -19867,85 +19867,85 @@ public final class IrKlibProtoBuf {
return this; return this;
} }
private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public boolean hasDescriptor() { public boolean hasDescriptorReference() {
return ((bitField0_ & 0x00000020) == 0x00000020); return ((bitField0_ & 0x00000020) == 0x00000020);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor() { public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference() {
return descriptor_; return descriptorReference_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder setDescriptor(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) { public Builder setDescriptorReference(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
descriptor_ = value; descriptorReference_ = value;
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder setDescriptor( public Builder setDescriptorReference(
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder builderForValue) { org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder builderForValue) {
descriptor_ = builderForValue.build(); descriptorReference_ = builderForValue.build();
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder mergeDescriptor(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) { public Builder mergeDescriptorReference(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) {
if (((bitField0_ & 0x00000020) == 0x00000020) && if (((bitField0_ & 0x00000020) == 0x00000020) &&
descriptor_ != org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance()) { descriptorReference_ != org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance()) {
descriptor_ = descriptorReference_ =
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.newBuilder(descriptor_).mergeFrom(value).buildPartial(); org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.newBuilder(descriptorReference_).mergeFrom(value).buildPartial();
} else { } else {
descriptor_ = value; descriptorReference_ = value;
} }
bitField0_ |= 0x00000020; bitField0_ |= 0x00000020;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 6;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 6;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder clearDescriptor() { public Builder clearDescriptorReference() {
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000020); bitField0_ = (bitField0_ & ~0x00000020);
return this; return this;
@@ -46151,21 +46151,21 @@ public final class IrKlibProtoBuf {
org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder {
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
boolean hasDescriptor(); boolean hasDescriptorReference();
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor(); org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference();
/** /**
* <code>required .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.String name = 2;</code> * <code>required .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.String name = 2;</code>
@@ -46319,12 +46319,12 @@ public final class IrKlibProtoBuf {
case 10: { case 10: {
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder subBuilder = null; org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder subBuilder = null;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
subBuilder = descriptor_.toBuilder(); subBuilder = descriptorReference_.toBuilder();
} }
descriptor_ = input.readMessage(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.PARSER, extensionRegistry); descriptorReference_ = input.readMessage(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.PARSER, extensionRegistry);
if (subBuilder != null) { if (subBuilder != null) {
subBuilder.mergeFrom(descriptor_); subBuilder.mergeFrom(descriptorReference_);
descriptor_ = subBuilder.buildPartial(); descriptorReference_ = subBuilder.buildPartial();
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
break; break;
@@ -46465,27 +46465,27 @@ public final class IrKlibProtoBuf {
} }
private int bitField0_; private int bitField0_;
public static final int DESCRIPTOR_FIELD_NUMBER = 1; public static final int DESCRIPTOR_REFERENCE_FIELD_NUMBER = 1;
private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptor_; private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptorReference_;
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public boolean hasDescriptor() { public boolean hasDescriptorReference() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor() { public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference() {
return descriptor_; return descriptorReference_;
} }
public static final int NAME_FIELD_NUMBER = 2; public static final int NAME_FIELD_NUMBER = 2;
@@ -46654,7 +46654,7 @@ public final class IrKlibProtoBuf {
} }
private void initFields() { private void initFields() {
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
name_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.String.getDefaultInstance(); name_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.String.getDefaultInstance();
visibility_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.Visibility.getDefaultInstance(); visibility_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.Visibility.getDefaultInstance();
modality_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.ModalityKind.FINAL_MODALITY; modality_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.ModalityKind.FINAL_MODALITY;
@@ -46705,8 +46705,8 @@ public final class IrKlibProtoBuf {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
if (hasDescriptor()) { if (hasDescriptorReference()) {
if (!getDescriptor().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
@@ -46745,7 +46745,7 @@ public final class IrKlibProtoBuf {
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeMessage(1, descriptor_); output.writeMessage(1, descriptorReference_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
output.writeMessage(2, name_); output.writeMessage(2, name_);
@@ -46791,7 +46791,7 @@ public final class IrKlibProtoBuf {
size = 0; size = 0;
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
.computeMessageSize(1, descriptor_); .computeMessageSize(1, descriptorReference_);
} }
if (((bitField0_ & 0x00000002) == 0x00000002)) { if (((bitField0_ & 0x00000002) == 0x00000002)) {
size += org.jetbrains.kotlin.protobuf.CodedOutputStream size += org.jetbrains.kotlin.protobuf.CodedOutputStream
@@ -46931,7 +46931,7 @@ public final class IrKlibProtoBuf {
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
name_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.String.getDefaultInstance(); name_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.String.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000002); bitField0_ = (bitField0_ & ~0x00000002);
@@ -46981,7 +46981,7 @@ public final class IrKlibProtoBuf {
if (((from_bitField0_ & 0x00000001) == 0x00000001)) { if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
to_bitField0_ |= 0x00000001; to_bitField0_ |= 0x00000001;
} }
result.descriptor_ = descriptor_; result.descriptorReference_ = descriptorReference_;
if (((from_bitField0_ & 0x00000002) == 0x00000002)) { if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
to_bitField0_ |= 0x00000002; to_bitField0_ |= 0x00000002;
} }
@@ -47032,8 +47032,8 @@ public final class IrKlibProtoBuf {
public Builder mergeFrom(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrProperty other) { public Builder mergeFrom(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrProperty other) {
if (other == org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrProperty.getDefaultInstance()) return this; if (other == org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.IrProperty.getDefaultInstance()) return this;
if (other.hasDescriptor()) { if (other.hasDescriptorReference()) {
mergeDescriptor(other.getDescriptor()); mergeDescriptorReference(other.getDescriptorReference());
} }
if (other.hasName()) { if (other.hasName()) {
mergeName(other.getName()); mergeName(other.getName());
@@ -47106,8 +47106,8 @@ public final class IrKlibProtoBuf {
return false; return false;
} }
if (hasDescriptor()) { if (hasDescriptorReference()) {
if (!getDescriptor().isInitialized()) { if (!getDescriptorReference().isInitialized()) {
return false; return false;
} }
@@ -47160,85 +47160,85 @@ public final class IrKlibProtoBuf {
} }
private int bitField0_; private int bitField0_;
private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); private org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public boolean hasDescriptor() { public boolean hasDescriptorReference() {
return ((bitField0_ & 0x00000001) == 0x00000001); return ((bitField0_ & 0x00000001) == 0x00000001);
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptor() { public org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference getDescriptorReference() {
return descriptor_; return descriptorReference_;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder setDescriptor(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) { public Builder setDescriptorReference(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
descriptor_ = value; descriptorReference_ = value;
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder setDescriptor( public Builder setDescriptorReference(
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder builderForValue) { org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.Builder builderForValue) {
descriptor_ = builderForValue.build(); descriptorReference_ = builderForValue.build();
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder mergeDescriptor(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) { public Builder mergeDescriptorReference(org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference value) {
if (((bitField0_ & 0x00000001) == 0x00000001) && if (((bitField0_ & 0x00000001) == 0x00000001) &&
descriptor_ != org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance()) { descriptorReference_ != org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance()) {
descriptor_ = descriptorReference_ =
org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.newBuilder(descriptor_).mergeFrom(value).buildPartial(); org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.newBuilder(descriptorReference_).mergeFrom(value).buildPartial();
} else { } else {
descriptor_ = value; descriptorReference_ = value;
} }
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
return this; return this;
} }
/** /**
* <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor = 1;</code> * <code>optional .org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.DescriptorReference descriptor_reference = 1;</code>
* *
* <pre> * <pre>
* IrProperty doesn't have a symbol at all. Preserve this rudiment for now. * IrProperty doesn't have a symbol at all. Preserve this rudiment for now.
* </pre> * </pre>
*/ */
public Builder clearDescriptor() { public Builder clearDescriptorReference() {
descriptor_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance(); descriptorReference_ = org.jetbrains.kotlin.ir.backend.js.lower.serialization.ir.IrKlibProtoBuf.DescriptorReference.getDefaultInstance();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
return this; return this;
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/IrModuleDeserializer.kt
+4 -4
View File
@@ -390,8 +390,8 @@ abstract class IrModuleDeserializer(
val getter = if (proto.hasGetter()) deserializeIrSymbol(proto.getter) as IrSimpleFunctionSymbol else null val getter = if (proto.hasGetter()) deserializeIrSymbol(proto.getter) as IrSimpleFunctionSymbol else null
val setter = if (proto.hasSetter()) deserializeIrSymbol(proto.setter) as IrSimpleFunctionSymbol else null val setter = if (proto.hasSetter()) deserializeIrSymbol(proto.setter) as IrSimpleFunctionSymbol else null
val descriptor = val descriptor =
if (proto.hasDescriptor()) if (proto.hasDescriptorReference())
deserializeDescriptorReference(proto.descriptor) as PropertyDescriptor deserializeDescriptorReference(proto.descriptorReference) as PropertyDescriptor
else else
field?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's. field?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's.
?: getterToPropertyDescriptorMap.getOrPut(getter!!) { WrappedPropertyDescriptor() } ?: getterToPropertyDescriptorMap.getOrPut(getter!!) { WrappedPropertyDescriptor() }
@@ -1064,8 +1064,8 @@ abstract class IrModuleDeserializer(
setter?.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) } setter?.let { (it.descriptor as? WrappedSimpleFunctionDescriptor)?.bind(it) }
val descriptor = val descriptor =
if (proto.hasDescriptor()) if (proto.hasDescriptorReference())
deserializeDescriptorReference(proto.descriptor) as PropertyDescriptor deserializeDescriptorReference(proto.descriptorReference) as PropertyDescriptor
else else
backingField?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's. backingField?.descriptor as? WrappedPropertyDescriptor // If field's descriptor coincides with property's.
?: getterToPropertyDescriptorMap.getOrPut(getter!!.symbol) { WrappedPropertyDescriptor() } ?: getterToPropertyDescriptorMap.getOrPut(getter!!.symbol) { WrappedPropertyDescriptor() }
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/IrModuleSerializer.kt
+2 -2
View File
@@ -416,7 +416,7 @@ internal class IrModuleSerializer(
callable.setter?.let { proto.setter = serializeIrSymbol(it) } callable.setter?.let { proto.setter = serializeIrSymbol(it) }
callable.origin?.let { proto.origin = serializeIrStatementOrigin(it) } callable.origin?.let { proto.origin = serializeIrStatementOrigin(it) }
val property = callable.getter!!.owner.correspondingProperty!! val property = callable.getter!!.owner.correspondingProperty!!
descriptorReferenceSerializer.serializeDescriptorReference(property)?.let { proto.setDescriptor(it) } descriptorReferenceSerializer.serializeDescriptorReference(property)?.let { proto.setDescriptorReference(it) }
return proto.build() return proto.build()
} }
@@ -953,7 +953,7 @@ internal class IrModuleSerializer(
.setIsDelegated(property.isDelegated) .setIsDelegated(property.isDelegated)
.setIsExternal(property.isExternal) .setIsExternal(property.isExternal)
descriptorReferenceSerializer.serializeDescriptorReference(property)?.let { proto.setDescriptor(it) } descriptorReferenceSerializer.serializeDescriptorReference(property)?.let { proto.setDescriptorReference(it) }
val backingField = property.backingField val backingField = property.backingField
val getter = property.getter val getter = property.getter
compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/JsKlibMetadataProtoBuf.java
+1 -1
View File
@@ -1,5 +1,5 @@
// Generated by the protocol buffer compiler. DO NOT EDIT! // Generated by the protocol buffer compiler. DO NOT EDIT!
// source: compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/js.proto // source: compiler/ir/backend.js/src/js.proto
package org.jetbrains.kotlin.ir.backend.js.lower.serialization.metadata; package org.jetbrains.kotlin.ir.backend.js.lower.serialization.metadata;
generators/tests/org/jetbrains/kotlin/generators/protobuf/GenerateProtoBuf.kt
+2 -2
View File
@@ -58,8 +58,8 @@ val PROTO_PATHS: List<ProtoPath> = listOf(
ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"), ProtoPath("core/metadata.jvm/src/jvm_metadata.proto"),
ProtoPath("core/metadata.jvm/src/jvm_module.proto"), ProtoPath("core/metadata.jvm/src/jvm_module.proto"),
ProtoPath("build-common/src/java_descriptors.proto"), ProtoPath("build-common/src/java_descriptors.proto"),
// ProtoPath("compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/metadata/js.proto"), ProtoPath("compiler/ir/backend.js/src/ir.proto", false),
ProtoPath("compiler/ir/backend.js/src/org/jetbrains/kotlin/ir/backend/js/lower/serialization/ir/ir.proto") ProtoPath("compiler/ir/backend.js/src/js.proto", false)
) )
private val EXT_OPTIONS_PROTO_PATH = ProtoPath("core/metadata/src/ext_options.proto") private val EXT_OPTIONS_PROTO_PATH = ProtoPath("core/metadata/src/ext_options.proto")