From 03ac462dcb26f3d9c1b178752be148d30616638f Mon Sep 17 00:00:00 2001 From: Mikhael Bogdanov Date: Mon, 3 Mar 2014 12:24:30 +0400 Subject: [PATCH] jet->kotlin fix --- .../src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java | 2 +- .../src/org/jetbrains/jet/codegen/inline/MethodInliner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java index 1a87c0de646..bf0d93b50cb 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/InlineCodegenUtil.java @@ -194,7 +194,7 @@ public class InlineCodegenUtil { return false; } - for (String prefix : Arrays.asList("jet/Function", "jet/ExtensionFunction")) { + for (String prefix : Arrays.asList("kotlin/Function", "kotlin/ExtensionFunction")) { if (owner.startsWith(prefix)) { String suffix = owner.substring(prefix.length()); if (isInteger(suffix)) { diff --git a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java index 4884be9e213..baa73e000e1 100644 --- a/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java +++ b/compiler/backend/src/org/jetbrains/jet/codegen/inline/MethodInliner.java @@ -365,7 +365,7 @@ public class MethodInliner { AbstractInsnNode next = cur.getNext(); if (next.getType() == AbstractInsnNode.METHOD_INSN) { 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(); assert cur.getOpcode() == Opcodes.LDC : "checkParameterIsNotNull should go after LDC but " + cur;