isInlineFunction renamed to isInlineMethodContext

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
@@ -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,
@@ -649,7 +649,7 @@ public abstract class CodegenContext<T extends DeclarationDescriptor> {
}
public boolean isInlineMethodContext() {
return this instanceof MethodContext && ((MethodContext) this).isInlineFunction();
return false;
}
@NotNull
@@ -120,7 +120,7 @@ public class MethodContext extends CodegenContext<CallableMemberDescriptor> {
return "Method: " + getContextDescriptor();
}
public boolean isInlineFunction() {
public boolean isInlineMethodContext() {
return InlineUtil.isInline(getContextDescriptor());
}
@@ -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) {