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

Wrong abi test fix

Browse Source
This commit is contained in:
Michael Bogdanov
2015-08-31 12:42:58 +03:00
parent 939f28f293
commit 84649e4b26
11 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/descriptor.loader.java/src/org/jetbrains/kotlin/load/kotlin/DeserializedDescriptorResolver.java
+7 -3
View File
@@ -70,7 +70,7 @@ public final class DeserializedDescriptorResolver {
@Nullable
public JetScope createKotlinPackageScope(@NotNull PackageFragmentDescriptor descriptor, @NotNull KotlinJvmBinaryClass kotlinClass) {
//TODO add assertion from readData(kotlinClass, CLASS);
String[] data = kotlinClass.getClassHeader().getAnnotationData();
String[] data = readData(kotlinClass, KotlinClassHeader.Kind.FILE_FACADE);
if (data != null) {
//all classes are included in java scope
PackageData packageData = JvmProtoBufUtil.readPackageDataFrom(data);
@@ -92,8 +92,12 @@ public final class DeserializedDescriptorResolver {
List<JetScope> list = new ArrayList<JetScope>();
for (KotlinJvmBinaryClass callable : packageParts) {
JetScope scope = createKotlinPackageScope(descriptor, callable);
assert scope != null : "Can't create scope for " + callable;
list.add(scope);
if (scope != null) {
list.add(scope);
}
}
if (list.isEmpty()) {
return JetScope.Empty.INSTANCE$;
}
return new DeserializedNewPackageMemberScope(descriptor, list);
}