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

Move jet.runtime.ArrayIterator to package "kotlin.jvm.internal"

Browse Source
This commit is contained in:
Alexander Udalov
2014-02-13 20:23:19 +04:00
parent 9d9d73268a
commit 19acc8c6c4
9 changed files with 161 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/intrinsics/ArrayIterator.java
+2 -2
View File
@@ -58,7 +58,7 @@ public class ArrayIterator extends IntrinsicMethod {
assert funDescriptor != null;
ClassDescriptor containingDeclaration = (ClassDescriptor) funDescriptor.getContainingDeclaration().getOriginal();
if (containingDeclaration.equals(KotlinBuiltIns.getInstance().getArray())) {
v.invokestatic("jet/runtime/ArrayIterator", "iterator", "([Ljava/lang/Object;)Ljava/util/Iterator;");
v.invokestatic("kotlin/jvm/internal/InternalPackage", "iterator", "([Ljava/lang/Object;)Ljava/util/Iterator;");
return getType(Iterator.class);
}
@@ -68,7 +68,7 @@ public class ArrayIterator extends IntrinsicMethod {
if (containingDeclaration.equals(arrayClass)) {
String iteratorDesc = asmDescByFqNameWithoutInnerClasses(new FqName("jet." + primitiveType.getTypeName() + "Iterator"));
String methodSignature = "([" + asmTypeForPrimitive(jvmPrimitiveType) + ")" + iteratorDesc;
v.invokestatic("jet/runtime/ArrayIterator", "iterator", methodSignature);
v.invokestatic("kotlin/jvm/internal/InternalPackage", "iterator", methodSignature);
return Type.getType(iteratorDesc);
}
}