Mercurial > hg > graal-jvmci-8
changeset 15232:7aa0ef5348e5
Merge.
author | Thomas Wuerthinger <thomas.wuerthinger@oracle.com> |
---|---|
date | Fri, 18 Apr 2014 14:02:40 +0200 |
parents | babe13eb6118 (current diff) aee7eeb554ad (diff) |
children | 27afd57655ba |
files | |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Fri Apr 18 14:02:28 2014 +0200 +++ b/graal/com.oracle.graal.compiler.ptx/src/com/oracle/graal/compiler/ptx/PTXLIRGenerator.java Fri Apr 18 14:02:40 2014 +0200 @@ -830,13 +830,12 @@ @Override public void emitReturn(Value input) { - AllocatableValue operand = Value.ILLEGAL; if (input != null) { - operand = resultOperandFor(input.getKind()); + AllocatableValue operand = resultOperandFor(input.getKind()); // Load the global memory address from return parameter Variable loadVar = emitLoadReturnAddress(operand.getKind(), operand, null); - // Store result in global memory whose location is loadVar - emitStoreReturnValue(operand.getKind(), loadVar, operand, null); + // Store input in global memory whose location is loadVar + emitStoreReturnValue(operand.getKind(), loadVar, input, null); } emitReturnNoVal(); }