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

isInlineFunction renamed to isInlineMethodContext

Browse Source
This commit is contained in:
Michael Bogdanov
2015-12-15 13:01:08 +03:00
parent 9cad1a912a
commit ebbc68dfae
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/FunctionCodegen.java
+2 -2
View File
@@ -371,7 +371,7 @@ public class FunctionCodegen {
else { else {
FrameMap frameMap = createFrameMap(parentCodegen.state, functionDescriptor, signature, isStaticMethod(context.getContextKind(), FrameMap frameMap = createFrameMap(parentCodegen.state, functionDescriptor, signature, isStaticMethod(context.getContextKind(),
functionDescriptor)); functionDescriptor));
if (context.isInlineFunction()) { if (context.isInlineMethodContext()) {
functionFakeIndex = frameMap.enterTemp(Type.INT_TYPE); functionFakeIndex = frameMap.enterTemp(Type.INT_TYPE);
} }
@@ -396,7 +396,7 @@ public class FunctionCodegen {
Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper); Type thisType = getThisTypeForFunction(functionDescriptor, context, typeMapper);
generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind()); generateLocalVariableTable(mv, signature, functionDescriptor, thisType, methodBegin, methodEnd, context.getContextKind());
if (context.isInlineFunction() && functionFakeIndex != -1) { if (context.isInlineMethodContext() && functionFakeIndex != -1) {
mv.visitLocalVariable( mv.visitLocalVariable(
JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION + functionDescriptor.getName().asString(), JvmAbi.LOCAL_VARIABLE_NAME_PREFIX_INLINE_FUNCTION + functionDescriptor.getName().asString(),
Type.INT_TYPE.getDescriptor(), null, Type.INT_TYPE.getDescriptor(), null,
compiler/backend/src/org/jetbrains/kotlin/codegen/context/CodegenContext.java
+1 -1
View File
@@ -649,7 +649,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
} }
public boolean isInlineMethodContext() { public boolean isInlineMethodContext() {
return this instanceof MethodContext && ((MethodContext) this).isInlineFunction(); return false;
} }
@NotNull @NotNull
compiler/backend/src/org/jetbrains/kotlin/codegen/context/MethodContext.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class MethodContext extends CodegenContext<CallableMemberDescriptor> {
return "Method: " + getContextDescriptor(); return "Method: " + getContextDescriptor();
} }
public boolean isInlineFunction() { public boolean isInlineMethodContext() {
return InlineUtil.isInline(getContextDescriptor()); return InlineUtil.isInline(getContextDescriptor());
} }
compiler/backend/src/org/jetbrains/kotlin/codegen/inline/InlineCodegenUtil.java
+2 -2
View File
@@ -131,7 +131,7 @@ public class InlineCodegenUtil {
CodegenContext<?> parentContext = context.getParentContext(); CodegenContext<?> parentContext = context.getParentContext();
while (parentContext != null) { while (parentContext != null) {
if (parentContext instanceof MethodContext) { if (parentContext instanceof MethodContext) {
if (((MethodContext) parentContext).isInlineFunction()) { if (((MethodContext) parentContext).isInlineMethodContext()) {
//just init default one to one mapping //just init default one to one mapping
codegen.getOrCreateSourceMapper(); codegen.getOrCreateSourceMapper();
break; break;
@@ -398,7 +398,7 @@ public class InlineCodegenUtil {
} }
public static boolean isFinallyMarkerRequired(@NotNull MethodContext context) { public static boolean isFinallyMarkerRequired(@NotNull MethodContext context) {
return context.isInlineFunction() || context.isInliningLambda(); return context.isInlineMethodContext() || context.isInliningLambda();
} }
public static int getConstant(AbstractInsnNode ins) { public static int getConstant(AbstractInsnNode ins) {