Mercurial > hg > graal-compiler
changeset 13492:896c8712c7b4
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Mon, 30 Dec 2013 20:36:04 +0000 |
parents | 807ad2134a6b (diff) 33f0ac112264 (current diff) |
children | 03bb0ee05409 |
files | |
diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/codewriter/AbstractCodeWriter.java Mon Dec 30 16:39:50 2013 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/codewriter/AbstractCodeWriter.java Mon Dec 30 20:36:04 2013 +0000 @@ -682,7 +682,9 @@ int end = Math.min(i + nextSize, string.length()); - assert lineLength + (end - i) + 2 < MAX_LINE_LENGTH; + // TODO(CH): fails in normal usage - output ok though + // assert lineLength + (end - i) + 2 < MAX_LINE_LENGTH; + write("\"" + string.substring(i, end) + "\""); size = nextSize; }
--- a/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/TemplateMethod.java Mon Dec 30 16:39:50 2013 +0200 +++ b/graal/com.oracle.truffle.dsl.processor/src/com/oracle/truffle/dsl/processor/template/TemplateMethod.java Mon Dec 30 20:36:04 2013 +0000 @@ -242,7 +242,9 @@ } public void updateSignature(Signature signature) { - assert signature.size() >= 1; + // TODO(CH): fails in normal usage - output ok though + // assert signature.size() >= 1; + int signatureIndex = 0; for (ActualParameter parameter : getReturnTypeAndParameters()) { if (!parameter.getSpecification().isSignature()) {