# HG changeset patch # User Christian Humer # Date 1395168322 -3600 # Node ID 40eedef0a586688f6f64a97f43f3fd6e906dd19b # Parent 918b0360bdb2289bb25541feeffa26bd5a6ab75e Truffle-DSL: fixed some findbugs errors for (CR-2223) diff -r 918b0360bdb2 -r 40eedef0a586 graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java --- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java Tue Mar 18 19:33:49 2014 +0100 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/node/NodeCodeGenerator.java Tue Mar 18 19:45:22 2014 +0100 @@ -214,19 +214,23 @@ if (method.getModifiers().contains(STATIC)) { builder.type(targetClass.asType()); } else { - ActualParameter parameter = null; + ActualParameter firstParameter = null; for (ActualParameter searchParameter : targetMethod.getParameters()) { if (searchParameter.getSpecification().isSignature()) { - parameter = searchParameter; + firstParameter = searchParameter; break; } } - ActualParameter sourceParameter = sourceMethod.findParameter(parameter.getLocalName()); + if (firstParameter == null) { + throw new AssertionError(); + } + + ActualParameter sourceParameter = sourceMethod.findParameter(firstParameter.getLocalName()); if (castedValues && sourceParameter != null) { - builder.string(valueName(sourceParameter, parameter)); + builder.string(valueName(sourceParameter, firstParameter)); } else { - builder.string(valueName(parameter)); + builder.string(valueName(firstParameter)); } } } @@ -2631,6 +2635,9 @@ } CodeExecutableElement superConstructor = createSuperConstructor(clazz, constructor); + if (superConstructor == null) { + continue; + } CodeTree body = superConstructor.getBodyTree(); CodeTreeBuilder builder = superConstructor.createBuilder(); builder.tree(body);