From ebbc68dfaed7a95f4f1038d628746b8a951d8aa4 Mon Sep 17 00:00:00 2001
From: Michael Bogdanov <mikhael.bogdanov@jetbrains.com>
Date: Tue, 15 Dec 2015 13:01:08 +0300
Subject: [PATCH] isInlineFunction renamed to isInlineMethodContext

---
 .../src/org/jetbrains/kotlin/codegen/FunctionCodegen.java     | 4 ++--
 .../org/jetbrains/kotlin/codegen/context/CodegenContext.java  | 2 +-
 .../org/jetbrains/kotlin/codegen/context/MethodContext.java   | 2 +-
 .../jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
index 0f75d5be47b..36b145e24f1 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
@@ -371,7 +371,7 @@ public class FunctionCodegen {
         else {
             FrameMap frameMap = createFrameMap(parentCodegen.state, functionDescriptor, signature, isStaticMethod(context.getContextKind(),
                                                                                                                   functionDescriptor));
-            if (context.isInlineFunction()) {
+            if (context.isInlineMethodContext()) {
                 functionFakeIndex = frameMap.enterTemp(Type.INT_TYPE);
             }
 
@@ -396,7 +396,7 @@ public class FunctionCodegen {
         Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper);
         generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind());
 
-        if (context.isInlineFunction() && functionFakeIndex != -1) {
+        if (context.isInlineMethodContext() && functionFakeIndex != -1) {
             mv.visitLocalVariable(
                     JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION + functionDescriptor.getName().asString(),
                     Type.INT_TYPE.getDescriptor(), null,
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
index 78048378147..79b8147d0e3 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
@@ -649,7 +649,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
     }
 
     public boolean isInlineMethodContext() {
-        return this instanceof MethodContext && ((MethodContext) this).isInlineFunction();
+        return false;
     }
 
     @NotNull
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
index cb5ed98e64f..f6a4c8a233c 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
@@ -120,7 +120,7 @@ public class MethodContext extends CodegenContext<CallableMemberDescriptor> {
         return "Method: " + getContextDescriptor();
     }
 
-    public boolean isInlineFunction() {
+    public boolean isInlineMethodContext() {
         return InlineUtil.isInline(getContextDescriptor());
     }
 
diff --git a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
index 124d0b238f7..753cde3f09e 100644
--- a/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
+++ b/compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
@@ -131,7 +131,7 @@ public class InlineCodegenUtil {
             CodegenContext<?> parentContext = context.getParentContext();
             while (parentContext != null) {
                 if (parentContext instanceof MethodContext) {
-                    if (((MethodContext) parentContext).isInlineFunction()) {
+                    if (((MethodContext) parentContext).isInlineMethodContext()) {
                         //just init default one to one mapping
                         codegen.getOrCreateSourceMapper();
                         break;
@@ -398,7 +398,7 @@ public class InlineCodegenUtil {
     }
 
     public static boolean isFinallyMarkerRequired(@NotNull MethodContext context) {
-        return context.isInlineFunction() || context.isInliningLambda();
+        return context.isInlineMethodContext() || context.isInliningLambda();
     }
 
     public static int getConstant(AbstractInsnNode ins) {