i21023/JavaTXCompilerInJavaTX
2
0
Fork 0
forked from JavaTX/JavaCompilerCore
Code Pull Requests Activity

Merge branch 'bytecode2' of ssh://gohorb.ba-horb.de/bahome/projekt/git/JavaCompilerCore into unify-test

Browse Source
This commit is contained in:
Martin Plümicke 2018-10-11 16:58:06 +02:00
commit 2869f07a58
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
View File

@ -282,7 +282,6 @@ public class BytecodeGenMethod implements StatementVisitor {
default: default:
break; break;
} }
} }
private String getLargerType(String lexpType, String rexpType) { private String getLargerType(String lexpType, String rexpType) {
@ -782,7 +781,7 @@ public class BytecodeGenMethod implements StatementVisitor {
doUnboxing(getResolvedType(methodCall.getType())); doUnboxing(getResolvedType(methodCall.getType()));
} }
if(methodRefl == null && !isReturnStmt) { if(methodRefl == null/* && !isReturnStmt*/) {
if(isBinaryExp) if(isBinaryExp)
doUnboxing(getResolvedType(methodCall.getType())); doUnboxing(getResolvedType(methodCall.getType()));
} }
@ -1081,7 +1080,11 @@ public class BytecodeGenMethod implements StatementVisitor {
break; break;
case "java/lang/Integer": case "java/lang/Integer":
// zweite Argument isLong // zweite Argument isLong
visitIntegerLiteral(((Double) value).intValue(), false); // visitIntegerLiteral(((Double) value).intValue(), false);
if(value instanceof Double)
visitIntegerLiteral(((Double) value).intValue(), false);
if(value instanceof Integer)
visitIntegerLiteral(((Integer) value).intValue(), false);
break; break;
case "java/lang/Long": case "java/lang/Long":
visitLongLiteral(((Double) value).longValue(), true); visitLongLiteral(((Double) value).longValue(), true);

3
src/de/dhbwstuttgart/bytecode/signature/Signature.java
View File

@ -432,6 +432,9 @@ public class Signature {
while(subAndSuperTph.containsKey(superTph)) { while(subAndSuperTph.containsKey(superTph)) {
superTph = subAndSuperTph.get(superTph); superTph = subAndSuperTph.get(superTph);
if(tphsInRel.containsValue(superTph)) {
break;
}
tphsInRel.put(tphsInRel.size(), superTph); tphsInRel.put(tphsInRel.size(), superTph);
numOfVisitedPairs++; numOfVisitedPairs++;
} }