diff --git a/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java b/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java index 72728d6f0d5..4562d0518a7 100644 --- a/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java +++ b/build-common/test/org/jetbrains/kotlin/serialization/js/ast/DebugJsAstProtoBuf.java @@ -41278,27 +41278,27 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.StatementOrBuilder getMainInvocationOrBuilder(); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - java.util.List - getInlinedFunctionWrappersList(); + java.util.List + getInlinedLocalDeclarationsList(); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index); + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - int getInlinedFunctionWrappersCount(); + int getInlinedLocalDeclarationsCount(); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - java.util.List - getInlinedFunctionWrappersOrBuilderList(); + java.util.List + getInlinedLocalDeclarationsOrBuilderList(); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder getInlinedFunctionWrappersOrBuilder( + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder getInlinedLocalDeclarationsOrBuilder( int index); } /** @@ -41474,10 +41474,10 @@ public final class DebugJsAstProtoBuf { } case 106: { if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = new java.util.ArrayList(); + inlinedLocalDeclarations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00001000; } - inlinedFunctionWrappers_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.PARSER, extensionRegistry)); + inlinedLocalDeclarations_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.PARSER, extensionRegistry)); break; } } @@ -41507,7 +41507,7 @@ public final class DebugJsAstProtoBuf { inlineModule_ = java.util.Collections.unmodifiableList(inlineModule_); } if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -41898,39 +41898,39 @@ public final class DebugJsAstProtoBuf { return mainInvocation_; } - public static final int INLINED_FUNCTION_WRAPPERS_FIELD_NUMBER = 13; - private java.util.List inlinedFunctionWrappers_; + public static final int INLINED_LOCAL_DECLARATIONS_FIELD_NUMBER = 13; + private java.util.List inlinedLocalDeclarations_; /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List getInlinedFunctionWrappersList() { - return inlinedFunctionWrappers_; + public java.util.List getInlinedLocalDeclarationsList() { + return inlinedLocalDeclarations_; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List - getInlinedFunctionWrappersOrBuilderList() { - return inlinedFunctionWrappers_; + public java.util.List + getInlinedLocalDeclarationsOrBuilderList() { + return inlinedLocalDeclarations_; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public int getInlinedFunctionWrappersCount() { - return inlinedFunctionWrappers_.size(); + public int getInlinedLocalDeclarationsCount() { + return inlinedLocalDeclarations_.size(); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index) { - return inlinedFunctionWrappers_.get(index); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index) { + return inlinedLocalDeclarations_.get(index); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder getInlinedFunctionWrappersOrBuilder( + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder getInlinedLocalDeclarationsOrBuilder( int index) { - return inlinedFunctionWrappers_.get(index); + return inlinedLocalDeclarations_.get(index); } private void initFields() { @@ -41946,7 +41946,7 @@ public final class DebugJsAstProtoBuf { packageFqn_ = ""; testsInvocation_ = org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Statement.getDefaultInstance(); mainInvocation_ = org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.Statement.getDefaultInstance(); - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -42020,8 +42020,8 @@ public final class DebugJsAstProtoBuf { return false; } } - for (int i = 0; i < getInlinedFunctionWrappersCount(); i++) { - if (!getInlinedFunctionWrappers(i).isInitialized()) { + for (int i = 0; i < getInlinedLocalDeclarationsCount(); i++) { + if (!getInlinedLocalDeclarations(i).isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -42069,8 +42069,8 @@ public final class DebugJsAstProtoBuf { if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(12, mainInvocation_); } - for (int i = 0; i < inlinedFunctionWrappers_.size(); i++) { - output.writeMessage(13, inlinedFunctionWrappers_.get(i)); + for (int i = 0; i < inlinedLocalDeclarations_.size(); i++) { + output.writeMessage(13, inlinedLocalDeclarations_.get(i)); } getUnknownFields().writeTo(output); } @@ -42129,9 +42129,9 @@ public final class DebugJsAstProtoBuf { size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeMessageSize(12, mainInvocation_); } - for (int i = 0; i < inlinedFunctionWrappers_.size(); i++) { + for (int i = 0; i < inlinedLocalDeclarations_.size(); i++) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(13, inlinedFunctionWrappers_.get(i)); + .computeMessageSize(13, inlinedLocalDeclarations_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -42253,7 +42253,7 @@ public final class DebugJsAstProtoBuf { getInlineModuleFieldBuilder(); getTestsInvocationFieldBuilder(); getMainInvocationFieldBuilder(); - getInlinedFunctionWrappersFieldBuilder(); + getInlinedLocalDeclarationsFieldBuilder(); } } private static Builder create() { @@ -42330,11 +42330,11 @@ public final class DebugJsAstProtoBuf { mainInvocationBuilder_.clear(); } bitField0_ = (bitField0_ & ~0x00000800); - if (inlinedFunctionWrappersBuilder_ == null) { - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + if (inlinedLocalDeclarationsBuilder_ == null) { + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00001000); } else { - inlinedFunctionWrappersBuilder_.clear(); + inlinedLocalDeclarationsBuilder_.clear(); } return this; } @@ -42462,14 +42462,14 @@ public final class DebugJsAstProtoBuf { } else { result.mainInvocation_ = mainInvocationBuilder_.build(); } - if (inlinedFunctionWrappersBuilder_ == null) { + if (inlinedLocalDeclarationsBuilder_ == null) { if (((bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); bitField0_ = (bitField0_ & ~0x00001000); } - result.inlinedFunctionWrappers_ = inlinedFunctionWrappers_; + result.inlinedLocalDeclarations_ = inlinedLocalDeclarations_; } else { - result.inlinedFunctionWrappers_ = inlinedFunctionWrappersBuilder_.build(); + result.inlinedLocalDeclarations_ = inlinedLocalDeclarationsBuilder_.build(); } result.bitField0_ = to_bitField0_; onBuilt(); @@ -42663,29 +42663,29 @@ public final class DebugJsAstProtoBuf { if (other.hasMainInvocation()) { mergeMainInvocation(other.getMainInvocation()); } - if (inlinedFunctionWrappersBuilder_ == null) { - if (!other.inlinedFunctionWrappers_.isEmpty()) { - if (inlinedFunctionWrappers_.isEmpty()) { - inlinedFunctionWrappers_ = other.inlinedFunctionWrappers_; + if (inlinedLocalDeclarationsBuilder_ == null) { + if (!other.inlinedLocalDeclarations_.isEmpty()) { + if (inlinedLocalDeclarations_.isEmpty()) { + inlinedLocalDeclarations_ = other.inlinedLocalDeclarations_; bitField0_ = (bitField0_ & ~0x00001000); } else { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.addAll(other.inlinedFunctionWrappers_); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.addAll(other.inlinedLocalDeclarations_); } onChanged(); } } else { - if (!other.inlinedFunctionWrappers_.isEmpty()) { - if (inlinedFunctionWrappersBuilder_.isEmpty()) { - inlinedFunctionWrappersBuilder_.dispose(); - inlinedFunctionWrappersBuilder_ = null; - inlinedFunctionWrappers_ = other.inlinedFunctionWrappers_; + if (!other.inlinedLocalDeclarations_.isEmpty()) { + if (inlinedLocalDeclarationsBuilder_.isEmpty()) { + inlinedLocalDeclarationsBuilder_.dispose(); + inlinedLocalDeclarationsBuilder_ = null; + inlinedLocalDeclarations_ = other.inlinedLocalDeclarations_; bitField0_ = (bitField0_ & ~0x00001000); - inlinedFunctionWrappersBuilder_ = + inlinedLocalDeclarationsBuilder_ = org.jetbrains.kotlin.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getInlinedFunctionWrappersFieldBuilder() : null; + getInlinedLocalDeclarationsFieldBuilder() : null; } else { - inlinedFunctionWrappersBuilder_.addAllMessages(other.inlinedFunctionWrappers_); + inlinedLocalDeclarationsBuilder_.addAllMessages(other.inlinedLocalDeclarations_); } } } @@ -42760,8 +42760,8 @@ public final class DebugJsAstProtoBuf { return false; } } - for (int i = 0; i < getInlinedFunctionWrappersCount(); i++) { - if (!getInlinedFunctionWrappers(i).isInitialized()) { + for (int i = 0; i < getInlinedLocalDeclarationsCount(); i++) { + if (!getInlinedLocalDeclarations(i).isInitialized()) { return false; } @@ -44884,244 +44884,244 @@ public final class DebugJsAstProtoBuf { return mainInvocationBuilder_; } - private java.util.List inlinedFunctionWrappers_ = + private java.util.List inlinedLocalDeclarations_ = java.util.Collections.emptyList(); - private void ensureInlinedFunctionWrappersIsMutable() { + private void ensureInlinedLocalDeclarationsIsMutable() { if (!((bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = new java.util.ArrayList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = new java.util.ArrayList(inlinedLocalDeclarations_); bitField0_ |= 0x00001000; } } private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder> inlinedFunctionWrappersBuilder_; + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder> inlinedLocalDeclarationsBuilder_; /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List getInlinedFunctionWrappersList() { - if (inlinedFunctionWrappersBuilder_ == null) { - return java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + public java.util.List getInlinedLocalDeclarationsList() { + if (inlinedLocalDeclarationsBuilder_ == null) { + return java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); } else { - return inlinedFunctionWrappersBuilder_.getMessageList(); + return inlinedLocalDeclarationsBuilder_.getMessageList(); } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public int getInlinedFunctionWrappersCount() { - if (inlinedFunctionWrappersBuilder_ == null) { - return inlinedFunctionWrappers_.size(); + public int getInlinedLocalDeclarationsCount() { + if (inlinedLocalDeclarationsBuilder_ == null) { + return inlinedLocalDeclarations_.size(); } else { - return inlinedFunctionWrappersBuilder_.getCount(); + return inlinedLocalDeclarationsBuilder_.getCount(); } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index) { - if (inlinedFunctionWrappersBuilder_ == null) { - return inlinedFunctionWrappers_.get(index); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index) { + if (inlinedLocalDeclarationsBuilder_ == null) { + return inlinedLocalDeclarations_.get(index); } else { - return inlinedFunctionWrappersBuilder_.getMessage(index); + return inlinedLocalDeclarationsBuilder_.getMessage(index); } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder setInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper value) { - if (inlinedFunctionWrappersBuilder_ == null) { + public Builder setInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations value) { + if (inlinedLocalDeclarationsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.set(index, value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.set(index, value); onChanged(); } else { - inlinedFunctionWrappersBuilder_.setMessage(index, value); + inlinedLocalDeclarationsBuilder_.setMessage(index, value); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder setInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - if (inlinedFunctionWrappersBuilder_ == null) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.set(index, builderForValue.build()); + public Builder setInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + if (inlinedLocalDeclarationsBuilder_ == null) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.set(index, builderForValue.build()); onChanged(); } else { - inlinedFunctionWrappersBuilder_.setMessage(index, builderForValue.build()); + inlinedLocalDeclarationsBuilder_.setMessage(index, builderForValue.build()); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper value) { - if (inlinedFunctionWrappersBuilder_ == null) { + public Builder addInlinedLocalDeclarations(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations value) { + if (inlinedLocalDeclarationsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(value); onChanged(); } else { - inlinedFunctionWrappersBuilder_.addMessage(value); + inlinedLocalDeclarationsBuilder_.addMessage(value); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper value) { - if (inlinedFunctionWrappersBuilder_ == null) { + public Builder addInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations value) { + if (inlinedLocalDeclarationsBuilder_ == null) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(index, value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(index, value); onChanged(); } else { - inlinedFunctionWrappersBuilder_.addMessage(index, value); + inlinedLocalDeclarationsBuilder_.addMessage(index, value); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - if (inlinedFunctionWrappersBuilder_ == null) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(builderForValue.build()); + public Builder addInlinedLocalDeclarations( + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + if (inlinedLocalDeclarationsBuilder_ == null) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(builderForValue.build()); onChanged(); } else { - inlinedFunctionWrappersBuilder_.addMessage(builderForValue.build()); + inlinedLocalDeclarationsBuilder_.addMessage(builderForValue.build()); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - if (inlinedFunctionWrappersBuilder_ == null) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(index, builderForValue.build()); + public Builder addInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + if (inlinedLocalDeclarationsBuilder_ == null) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(index, builderForValue.build()); onChanged(); } else { - inlinedFunctionWrappersBuilder_.addMessage(index, builderForValue.build()); + inlinedLocalDeclarationsBuilder_.addMessage(index, builderForValue.build()); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addAllInlinedFunctionWrappers( - java.lang.Iterable values) { - if (inlinedFunctionWrappersBuilder_ == null) { - ensureInlinedFunctionWrappersIsMutable(); + public Builder addAllInlinedLocalDeclarations( + java.lang.Iterable values) { + if (inlinedLocalDeclarationsBuilder_ == null) { + ensureInlinedLocalDeclarationsIsMutable(); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, inlinedFunctionWrappers_); + values, inlinedLocalDeclarations_); onChanged(); } else { - inlinedFunctionWrappersBuilder_.addAllMessages(values); + inlinedLocalDeclarationsBuilder_.addAllMessages(values); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder clearInlinedFunctionWrappers() { - if (inlinedFunctionWrappersBuilder_ == null) { - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + public Builder clearInlinedLocalDeclarations() { + if (inlinedLocalDeclarationsBuilder_ == null) { + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00001000); onChanged(); } else { - inlinedFunctionWrappersBuilder_.clear(); + inlinedLocalDeclarationsBuilder_.clear(); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder removeInlinedFunctionWrappers(int index) { - if (inlinedFunctionWrappersBuilder_ == null) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.remove(index); + public Builder removeInlinedLocalDeclarations(int index) { + if (inlinedLocalDeclarationsBuilder_ == null) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.remove(index); onChanged(); } else { - inlinedFunctionWrappersBuilder_.remove(index); + inlinedLocalDeclarationsBuilder_.remove(index); } return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder getInlinedFunctionWrappersBuilder( + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder getInlinedLocalDeclarationsBuilder( int index) { - return getInlinedFunctionWrappersFieldBuilder().getBuilder(index); + return getInlinedLocalDeclarationsFieldBuilder().getBuilder(index); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder getInlinedFunctionWrappersOrBuilder( + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder getInlinedLocalDeclarationsOrBuilder( int index) { - if (inlinedFunctionWrappersBuilder_ == null) { - return inlinedFunctionWrappers_.get(index); } else { - return inlinedFunctionWrappersBuilder_.getMessageOrBuilder(index); + if (inlinedLocalDeclarationsBuilder_ == null) { + return inlinedLocalDeclarations_.get(index); } else { + return inlinedLocalDeclarationsBuilder_.getMessageOrBuilder(index); } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List - getInlinedFunctionWrappersOrBuilderList() { - if (inlinedFunctionWrappersBuilder_ != null) { - return inlinedFunctionWrappersBuilder_.getMessageOrBuilderList(); + public java.util.List + getInlinedLocalDeclarationsOrBuilderList() { + if (inlinedLocalDeclarationsBuilder_ != null) { + return inlinedLocalDeclarationsBuilder_.getMessageOrBuilderList(); } else { - return java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + return java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder addInlinedFunctionWrappersBuilder() { - return getInlinedFunctionWrappersFieldBuilder().addBuilder( - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.getDefaultInstance()); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder addInlinedLocalDeclarationsBuilder() { + return getInlinedLocalDeclarationsFieldBuilder().addBuilder( + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder addInlinedFunctionWrappersBuilder( + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder addInlinedLocalDeclarationsBuilder( int index) { - return getInlinedFunctionWrappersFieldBuilder().addBuilder( - index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.getDefaultInstance()); + return getInlinedLocalDeclarationsFieldBuilder().addBuilder( + index, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List - getInlinedFunctionWrappersBuilderList() { - return getInlinedFunctionWrappersFieldBuilder().getBuilderList(); + public java.util.List + getInlinedLocalDeclarationsBuilderList() { + return getInlinedLocalDeclarationsFieldBuilder().getBuilderList(); } private org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder> - getInlinedFunctionWrappersFieldBuilder() { - if (inlinedFunctionWrappersBuilder_ == null) { - inlinedFunctionWrappersBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder>( - inlinedFunctionWrappers_, + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder> + getInlinedLocalDeclarationsFieldBuilder() { + if (inlinedLocalDeclarationsBuilder_ == null) { + inlinedLocalDeclarationsBuilder_ = new org.jetbrains.kotlin.protobuf.RepeatedFieldBuilder< + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder>( + inlinedLocalDeclarations_, ((bitField0_ & 0x00001000) == 0x00001000), getParentForChildren(), isClean()); - inlinedFunctionWrappers_ = null; + inlinedLocalDeclarations_ = null; } - return inlinedFunctionWrappersBuilder_; + return inlinedLocalDeclarationsBuilder_; } // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.Fragment) @@ -45135,8 +45135,8 @@ public final class DebugJsAstProtoBuf { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Fragment) } - public interface InlinedWrapperOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + public interface InlinedLocalDeclarationsOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) org.jetbrains.kotlin.protobuf.MessageOrBuilder { /** @@ -45167,25 +45167,25 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.GlobalBlockOrBuilder getBlockOrBuilder(); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations} */ - public static final class InlinedWrapper extends + public static final class InlinedLocalDeclarations extends org.jetbrains.kotlin.protobuf.GeneratedMessage implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) - InlinedWrapperOrBuilder { - // Use InlinedWrapper.newBuilder() to construct. - private InlinedWrapper(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) + InlinedLocalDeclarationsOrBuilder { + // Use InlinedLocalDeclarations.newBuilder() to construct. + private InlinedLocalDeclarations(org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private InlinedWrapper(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); } + private InlinedLocalDeclarations(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.UnknownFieldSet.getDefaultInstance(); } - private static final InlinedWrapper defaultInstance; - public static InlinedWrapper getDefaultInstance() { + private static final InlinedLocalDeclarations defaultInstance; + public static InlinedLocalDeclarations getDefaultInstance() { return defaultInstance; } - public InlinedWrapper getDefaultInstanceForType() { + public InlinedLocalDeclarations getDefaultInstanceForType() { return defaultInstance; } @@ -45195,7 +45195,7 @@ public final class DebugJsAstProtoBuf { getUnknownFields() { return this.unknownFields; } - private InlinedWrapper( + private InlinedLocalDeclarations( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { @@ -45251,28 +45251,28 @@ public final class DebugJsAstProtoBuf { } public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor; + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_fieldAccessorTable + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder.class); + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder.class); } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public InlinedWrapper parsePartialFrom( + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public InlinedLocalDeclarations parsePartialFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new InlinedWrapper(input, extensionRegistry); + return new InlinedLocalDeclarations(input, extensionRegistry); } }; @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } @@ -45404,53 +45404,53 @@ public final class DebugJsAstProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -45459,7 +45459,7 @@ public final class DebugJsAstProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } @@ -45471,25 +45471,25 @@ public final class DebugJsAstProtoBuf { return builder; } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessage.Builder implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapperOrBuilder { + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarationsOrBuilder { public static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptor() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor; + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor; } protected org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_fieldAccessorTable + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_fieldAccessorTable .ensureFieldAccessorsInitialized( - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.Builder.class); + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.class, org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.Builder.class); } - // Construct using org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.newBuilder() + // Construct using org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -45527,23 +45527,23 @@ public final class DebugJsAstProtoBuf { public org.jetbrains.kotlin.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor; + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor; } - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper build() { - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper result = buildPartial(); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations build() { + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper buildPartial() { - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper result = new org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper(this); + public org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations buildPartial() { + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations result = new org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -45564,16 +45564,16 @@ public final class DebugJsAstProtoBuf { } public Builder mergeFrom(org.jetbrains.kotlin.protobuf.Message other) { - if (other instanceof org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper) { - return mergeFrom((org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper)other); + if (other instanceof org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations) { + return mergeFrom((org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations)other); } else { super.mergeFrom(other); return this; } } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper other) { - if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations other) { + if (other == org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()) return this; if (other.hasTag()) { bitField0_ |= 0x00000001; tag_ = other.tag_; @@ -45606,11 +45606,11 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper parsedMessage = null; + org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedWrapper) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.DebugJsAstProtoBuf.InlinedLocalDeclarations) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -45813,15 +45813,15 @@ public final class DebugJsAstProtoBuf { return blockBuilder_; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) } static { - defaultInstance = new InlinedWrapper(true); + defaultInstance = new InlinedLocalDeclarations(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) } public interface ImportedModuleOrBuilder extends @@ -53127,10 +53127,10 @@ public final class DebugJsAstProtoBuf { org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable internal_static_org_jetbrains_kotlin_serialization_js_ast_Fragment_fieldAccessorTable; private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor - internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor; + internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor; private static org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_fieldAccessorTable; + internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_fieldAccessorTable; private static final org.jetbrains.kotlin.protobuf.Descriptors.Descriptor internal_static_org_jetbrains_kotlin_serialization_js_ast_ImportedModule_descriptor; private static @@ -53439,7 +53439,7 @@ public final class DebugJsAstProtoBuf { "r\030\001 \002(\01324.org.jetbrains.kotlin.serializa" + "tion.js.ast.Parameter\022B\n\004body\030\002 \002(\01324.or" + "g.jetbrains.kotlin.serialization.js.ast." + - "Statement\"\007\n\005Empty\"\351\007\n\010Fragment\022R\n\017impor" + + "Statement\"\007\n\005Empty\"\364\007\n\010Fragment\022R\n\017impor" + "ted_module\030\001 \003(\01329.org.jetbrains.kotlin." + "serialization.js.ast.ImportedModule\022G\n\014i" + "mport_entry\030\002 \003(\01321.org.jetbrains.kotlin" + @@ -53462,51 +53462,52 @@ public final class DebugJsAstProtoBuf { "g.jetbrains.kotlin.serialization.js.ast." + "Statement\022M\n\017main_invocation\030\014 \001(\01324.org" + ".jetbrains.kotlin.serialization.js.ast.S" + - "tatement\022\\\n\031inlined_function_wrappers\030\r " + - "\003(\01329.org.jetbrains.kotlin.serialization" + - ".js.ast.InlinedWrapper\"d\n\016InlinedWrapper", - "\022\013\n\003tag\030\001 \002(\t\022E\n\005block\030\002 \002(\01326.org.jetbr" + - "ains.kotlin.serialization.js.ast.GlobalB" + - "lock\"\224\001\n\016ImportedModule\022\030\n\020external_name" + - "_id\030\001 \002(\005\022\030\n\020internal_name_id\030\002 \002(\005\022N\n\017p" + - "lain_reference\030\003 \001(\01325.org.jetbrains.kot" + - "lin.serialization.js.ast.Expression\"i\n\006I" + - "mport\022\024\n\014signature_id\030\001 \002(\005\022I\n\nexpressio" + - "n\030\002 \002(\01325.org.jetbrains.kotlin.serializa" + - "tion.js.ast.Expression\"3\n\013NameBinding\022\024\n" + - "\014signature_id\030\001 \002(\005\022\016\n\006nameId\030\002 \002(\005\"\247\001\n\n", - "ClassModel\022\017\n\007name_id\030\001 \002(\005\022\025\n\rsuper_nam" + - "e_id\030\002 \001(\005\022\031\n\021interface_name_id\030\004 \003(\005\022V\n" + - "\026post_declaration_block\030\003 \001(\01326.org.jetb" + - "rains.kotlin.serialization.js.ast.Global" + - "Block\";\n\014InlineModule\022\024\n\014signature_id\030\001 " + - "\002(\005\022\025\n\rexpression_id\030\002 \002(\005\"\034\n\013StringTabl" + - "e\022\r\n\005entry\030\001 \003(\t\"K\n\tNameTable\022>\n\005entry\030\001" + - " \003(\0132/.org.jetbrains.kotlin.serializatio" + - "n.js.ast.Name\"\352\001\n\004Name\022\021\n\ttemporary\030\001 \002(" + - "\010\022\022\n\nidentifier\030\002 \001(\005\022L\n\rlocal_name_id\030\003", - " \001(\01325.org.jetbrains.kotlin.serializatio" + - "n.js.ast.LocalAlias\022\027\n\010imported\030\004 \001(\010:\005f" + - "alse\022T\n\020special_function\030\005 \001(\0162:.org.jet" + - "brains.kotlin.serialization.js.ast.Speci" + - "alFunction\"0\n\nLocalAlias\022\025\n\rlocal_name_i" + - "d\030\001 \002(\005\022\013\n\003tag\030\002 \001(\005\"\346\001\n\005Chunk\022L\n\014string" + - "_table\030\001 \002(\01326.org.jetbrains.kotlin.seri" + - "alization.js.ast.StringTable\022H\n\nname_tab" + - "le\030\002 \002(\01324.org.jetbrains.kotlin.serializ" + - "ation.js.ast.NameTable\022E\n\010fragment\030\003 \002(\013", - "23.org.jetbrains.kotlin.serialization.js" + - ".ast.Fragment\"&\n\006Header\022\034\n\024inline_functi" + - "on_tags\030\001 \003(\t*@\n\013SideEffects\022\021\n\rAFFECTS_" + - "STATE\020\001\022\024\n\020DEPENDS_ON_STATE\020\002\022\010\n\004PURE\020\003*" + - "?\n\016InlineStrategy\022\017\n\013AS_FUNCTION\020\000\022\014\n\010IN" + - "_PLACE\020\001\022\016\n\nNOT_INLINE\020\002*\327\001\n\017SpecialFunc" + - "tion\022\032\n\026DEFINE_INLINE_FUNCTION\020\001\022\021\n\rWRAP" + - "_FUNCTION\020\002\022\021\n\rTO_BOXED_CHAR\020\003\022\016\n\nUNBOX_" + - "CHAR\020\004\022\020\n\014SUSPEND_CALL\020\005\022\024\n\020COROUTINE_RE" + - "SULT\020\006\022\030\n\024COROUTINE_CONTROLLER\020\007\022\026\n\022CORO", - "UTINE_RECEIVER\020\010\022\030\n\024SET_COROUTINE_RESULT" + - "\020\tB\024B\022DebugJsAstProtoBuf" + "tatement\022g\n\032inlined_local_declarations\030\r" + + " \003(\0132C.org.jetbrains.kotlin.serializatio" + + "n.js.ast.InlinedLocalDeclarations\"n\n\030Inl", + "inedLocalDeclarations\022\013\n\003tag\030\001 \002(\t\022E\n\005bl" + + "ock\030\002 \002(\01326.org.jetbrains.kotlin.seriali" + + "zation.js.ast.GlobalBlock\"\224\001\n\016ImportedMo" + + "dule\022\030\n\020external_name_id\030\001 \002(\005\022\030\n\020intern" + + "al_name_id\030\002 \002(\005\022N\n\017plain_reference\030\003 \001(" + + "\01325.org.jetbrains.kotlin.serialization.j" + + "s.ast.Expression\"i\n\006Import\022\024\n\014signature_" + + "id\030\001 \002(\005\022I\n\nexpression\030\002 \002(\01325.org.jetbr" + + "ains.kotlin.serialization.js.ast.Express" + + "ion\"3\n\013NameBinding\022\024\n\014signature_id\030\001 \002(\005", + "\022\016\n\006nameId\030\002 \002(\005\"\247\001\n\nClassModel\022\017\n\007name_" + + "id\030\001 \002(\005\022\025\n\rsuper_name_id\030\002 \001(\005\022\031\n\021inter" + + "face_name_id\030\004 \003(\005\022V\n\026post_declaration_b" + + "lock\030\003 \001(\01326.org.jetbrains.kotlin.serial" + + "ization.js.ast.GlobalBlock\";\n\014InlineModu" + + "le\022\024\n\014signature_id\030\001 \002(\005\022\025\n\rexpression_i" + + "d\030\002 \002(\005\"\034\n\013StringTable\022\r\n\005entry\030\001 \003(\t\"K\n" + + "\tNameTable\022>\n\005entry\030\001 \003(\0132/.org.jetbrain" + + "s.kotlin.serialization.js.ast.Name\"\352\001\n\004N" + + "ame\022\021\n\ttemporary\030\001 \002(\010\022\022\n\nidentifier\030\002 \001", + "(\005\022L\n\rlocal_name_id\030\003 \001(\01325.org.jetbrain" + + "s.kotlin.serialization.js.ast.LocalAlias" + + "\022\027\n\010imported\030\004 \001(\010:\005false\022T\n\020special_fun" + + "ction\030\005 \001(\0162:.org.jetbrains.kotlin.seria" + + "lization.js.ast.SpecialFunction\"0\n\nLocal" + + "Alias\022\025\n\rlocal_name_id\030\001 \002(\005\022\013\n\003tag\030\002 \001(" + + "\005\"\346\001\n\005Chunk\022L\n\014string_table\030\001 \002(\01326.org." + + "jetbrains.kotlin.serialization.js.ast.St" + + "ringTable\022H\n\nname_table\030\002 \002(\01324.org.jetb" + + "rains.kotlin.serialization.js.ast.NameTa", + "ble\022E\n\010fragment\030\003 \002(\01323.org.jetbrains.ko" + + "tlin.serialization.js.ast.Fragment\"&\n\006He" + + "ader\022\034\n\024inline_function_tags\030\001 \003(\t*@\n\013Si" + + "deEffects\022\021\n\rAFFECTS_STATE\020\001\022\024\n\020DEPENDS_" + + "ON_STATE\020\002\022\010\n\004PURE\020\003*?\n\016InlineStrategy\022\017" + + "\n\013AS_FUNCTION\020\000\022\014\n\010IN_PLACE\020\001\022\016\n\nNOT_INL" + + "INE\020\002*\327\001\n\017SpecialFunction\022\032\n\026DEFINE_INLI" + + "NE_FUNCTION\020\001\022\021\n\rWRAP_FUNCTION\020\002\022\021\n\rTO_B" + + "OXED_CHAR\020\003\022\016\n\nUNBOX_CHAR\020\004\022\020\n\014SUSPEND_C" + + "ALL\020\005\022\024\n\020COROUTINE_RESULT\020\006\022\030\n\024COROUTINE", + "_CONTROLLER\020\007\022\026\n\022COROUTINE_RECEIVER\020\010\022\030\n" + + "\024SET_COROUTINE_RESULT\020\tB\024B\022DebugJsAstPro" + + "toBuf" }; org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new org.jetbrains.kotlin.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { @@ -53801,12 +53802,12 @@ public final class DebugJsAstProtoBuf { internal_static_org_jetbrains_kotlin_serialization_js_ast_Fragment_fieldAccessorTable = new org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_org_jetbrains_kotlin_serialization_js_ast_Fragment_descriptor, - new java.lang.String[] { "ImportedModule", "ImportEntry", "DeclarationBlock", "ExportBlock", "InitializerBlock", "NameBinding", "ClassModel", "ModuleExpression", "InlineModule", "PackageFqn", "TestsInvocation", "MainInvocation", "InlinedFunctionWrappers", }); - internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor = + new java.lang.String[] { "ImportedModule", "ImportEntry", "DeclarationBlock", "ExportBlock", "InitializerBlock", "NameBinding", "ClassModel", "ModuleExpression", "InlineModule", "PackageFqn", "TestsInvocation", "MainInvocation", "InlinedLocalDeclarations", }); + internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor = getDescriptor().getMessageTypes().get(47); - internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_fieldAccessorTable = new + internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_fieldAccessorTable = new org.jetbrains.kotlin.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedWrapper_descriptor, + internal_static_org_jetbrains_kotlin_serialization_js_ast_InlinedLocalDeclarations_descriptor, new java.lang.String[] { "Tag", "Block", }); internal_static_org_jetbrains_kotlin_serialization_js_ast_ImportedModule_descriptor = getDescriptor().getMessageTypes().get(48); diff --git a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java index 559c6545d8b..6d68261bd79 100644 --- a/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java +++ b/compiler/tests-common/tests/org/jetbrains/kotlin/test/KotlinTestUtils.java @@ -107,9 +107,6 @@ public class KotlinTestUtils { private static final boolean DONT_IGNORE_TESTS_WORKING_ON_COMPATIBLE_BACKEND = Boolean.getBoolean("org.jetbrains.kotlin.dont.ignore.tests.working.on.compatible.backend"); - private static final boolean SKIP_IR_TESTS = - Boolean.getBoolean("org.jetbrains.kotlin.skip.ir.tests"); - private static final boolean AUTOMATICALLY_UNMUTE_PASSED_TESTS = false; private static final boolean AUTOMATICALLY_MUTE_FAILED_TESTS = false; @@ -1048,8 +1045,6 @@ public class KotlinTestUtils { // * sometimes, for too common/general names, it shows many variants to navigate // * it adds an additional step for navigation -- you must choose an exact file to navigate public static void runTest0(DoTest test, TargetBackend targetBackend, String testDataFilePath) throws Exception { - if (SKIP_IR_TESTS && (targetBackend == TargetBackend.JS_IR || targetBackend == TargetBackend.JVM_IR)) return; - File testDataFile = new File(testDataFilePath); boolean isIgnored = isIgnoredTarget(targetBackend, testDataFile); diff --git a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt index 5ec29a3c48b..73b455ee8cf 100644 --- a/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt +++ b/js/js.ast/src/org/jetbrains/kotlin/js/backend/ast/JsProgramFragment.kt @@ -17,5 +17,5 @@ class JsProgramFragment(val scope: JsScope, val packageFqn: String) { val inlineModuleMap: MutableMap = LinkedHashMap() var tests: JsStatement? = null var mainFunction: JsStatement? = null - val inlinedFunctionWrappers = mutableMapOf() + val inlinedLocalDeclarations = mutableMapOf() } diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt index ca6fd420a72..d3229f713a2 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/InliningScope.kt @@ -140,7 +140,7 @@ class ProgramFragmentInliningScope( val allCode: JsBlock get() = JsBlock( - JsBlock(fragment.inlinedFunctionWrappers.values.toList()), + JsBlock(fragment.inlinedLocalDeclarations.values.toList()), fragment.declarationBlock, fragment.exportBlock, JsExpressionStatement(JsFunction(JsDynamicScope, fragment.initializerBlock, "")) @@ -192,7 +192,7 @@ class ProgramFragmentInliningScope( override fun addInlinedDeclaration(tag: String?, declaration: JsStatement) { if (tag != null) { - fragment.inlinedFunctionWrappers.computeIfAbsent(tag) { JsGlobalBlock() }.statements.add(declaration) + fragment.inlinedLocalDeclarations.computeIfAbsent(tag) { JsGlobalBlock() }.statements.add(declaration) } else { additionalDeclarations.add(declaration) } @@ -233,7 +233,7 @@ class PublicInlineFunctionInliningScope( val wrapperBody: JsBlock, override val fragment: JsProgramFragment ) : InliningScope() { - val existingImports = mutableMapOf().also { map -> + private val existingImports = mutableMapOf().also { map -> for (s in wrapperBody.statements) { if (s !is JsVars) continue @@ -243,7 +243,7 @@ class PublicInlineFunctionInliningScope( } } - val additionalStatements = mutableListOf() + private val additionalStatements = mutableListOf() override fun addInlinedDeclaration(tag: String?, declaration: JsStatement) { additionalStatements.add(declaration) diff --git a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt index 35de5a17b6d..37540296fe5 100644 --- a/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt +++ b/js/js.inliner/src/org/jetbrains/kotlin/js/inline/context/FunctionContext.kt @@ -157,7 +157,7 @@ class FunctionContext( private fun fragmentByTag(tag: String): JsProgramFragment? { return inliner.translationResult.inlineFunctionTagMap[tag]?.let { unit -> - inliner.translationResult.translate(unit).fragment.also { loadFragment(it) } + inliner.translationResult.getTranslationResult(unit).fragment.also { loadFragment(it) } } } diff --git a/js/js.serializer/src/js-ast.proto b/js/js.serializer/src/js-ast.proto index 663d025b408..82537f455ae 100644 --- a/js/js.serializer/src/js-ast.proto +++ b/js/js.serializer/src/js-ast.proto @@ -394,10 +394,10 @@ message Fragment { optional string package_fqn = 10; optional Statement tests_invocation = 11; optional Statement main_invocation = 12; - repeated InlinedWrapper inlined_function_wrappers = 13; + repeated InlinedLocalDeclarations inlined_local_declarations = 13; } -message InlinedWrapper { +message InlinedLocalDeclarations { required string tag = 1; required GlobalBlock block = 2; } diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt index 1dd04c7c8cf..a50df293637 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstDeserializer.kt @@ -107,8 +107,8 @@ class JsAstDeserializer(program: JsProgram, private val sourceRoots: Iterablerepeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - java.util.List - getInlinedFunctionWrappersList(); + java.util.List + getInlinedLocalDeclarationsList(); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index); + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index); /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - int getInlinedFunctionWrappersCount(); + int getInlinedLocalDeclarationsCount(); } /** * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.Fragment} @@ -30638,10 +30638,10 @@ public final class JsAstProtoBuf { } case 106: { if (!((mutable_bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = new java.util.ArrayList(); + inlinedLocalDeclarations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00001000; } - inlinedFunctionWrappers_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.PARSER, extensionRegistry)); + inlinedLocalDeclarations_.add(input.readMessage(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.PARSER, extensionRegistry)); break; } } @@ -30671,7 +30671,7 @@ public final class JsAstProtoBuf { inlineModule_ = java.util.Collections.unmodifiableList(inlineModule_); } if (((mutable_bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); } try { unknownFieldsCodedOutput.flush(); @@ -31026,39 +31026,39 @@ public final class JsAstProtoBuf { return mainInvocation_; } - public static final int INLINED_FUNCTION_WRAPPERS_FIELD_NUMBER = 13; - private java.util.List inlinedFunctionWrappers_; + public static final int INLINED_LOCAL_DECLARATIONS_FIELD_NUMBER = 13; + private java.util.List inlinedLocalDeclarations_; /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List getInlinedFunctionWrappersList() { - return inlinedFunctionWrappers_; + public java.util.List getInlinedLocalDeclarationsList() { + return inlinedLocalDeclarations_; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List - getInlinedFunctionWrappersOrBuilderList() { - return inlinedFunctionWrappers_; + public java.util.List + getInlinedLocalDeclarationsOrBuilderList() { + return inlinedLocalDeclarations_; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public int getInlinedFunctionWrappersCount() { - return inlinedFunctionWrappers_.size(); + public int getInlinedLocalDeclarationsCount() { + return inlinedLocalDeclarations_.size(); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index) { - return inlinedFunctionWrappers_.get(index); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index) { + return inlinedLocalDeclarations_.get(index); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapperOrBuilder getInlinedFunctionWrappersOrBuilder( + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarationsOrBuilder getInlinedLocalDeclarationsOrBuilder( int index) { - return inlinedFunctionWrappers_.get(index); + return inlinedLocalDeclarations_.get(index); } private void initFields() { @@ -31074,7 +31074,7 @@ public final class JsAstProtoBuf { packageFqn_ = ""; testsInvocation_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.getDefaultInstance(); mainInvocation_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.getDefaultInstance(); - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -31148,8 +31148,8 @@ public final class JsAstProtoBuf { return false; } } - for (int i = 0; i < getInlinedFunctionWrappersCount(); i++) { - if (!getInlinedFunctionWrappers(i).isInitialized()) { + for (int i = 0; i < getInlinedLocalDeclarationsCount(); i++) { + if (!getInlinedLocalDeclarations(i).isInitialized()) { memoizedIsInitialized = 0; return false; } @@ -31197,8 +31197,8 @@ public final class JsAstProtoBuf { if (((bitField0_ & 0x00000020) == 0x00000020)) { output.writeMessage(12, mainInvocation_); } - for (int i = 0; i < inlinedFunctionWrappers_.size(); i++) { - output.writeMessage(13, inlinedFunctionWrappers_.get(i)); + for (int i = 0; i < inlinedLocalDeclarations_.size(); i++) { + output.writeMessage(13, inlinedLocalDeclarations_.get(i)); } output.writeRawBytes(unknownFields); } @@ -31257,9 +31257,9 @@ public final class JsAstProtoBuf { size += org.jetbrains.kotlin.protobuf.CodedOutputStream .computeMessageSize(12, mainInvocation_); } - for (int i = 0; i < inlinedFunctionWrappers_.size(); i++) { + for (int i = 0; i < inlinedLocalDeclarations_.size(); i++) { size += org.jetbrains.kotlin.protobuf.CodedOutputStream - .computeMessageSize(13, inlinedFunctionWrappers_.get(i)); + .computeMessageSize(13, inlinedLocalDeclarations_.get(i)); } size += unknownFields.size(); memoizedSerializedSize = size; @@ -31379,7 +31379,7 @@ public final class JsAstProtoBuf { bitField0_ = (bitField0_ & ~0x00000400); mainInvocation_ = org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.Statement.getDefaultInstance(); bitField0_ = (bitField0_ & ~0x00000800); - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00001000); return this; } @@ -31459,10 +31459,10 @@ public final class JsAstProtoBuf { } result.mainInvocation_ = mainInvocation_; if (((bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); bitField0_ = (bitField0_ & ~0x00001000); } - result.inlinedFunctionWrappers_ = inlinedFunctionWrappers_; + result.inlinedLocalDeclarations_ = inlinedLocalDeclarations_; result.bitField0_ = to_bitField0_; return result; } @@ -31549,13 +31549,13 @@ public final class JsAstProtoBuf { if (other.hasMainInvocation()) { mergeMainInvocation(other.getMainInvocation()); } - if (!other.inlinedFunctionWrappers_.isEmpty()) { - if (inlinedFunctionWrappers_.isEmpty()) { - inlinedFunctionWrappers_ = other.inlinedFunctionWrappers_; + if (!other.inlinedLocalDeclarations_.isEmpty()) { + if (inlinedLocalDeclarations_.isEmpty()) { + inlinedLocalDeclarations_ = other.inlinedLocalDeclarations_; bitField0_ = (bitField0_ & ~0x00001000); } else { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.addAll(other.inlinedFunctionWrappers_); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.addAll(other.inlinedLocalDeclarations_); } } @@ -31631,8 +31631,8 @@ public final class JsAstProtoBuf { return false; } } - for (int i = 0; i < getInlinedFunctionWrappersCount(); i++) { - if (!getInlinedFunctionWrappers(i).isInitialized()) { + for (int i = 0; i < getInlinedLocalDeclarationsCount(); i++) { + if (!getInlinedLocalDeclarations(i).isInitialized()) { return false; } @@ -32785,127 +32785,127 @@ public final class JsAstProtoBuf { return this; } - private java.util.List inlinedFunctionWrappers_ = + private java.util.List inlinedLocalDeclarations_ = java.util.Collections.emptyList(); - private void ensureInlinedFunctionWrappersIsMutable() { + private void ensureInlinedLocalDeclarationsIsMutable() { if (!((bitField0_ & 0x00001000) == 0x00001000)) { - inlinedFunctionWrappers_ = new java.util.ArrayList(inlinedFunctionWrappers_); + inlinedLocalDeclarations_ = new java.util.ArrayList(inlinedLocalDeclarations_); bitField0_ |= 0x00001000; } } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public java.util.List getInlinedFunctionWrappersList() { - return java.util.Collections.unmodifiableList(inlinedFunctionWrappers_); + public java.util.List getInlinedLocalDeclarationsList() { + return java.util.Collections.unmodifiableList(inlinedLocalDeclarations_); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public int getInlinedFunctionWrappersCount() { - return inlinedFunctionWrappers_.size(); + public int getInlinedLocalDeclarationsCount() { + return inlinedLocalDeclarations_.size(); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper getInlinedFunctionWrappers(int index) { - return inlinedFunctionWrappers_.get(index); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations getInlinedLocalDeclarations(int index) { + return inlinedLocalDeclarations_.get(index); } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder setInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper value) { + public Builder setInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations value) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.set(index, value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.set(index, value); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder setInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.set(index, builderForValue.build()); + public Builder setInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.set(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper value) { + public Builder addInlinedLocalDeclarations(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations value) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(value); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper value) { + public Builder addInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations value) { if (value == null) { throw new NullPointerException(); } - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(index, value); + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(index, value); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(builderForValue.build()); + public Builder addInlinedLocalDeclarations( + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addInlinedFunctionWrappers( - int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.Builder builderForValue) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.add(index, builderForValue.build()); + public Builder addInlinedLocalDeclarations( + int index, org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.Builder builderForValue) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.add(index, builderForValue.build()); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder addAllInlinedFunctionWrappers( - java.lang.Iterable values) { - ensureInlinedFunctionWrappersIsMutable(); + public Builder addAllInlinedLocalDeclarations( + java.lang.Iterable values) { + ensureInlinedLocalDeclarationsIsMutable(); org.jetbrains.kotlin.protobuf.AbstractMessageLite.Builder.addAll( - values, inlinedFunctionWrappers_); + values, inlinedLocalDeclarations_); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder clearInlinedFunctionWrappers() { - inlinedFunctionWrappers_ = java.util.Collections.emptyList(); + public Builder clearInlinedLocalDeclarations() { + inlinedLocalDeclarations_ = java.util.Collections.emptyList(); bitField0_ = (bitField0_ & ~0x00001000); return this; } /** - * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper inlined_function_wrappers = 13; + * repeated .org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations inlined_local_declarations = 13; */ - public Builder removeInlinedFunctionWrappers(int index) { - ensureInlinedFunctionWrappersIsMutable(); - inlinedFunctionWrappers_.remove(index); + public Builder removeInlinedLocalDeclarations(int index) { + ensureInlinedLocalDeclarationsIsMutable(); + inlinedLocalDeclarations_.remove(index); return this; } @@ -32921,8 +32921,8 @@ public final class JsAstProtoBuf { // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.Fragment) } - public interface InlinedWrapperOrBuilder extends - // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + public interface InlinedLocalDeclarationsOrBuilder extends + // @@protoc_insertion_point(interface_extends:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) org.jetbrains.kotlin.protobuf.MessageLiteOrBuilder { /** @@ -32949,30 +32949,30 @@ public final class JsAstProtoBuf { org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.GlobalBlock getBlock(); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations} */ - public static final class InlinedWrapper extends + public static final class InlinedLocalDeclarations extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite implements - // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) - InlinedWrapperOrBuilder { - // Use InlinedWrapper.newBuilder() to construct. - private InlinedWrapper(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { + // @@protoc_insertion_point(message_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) + InlinedLocalDeclarationsOrBuilder { + // Use InlinedLocalDeclarations.newBuilder() to construct. + private InlinedLocalDeclarations(org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder builder) { super(builder); this.unknownFields = builder.getUnknownFields(); } - private InlinedWrapper(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} + private InlinedLocalDeclarations(boolean noInit) { this.unknownFields = org.jetbrains.kotlin.protobuf.ByteString.EMPTY;} - private static final InlinedWrapper defaultInstance; - public static InlinedWrapper getDefaultInstance() { + private static final InlinedLocalDeclarations defaultInstance; + public static InlinedLocalDeclarations getDefaultInstance() { return defaultInstance; } - public InlinedWrapper getDefaultInstanceForType() { + public InlinedLocalDeclarations getDefaultInstanceForType() { return defaultInstance; } private final org.jetbrains.kotlin.protobuf.ByteString unknownFields; - private InlinedWrapper( + private InlinedLocalDeclarations( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { @@ -33035,18 +33035,18 @@ public final class JsAstProtoBuf { makeExtensionsImmutable(); } } - public static org.jetbrains.kotlin.protobuf.Parser PARSER = - new org.jetbrains.kotlin.protobuf.AbstractParser() { - public InlinedWrapper parsePartialFrom( + public static org.jetbrains.kotlin.protobuf.Parser PARSER = + new org.jetbrains.kotlin.protobuf.AbstractParser() { + public InlinedLocalDeclarations parsePartialFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { - return new InlinedWrapper(input, extensionRegistry); + return new InlinedLocalDeclarations(input, extensionRegistry); } }; @java.lang.Override - public org.jetbrains.kotlin.protobuf.Parser getParserForType() { + public org.jetbrains.kotlin.protobuf.Parser getParserForType() { return PARSER; } @@ -33172,53 +33172,53 @@ public final class JsAstProtoBuf { return super.writeReplace(); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.ByteString data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.ByteString data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom(byte[] data) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom(byte[] data) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( byte[] data, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseDelimitedFrom(java.io.InputStream input) + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { return PARSER.parseDelimitedFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseDelimitedFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseDelimitedFrom( java.io.InputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { return PARSER.parseDelimitedFrom(input, extensionRegistry); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input) throws java.io.IOException { return PARSER.parseFrom(input); } - public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parseFrom( + public static org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parseFrom( org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { @@ -33227,21 +33227,21 @@ public final class JsAstProtoBuf { public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } - public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper prototype) { + public static Builder newBuilder(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations prototype) { return newBuilder().mergeFrom(prototype); } public Builder toBuilder() { return newBuilder(this); } /** - * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper} + * Protobuf type {@code org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations} */ public static final class Builder extends org.jetbrains.kotlin.protobuf.GeneratedMessageLite.Builder< - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper, Builder> + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations, Builder> implements - // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapperOrBuilder { - // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.newBuilder() + // @@protoc_insertion_point(builder_implements:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarationsOrBuilder { + // Construct using org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.newBuilder() private Builder() { maybeForceBuilderInitialization(); } @@ -33265,20 +33265,20 @@ public final class JsAstProtoBuf { return create().mergeFrom(buildPartial()); } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper getDefaultInstanceForType() { - return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.getDefaultInstance(); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations getDefaultInstanceForType() { + return org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance(); } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper build() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper result = buildPartial(); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations build() { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations result = buildPartial(); if (!result.isInitialized()) { throw newUninitializedMessageException(result); } return result; } - public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper buildPartial() { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper(this); + public org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations buildPartial() { + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations result = new org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (((from_bitField0_ & 0x00000001) == 0x00000001)) { @@ -33293,8 +33293,8 @@ public final class JsAstProtoBuf { return result; } - public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper other) { - if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper.getDefaultInstance()) return this; + public Builder mergeFrom(org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations other) { + if (other == org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations.getDefaultInstance()) return this; if (other.hasTag()) { bitField0_ |= 0x00000001; tag_ = other.tag_; @@ -33328,11 +33328,11 @@ public final class JsAstProtoBuf { org.jetbrains.kotlin.protobuf.CodedInputStream input, org.jetbrains.kotlin.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper parsedMessage = null; + org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations parsedMessage = null; try { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (org.jetbrains.kotlin.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedWrapper) e.getUnfinishedMessage(); + parsedMessage = (org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf.InlinedLocalDeclarations) e.getUnfinishedMessage(); throw e; } finally { if (parsedMessage != null) { @@ -33479,15 +33479,15 @@ public final class JsAstProtoBuf { return this; } - // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + // @@protoc_insertion_point(builder_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) } static { - defaultInstance = new InlinedWrapper(true); + defaultInstance = new InlinedLocalDeclarations(true); defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedWrapper) + // @@protoc_insertion_point(class_scope:org.jetbrains.kotlin.serialization.js.ast.InlinedLocalDeclarations) } public interface ImportedModuleOrBuilder extends diff --git a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt index 4f80451a41a..ea7ad570002 100644 --- a/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt +++ b/js/js.serializer/src/org/jetbrains/kotlin/serialization/js/ast/JsAstSerializer.kt @@ -115,13 +115,13 @@ class JsAstSerializer(private val jsAstValidator: ((JsProgramFragment, Set - val builder = InlinedWrapper.newBuilder().apply { + fragment.inlinedLocalDeclarations.forEach { (tag, block) -> + val builder = InlinedLocalDeclarations.newBuilder().apply { setTag(tag) setBlock(serializeBlock(block)) } - fragmentBuilder.addInlinedFunctionWrappers(builder.build()) + fragmentBuilder.addInlinedLocalDeclarations(builder.build()) } jsAstValidator?.let { it(fragment, nameMap.keys) } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt index a14176dfdbc..baf603476ca 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/facade/K2JSTranslator.kt @@ -224,7 +224,7 @@ class K2JSTranslator @JvmOverloads constructor( add(fragment.initializerBlock) fragment.tests?.let { add(it) } fragment.mainFunction?.let { add(it) } - addAll(fragment.inlinedFunctionWrappers.values) + addAll(fragment.inlinedLocalDeclarations.values) }) val definedNames = collectDefinedNamesInAllScopes(allCode) diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java index fe45fa1e5db..a41a2f587e9 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/context/StaticContext.java @@ -701,12 +701,12 @@ public final class StaticContext { @Nullable private JsName getModuleInnerName(@NotNull DeclarationDescriptor descriptor) { - JsImportedModule module = getJsImportedModuleModule(descriptor); + JsImportedModule module = getJsImportedModule(descriptor); return module == null ? null : module.getInternalName(); } @Nullable - public JsImportedModule getJsImportedModuleModule(@NotNull DeclarationDescriptor descriptor) { + private JsImportedModule getJsImportedModule(@NotNull DeclarationDescriptor descriptor) { ModuleDescriptor module = DescriptorUtils.getContainingModule(descriptor); if (currentModule == module) { return currentModuleAsImported; @@ -840,7 +840,7 @@ public final class StaticContext { String moduleName = suggestModuleName(declaration); if (moduleName.equals(Namer.KOTLIN_LOWER_NAME)) return null; - JsImportedModule importedModule = getJsImportedModuleModule(declaration); + JsImportedModule importedModule = getJsImportedModule(declaration); if (importedModule == null) return null; return exportModuleForInline(moduleName, importedModule); diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt index 35e2739fb5f..d470f2d5265 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/AstGenerationResult.kt @@ -21,7 +21,6 @@ import org.jetbrains.kotlin.descriptors.ModuleDescriptor import org.jetbrains.kotlin.js.backend.ast.* import org.jetbrains.kotlin.js.config.JsConfig import org.jetbrains.kotlin.js.facade.TranslationUnit -import org.jetbrains.kotlin.js.inline.util.toIdentitySet import org.jetbrains.kotlin.protobuf.CodedInputStream import org.jetbrains.kotlin.serialization.js.ast.JsAstDeserializer import org.jetbrains.kotlin.serialization.js.ast.JsAstProtoBuf @@ -46,7 +45,7 @@ class AstGenerationResult( private val sourceRoots = config.sourceMapRoots.map { File(it) } private val deserializer = JsAstDeserializer(merger.program, sourceRoots) - fun translate(unit: TranslationUnit): FileTranslationResult = + fun getTranslationResult(unit: TranslationUnit): FileTranslationResult = when (unit) { is TranslationUnit.SourceFile -> translatedSourceFiles[unit]!! is TranslationUnit.BinaryAst -> cache.getOrPut(unit) { @@ -62,7 +61,7 @@ class AstGenerationResult( } fun buildProgram(): Pair> { - val fragments = units.map { translate(it).fragment } + val fragments = units.map { getTranslationResult(it).fragment } fragments.forEach { merger.addFragment(it) } return merger.buildProgram() to merger.importedModules.map { it.externalName } } diff --git a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt index 66395110b86..049799c3acd 100644 --- a/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt +++ b/js/js.translator/src/org/jetbrains/kotlin/js/translate/general/Merger.kt @@ -175,7 +175,7 @@ class Merger( fragment.tests?.let { rename(it) } fragment.mainFunction?.let { rename(it) } - fragment.inlinedFunctionWrappers.values.forEach { rename(it) } + fragment.inlinedLocalDeclarations.values.forEach { rename(it) } } private fun Map.rename(rootNode: T): T { @@ -210,7 +210,7 @@ class Merger( fragment.tryUpdateMain() addExportStatements(fragment) - fragment.inlinedFunctionWrappers.forEach { (tag, imports) -> + fragment.inlinedLocalDeclarations.forEach { (tag, imports) -> importedFunctionWrappers.putIfAbsent(tag, imports) } diff --git a/js/js.translator/testData/box/nameClashes/constructorsCrossFile.kt b/js/js.translator/testData/box/nameClashes/constructorsCrossFile.kt index ff48a4bf714..e375f38649d 100644 --- a/js/js.translator/testData/box/nameClashes/constructorsCrossFile.kt +++ b/js/js.translator/testData/box/nameClashes/constructorsCrossFile.kt @@ -1,7 +1,7 @@ // EXPECTED_REACHABLE_NODES: 1276 // FILE: lib.kt -// Force contructor renaming +// Force constructor renaming val dummy = run { if (false) { js("A") @@ -19,7 +19,7 @@ inline fun ok() = A("O").s + A('K').s // FILE: main.kt -// TODO add directives for primary contructor invocations +// TODO add directives for primary constructor invocations // CHECK_CALLED_IN_SCOPE: function=A_init_0 scope=box // CHECK_NOT_CALLED_IN_SCOPE: function=A_init scope=box fun box(): String {