Permalink
Browse files

Add explicit int->boolean conversions, as required by JDK 1.8.0_91.

  • Loading branch information...
1 parent 0265480 commit f89ee377ab4b197959191849e8acfba16f7cbda0 @broneill broneill committed with jesterpm Apr 25, 2016
@@ -1818,6 +1818,7 @@ private void generateClass() {
b.loadConstant(PROPERTY_STATE_MASK << ((versionOrdinal & 0xf) * 2));
b.math(Opcode.IAND);
// zero == false, not zero == true
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}
}
@@ -2481,6 +2482,7 @@ private void branchIfDirty(CodeBuilder b, boolean includePk, Label label) {
b.loadConstant(PROPERTY_STATE_MASK << ((ordinal & 0xf) * 2));
b.math(Opcode.IAND);
// zero == false, not zero == true
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
return;
}
@@ -1239,6 +1239,7 @@ private JDBCStorableGenerator(final JDBCStorableInfo<S> info,
yieldConAndHandleException(b, supportVar, tryBeforeCon, conVar, tryAfterCon, true);
b.loadLocal(updateCount);
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}
@@ -1277,6 +1278,7 @@ private JDBCStorableGenerator(final JDBCStorableInfo<S> info,
yieldConAndHandleException(b, supportVar, tryBeforeCon, conVar, tryAfterCon, true);
b.loadLocal(resultVar);
+ b.convert(TypeDesc.INT, TypeDesc.BOOLEAN);
b.returnValue(TypeDesc.BOOLEAN);
}

0 comments on commit f89ee37

Please sign in to comment.