Mercurial > hg > truffle
changeset 21553:0910a9497b02
merge fixes
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 26 May 2015 20:29:07 +0200 |
parents | 9579a3c62a9e |
children | b1530a6cce8c |
files | graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Tue May 26 17:21:29 2015 +0200 +++ b/graal/com.oracle.graal.compiler.sparc/src/com/oracle/graal/compiler/sparc/SPARCLIRGenerator.java Tue May 26 20:29:07 2015 +0200 @@ -59,6 +59,7 @@ import com.oracle.graal.lir.sparc.SPARCMove.MoveFpGpVIS3; import com.oracle.graal.lir.sparc.SPARCMove.MoveFromRegOp; import com.oracle.graal.lir.sparc.SPARCMove.MoveToRegOp; +import com.oracle.graal.lir.sparc.SPARCMove.NullCheckOp; import com.oracle.graal.lir.sparc.SPARCMove.SPARCStackMove; import com.oracle.graal.lir.sparc.SPARCMove.StackLoadAddressOp; import com.oracle.graal.phases.util.*;
--- a/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Tue May 26 17:21:29 2015 +0200 +++ b/graal/com.oracle.graal.lir.sparc/src/com/oracle/graal/lir/sparc/SPARCMove.java Tue May 26 20:29:07 2015 +0200 @@ -849,7 +849,7 @@ masm.ldx(addr, dst); break; default: - throw GraalInternalError.shouldNotReachHere(); + throw JVMCIError.shouldNotReachHere(); } } } @@ -888,7 +888,7 @@ masm.stdf(asRegister(input), addr); break; default: - throw GraalInternalError.shouldNotReachHere("missing: " + kind); + throw JVMCIError.shouldNotReachHere("missing: " + kind); } } }