diff options
4 files changed, 50 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_x86_64.cc b/compiler/optimizing/code_generator_x86_64.cc index fe2abe4793..cc46a07dcb 100644 --- a/compiler/optimizing/code_generator_x86_64.cc +++ b/compiler/optimizing/code_generator_x86_64.cc @@ -2834,7 +2834,7 @@ void InstructionCodeGeneratorX86_64::VisitTypeConversion(HTypeConversion* conver } else if (in.IsConstant()) { int64_t v = in.GetConstant()->AsLongConstant()->GetValue(); XmmRegister dest = out.AsFpuRegister<XmmRegister>(); - codegen_->Load64BitValue(dest, static_cast<double>(v)); + codegen_->Load32BitValue(dest, static_cast<float>(v)); } else { __ cvtsi2ss(out.AsFpuRegister<XmmRegister>(), Address(CpuRegister(RSP), in.GetStackIndex()), true); diff --git a/test/593-checker-long-to-float-regression/expected.txt b/test/593-checker-long-to-float-regression/expected.txt new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/test/593-checker-long-to-float-regression/expected.txt diff --git a/test/593-checker-long-to-float-regression/info.txt b/test/593-checker-long-to-float-regression/info.txt new file mode 100644 index 0000000000..39402e9cdd --- /dev/null +++ b/test/593-checker-long-to-float-regression/info.txt @@ -0,0 +1,3 @@ +Regression test for x86_64's code generator, which had a bug in +the long-to-float implementation loading a constant as 64-bit double +instead of 32-bit float. diff --git a/test/593-checker-long-to-float-regression/src/Main.java b/test/593-checker-long-to-float-regression/src/Main.java new file mode 100644 index 0000000000..9c07f3d692 --- /dev/null +++ b/test/593-checker-long-to-float-regression/src/Main.java @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +public class Main { + + static boolean doThrow = false; + static long longValue; + + public static void assertEquals(float expected, float result) { + if (expected != result) { + throw new Error("Expected: " + expected + ", found: " + result); + } + } + + public static void main(String[] args) { + assertEquals(1.0F, $noinline$longToFloat()); + } + + /// CHECK-START: float Main.$noinline$longToFloat() register (after) + /// CHECK-DAG: <<Const1:j\d+>> LongConstant 1 + /// CHECK-DAG: <<Convert:f\d+>> TypeConversion [<<Const1>>] + /// CHECK-DAG: Return [<<Convert>>] + + static float $noinline$longToFloat() { + if (doThrow) { throw new Error(); } + longValue = $inline$returnConst(); + return (float) longValue; + } + + static long $inline$returnConst() { + return 1L; + } +} |