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

jet->kotlin fix

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-03-03 12:24:30 +04:00
parent 6d1effe981
commit 03ac462dcb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java
+1 -1
View File
@@ -194,7 +194,7 @@ public class InlineCodegenUtil {
return false; return false;
} }
for (String prefix : Arrays.asList("jet/Function", "jet/ExtensionFunction")) { for (String prefix : Arrays.asList("kotlin/Function", "kotlin/ExtensionFunction")) {
if (owner.startsWith(prefix)) { if (owner.startsWith(prefix)) {
String suffix = owner.substring(prefix.length()); String suffix = owner.substring(prefix.length());
if (isInteger(suffix)) { if (isInteger(suffix)) {
compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java
+1 -1
View File
@@ -365,7 +365,7 @@ public class MethodInliner {
AbstractInsnNode next = cur.getNext(); AbstractInsnNode next = cur.getNext();
if (next.getType() == AbstractInsnNode.METHOD_INSN) { if (next.getType() == AbstractInsnNode.METHOD_INSN) {
MethodInsnNode methodInsnNode = (MethodInsnNode) next; MethodInsnNode methodInsnNode = (MethodInsnNode) next;
if (methodInsnNode.name.equals("checkParameterIsNotNull") && methodInsnNode.owner.equals("jet/runtime/Intrinsics")) { if (methodInsnNode.name.equals("checkParameterIsNotNull") && methodInsnNode.owner.equals("kotlin/jvm/internal/Intrinsics")) {
AbstractInsnNode prev = cur.getPrevious(); AbstractInsnNode prev = cur.getPrevious();
assert cur.getOpcode() == Opcodes.LDC : "checkParameterIsNotNull should go after LDC but " + cur; assert cur.getOpcode() == Opcodes.LDC : "checkParameterIsNotNull should go after LDC but " + cur;