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

Write abi version to mapping file

Browse Source
This commit is contained in:
Michael Bogdanov
2015-09-05 14:22:39 +03:00
parent d1964f5ff2
commit 5805c42305
9 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/ClassFileFactory.java
+8 -2
View File
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.io.DataOutputStream;
import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -28,6 +29,7 @@ import org.jetbrains.annotations.TestOnly;
import org.jetbrains.kotlin.backend.common.output.OutputFile;
import org.jetbrains.kotlin.backend.common.output.OutputFileCollection;
import org.jetbrains.kotlin.codegen.state.GenerationState;
import org.jetbrains.kotlin.load.java.JvmAbi;
import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
import org.jetbrains.kotlin.load.kotlin.PackageParts;
import org.jetbrains.kotlin.name.FqName;
@@ -114,8 +116,12 @@ public class ClassFileFactory implements OutputFileCollection {
@Override
public byte[] asBytes(ClassBuilderFactory factory) {
try {
ByteArrayOutputStream moduleMapping = new ByteArrayOutputStream(1024);
builder.build().writeTo(moduleMapping);
ByteArrayOutputStream moduleMapping = new ByteArrayOutputStream(4*1024);
DataOutputStream dataOutStream = new DataOutputStream(moduleMapping);
dataOutStream.writeInt(1);
dataOutStream.writeInt(JvmAbi.VERSION);
builder.build().writeTo(dataOutStream);
dataOutStream.flush();
return moduleMapping.toByteArray();
}
catch (UnsupportedEncodingException e) {
compiler/backend/src/org/jetbrains/kotlin/codegen/classFileUtils.kt
+1 -1
View File
@@ -38,7 +38,7 @@ private fun List<PackageParts>.addCompiledParts(state: GenerationState): List<Pa
val incrementalCache = state.incrementalCompilationComponents.getIncrementalCache(state.moduleId)
val moduleMappingData = incrementalCache.getModuleMappingData() ?: return this
val mapping = ModuleMapping(moduleMappingData)
val mapping = ModuleMapping.create(moduleMappingData)
incrementalCache.getObsoletePackageParts().forEach {
val i = it.lastIndexOf('/')