Mercurial > hg > truffle
diff graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java @ 18490:ca81508f2a19
Generalize NULL handling to work on arbitrary pointers.
| author | Roland Schatz <roland.schatz@oracle.com> |
|---|---|
| date | Mon, 24 Nov 2014 13:53:14 +0100 |
| parents | f91e40c4bb47 |
| children | be44c1ca8f00 |
line wrap: on
line diff
--- a/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Nov 24 13:20:02 2014 +0100 +++ b/graal/com.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java Mon Nov 24 13:53:14 2014 +0100 @@ -406,7 +406,7 @@ @Override public void emitDeoptimizeCaller(DeoptimizationAction action, DeoptimizationReason reason) { - moveDeoptValuesToThread(getMetaAccess().encodeDeoptActionAndReason(action, reason, 0), JavaConstant.NULL_OBJECT); + moveDeoptValuesToThread(getMetaAccess().encodeDeoptActionAndReason(action, reason, 0), JavaConstant.NULL_POINTER); append(new AMD64HotSpotDeoptimizeCallerOp()); } @@ -581,7 +581,7 @@ append(new AMD64Move.NullCheckOp(load(uncompress), state)); } } else { - assert address.getKind() == Kind.Object : address + " - " + address.getKind() + " not an object!"; + assert address.getKind() == Kind.Object || address.getKind() == Kind.Long : address + " - " + address.getKind() + " not a pointer!"; append(new AMD64Move.NullCheckOp(load(address), state)); } }