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

Minor, delete leftovers from package part refactorings

Browse Source
This commit is contained in:
Alexander Udalov
2015-10-28 21:51:19 +03:00
parent c5ec3b0f6f
commit 925b0e567e
4 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/MemberCodegen.java
-8
View File
@@ -479,14 +479,6 @@ public abstract class MemberCodegen<T extends KtElement/* TODO: & JetDeclaration
return false;
}
public static void generateModuleNameField(
@NotNull GenerationState state,
@NotNull ClassBuilder classBuilder
) {
classBuilder.newField(NO_ORIGIN, ACC_PUBLIC | ACC_STATIC | ACC_FINAL | ACC_SYNTHETIC, JvmAbi.MODULE_NAME_FIELD,
AsmTypes.JAVA_STRING_TYPE.getDescriptor(), null, state.getModuleName());
}
protected void generatePropertyMetadataArrayFieldIfNeeded(@NotNull Type thisAsmType) {
List<KtProperty> delegatedProperties = new ArrayList<KtProperty>();
for (KtDeclaration declaration : ((KtDeclarationContainer) element).getDeclarations()) {
compiler/backend/src/org/jetbrains/kotlin/codegen/MultifileClassCodegen.kt
+1 -4
View File
@@ -29,7 +29,6 @@ import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
import org.jetbrains.kotlin.diagnostics.DiagnosticUtils
import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
import org.jetbrains.kotlin.fileClasses.getFileClassType
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.load.kotlin.PackageParts
import org.jetbrains.kotlin.load.kotlin.incremental.IncrementalPackageFragmentProvider
@@ -138,9 +137,7 @@ public class MultifileClassCodegen(
tasks: Map<CallableMemberDescriptor, () -> Unit>,
partFqNames: List<FqName>
) {
MemberCodegen.generateModuleNameField(state, classBuilder)
for (member in tasks.keySet().sortedWith(MemberComparator.INSTANCE)) {
for (member in tasks.keys.sortedWith(MemberComparator.INSTANCE)) {
tasks[member]!!()
}
compiler/serialization/src/org/jetbrains/kotlin/serialization/DescriptorSerializer.java
+4 -10
View File
@@ -526,16 +526,10 @@ public class DescriptorSerializer {
}
@NotNull
public ProtoBuf.Package.Builder packageProtoWithoutDescriptors() {
ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder();
extension.serializePackage(Collections.<PackageFragmentDescriptor>emptyList(), builder);
return builder;
}
@NotNull
public ProtoBuf.Package.Builder packageProto(@NotNull Collection<PackageFragmentDescriptor> fragments, @Nullable Function1<DeclarationDescriptor, Boolean> skip) {
public ProtoBuf.Package.Builder packageProto(
@NotNull Collection<PackageFragmentDescriptor> fragments,
@Nullable Function1<DeclarationDescriptor, Boolean> skip
) {
ProtoBuf.Package.Builder builder = ProtoBuf.Package.newBuilder();
Collection<DeclarationDescriptor> members = new ArrayList<DeclarationDescriptor>();
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/java/JvmAbi.java
-1
View File
@@ -53,7 +53,6 @@ public final class JvmAbi {
public static final String INSTANCE_FIELD = "INSTANCE";
public static final String DEPRECATED_INSTANCE_FIELD = "INSTANCE$";
public static final String MODULE_NAME_FIELD = "$moduleName";
public static final String DEFAULT_MODULE_NAME = "main";
public static final ClassId REFLECTION_FACTORY_IMPL = ClassId.topLevel(new FqName("kotlin.reflect.jvm.internal.ReflectionFactoryImpl"));