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

Properly index new variables after method inline

Browse Source
This commit is contained in:
Mikhael Bogdanov
2014-02-12 11:58:35 +04:00
parent 55e03dd8b3
commit 5740d99233
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/jet/codegen/asm/InlineAdapter.java
+7
View File
@@ -32,6 +32,8 @@ public class InlineAdapter extends InstructionAdapter {
private final List<CatchBlock> blocks = new ArrayList<CatchBlock>(); private final List<CatchBlock> blocks = new ArrayList<CatchBlock>();
private int nextLocalIndexBeforeInline = -1;
public InlineAdapter(MethodVisitor mv, int localsSize) { public InlineAdapter(MethodVisitor mv, int localsSize) {
super(mv); super(mv);
nextLocalIndex = localsSize; nextLocalIndex = localsSize;
@@ -62,6 +64,11 @@ public class InlineAdapter extends InstructionAdapter {
public void setInlining(boolean isInlining) { public void setInlining(boolean isInlining) {
this.isInlining = isInlining; this.isInlining = isInlining;
if (isInlining) {
nextLocalIndexBeforeInline = nextLocalIndex;
} else {
nextLocalIndex = nextLocalIndexBeforeInline;
}
} }
@Override @Override
compiler/backend/src/org/jetbrains/jet/codegen/asm/MethodInliner.java
-1
View File
@@ -104,7 +104,6 @@ public class MethodInliner {
final Iterator<ConstructorInvocation> iterator = constructorInvocationList.iterator(); final Iterator<ConstructorInvocation> iterator = constructorInvocationList.iterator();
//TODO add reset to counter
InlineAdapter inliner = new InlineAdapter(resultNode, parameters.totalSize()) { InlineAdapter inliner = new InlineAdapter(resultNode, parameters.totalSize()) {
private ConstructorInvocation invocation; private ConstructorInvocation invocation;