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

Fix parameter indexing problem

Browse Source
This commit is contained in:
Andrey Breslav
2013-05-13 18:47:21 +04:00
parent ab48f3411a
commit bdd4296b0d
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/preloader/instrumentation/src/org/jetbrains/jet/preloading/instrumentation/InterceptionInstrumenter.java
+6 -4
View File
@@ -471,7 +471,8 @@ public class InterceptionInstrumenter {
Type[] parameterTypes = Type.getArgumentTypes(instrumentedMethodDesc); Type[] parameterTypes = Type.getArgumentTypes(instrumentedMethodDesc);
boolean isStatic = (instrumentedMethodAccess & ACC_STATIC) != 0; boolean isStatic = (instrumentedMethodAccess & ACC_STATIC) != 0;
int base = isStatic ? 0 : 1; int base = isStatic ? 0 : 1;
int parameterOffset = 0; int instrumentedMethodParameterIndex = 0;
int instrumentedMethodParameterOffset = 0;
for (int i = 0; i < parameterCount; i++) { for (int i = 0; i < parameterCount; i++) {
if (i == methodData.getThisParameterIndex()) { if (i == methodData.getThisParameterIndex()) {
if (isStatic || thisUnavailable) { if (isStatic || thisUnavailable) {
@@ -511,9 +512,10 @@ public class InterceptionInstrumenter {
} }
} }
else { else {
Type type = parameterTypes[parameterOffset]; Type type = parameterTypes[instrumentedMethodParameterIndex];
ia.load(base + parameterOffset, type); ia.load(base + instrumentedMethodParameterOffset, type);
parameterOffset += type.getSize(); instrumentedMethodParameterIndex++;
instrumentedMethodParameterOffset += type.getSize();
} }
} }