# HG changeset patch # User Josef Eisl # Date 1433153673 -7200 # Node ID b41488bb4b7a6f53ab8eac87da6be3872afa5ddb # Parent ed3d7af510bd882e374caaed030f4f52c9bbe457 LIRIntrospection#scanField: use isAssignableFrom to check for constants. diff -r ed3d7af510bd -r b41488bb4b7a graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java --- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Wed Jun 03 09:28:41 2015 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/LIRIntrospection.java Mon Jun 01 12:14:33 2015 +0200 @@ -165,7 +165,7 @@ @Override protected void scanField(Field field, long offset) { Class type = field.getType(); - if (VALUE_CLASS.isAssignableFrom(type) && type != CONSTANT_CLASS) { + if (VALUE_CLASS.isAssignableFrom(type) && !CONSTANT_CLASS.isAssignableFrom(type)) { assert !Modifier.isFinal(field.getModifiers()) : "Value field must not be declared final because it is modified by register allocator: " + field; OperandModeAnnotation annotation = getOperandModeAnnotation(field); assert annotation != null : "Field must have operand mode annotation: " + field;