Mercurial > hg > truffle
changeset 15375:1b82cd9e72e9
Remove CompilationResult.Mark.references
| author | Gilles Duboscq <duboscq@ssw.jku.at> |
|---|---|
| date | Thu, 24 Apr 2014 17:06:23 +0200 |
| parents | 669536c4949a |
| children | b3cd96f137a6 |
| files | graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java |
| diffstat | 4 files changed, 9 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Fri Apr 25 10:13:54 2014 +0200 +++ b/graal/com.oracle.graal.api.code/src/com/oracle/graal/api/code/CompilationResult.java Thu Apr 24 17:06:23 2014 +0200 @@ -432,22 +432,20 @@ private static final long serialVersionUID = 3612943150662354844L; public final Object id; - public final Mark[] references; - public Mark(int pcOffset, Object id, Mark[] references) { + public Mark(int pcOffset, Object id) { super(pcOffset); this.id = id; - this.references = references; } @Override public String toString() { if (id == null) { - return String.format("%d[<mark with %d references>]", pcOffset, references.length); + return String.format("%d[<mar>]", pcOffset); } else if (id instanceof Integer) { - return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, Integer.toHexString((Integer) id)); + return String.format("%d[<mark with id %s>]", pcOffset, Integer.toHexString((Integer) id)); } else { - return String.format("%d[<mark with %d references and id %s>]", pcOffset, references.length, id.toString()); + return String.format("%d[<mark with id %s>]", pcOffset, id.toString()); } } } @@ -635,10 +633,9 @@ * * @param codePos the position in the code that is covered by the handler * @param markId the identifier for this mark - * @param references an array of other marks that this mark references */ - public Mark recordMark(int codePos, Object markId, Mark[] references) { - Mark mark = new Mark(codePos, markId, references); + public Mark recordMark(int codePos, Object markId) { + Mark mark = new Mark(codePos, markId); marks.add(mark); return mark; }
--- a/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Fri Apr 25 10:13:54 2014 +0200 +++ b/graal/com.oracle.graal.hotspot.hsail/src/com/oracle/graal/hotspot/hsail/HSAILHotSpotBackend.java Thu Apr 24 17:06:23 2014 +0200 @@ -302,9 +302,8 @@ for (CodeAnnotation annotation : hostCode.getAnnotations()) { result.addAnnotation(annotation); } - CompilationResult.Mark[] noMarks = {}; for (Mark mark : hostCode.getMarks()) { - result.recordMark(mark.pcOffset, mark.id, noMarks); + result.recordMark(mark.pcOffset, mark.id); } for (ExceptionHandler handler : hostCode.getExceptionHandlers()) { result.recordExceptionHandler(handler.pcOffset, handler.handlerPos);
--- a/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Fri Apr 25 10:13:54 2014 +0200 +++ b/graal/com.oracle.graal.lir/src/com/oracle/graal/lir/asm/CompilationResultBuilder.java Thu Apr 24 17:06:23 2014 +0200 @@ -92,14 +92,8 @@ compilationResult.setTotalFrameSize(frameSize); } - private static final CompilationResult.Mark[] NO_REFS = {}; - public CompilationResult.Mark recordMark(Object id) { - return compilationResult.recordMark(asm.position(), id, NO_REFS); - } - - public CompilationResult.Mark recordMark(Object id, CompilationResult.Mark... references) { - return compilationResult.recordMark(asm.position(), id, references); + return compilationResult.recordMark(asm.position(), id); } public void blockComment(String s) {
--- a/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Fri Apr 25 10:13:54 2014 +0200 +++ b/graal/com.oracle.graal.replacements.test/src/com/oracle/graal/replacements/test/InstanceOfTest.java Thu Apr 24 17:06:23 2014 +0200 @@ -279,9 +279,8 @@ @Test public void test10() { - Mark[] noMarks = {}; Call callAt63 = new Call(null, 63, 5, true, null); - Mark markAt63 = new Mark(63, "1", noMarks); + Mark markAt63 = new Mark(63, "1"); test("compareSites", callAt63, callAt63); test("compareSites", callAt63, markAt63); test("compareSites", markAt63, callAt63);