Mercurial > hg > graal-compiler
comparison graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java @ 11838:16d0eb40d31c
Merge
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 30 Sep 2013 18:05:25 +0200 |
parents | 365d8f385fb5 d72c314260dc |
children | 280f97f13d54 |
comparison
equal
deleted
inserted
replaced
11831:4187b229d2ec | 11838:16d0eb40d31c |
---|---|
671 } | 671 } |
672 return result; | 672 return result; |
673 } | 673 } |
674 | 674 |
675 @Override | 675 @Override |
676 public void emitDeoptimize(DeoptimizationAction action, DeoptimizingNode deopting) { | 676 public void emitDeoptimize(Value actionAndReason, DeoptimizingNode deopting) { |
677 append(new ReturnOp(Value.ILLEGAL)); | 677 append(new ReturnOp(Value.ILLEGAL)); |
678 } | 678 } |
679 | 679 |
680 @Override | 680 @Override |
681 public void emitMembar(int barriers) { | 681 public void emitMembar(int barriers) { |