diff options
| author | 2016-03-31 10:10:25 +0000 | |
|---|---|---|
| committer | 2016-03-31 10:10:25 +0000 | |
| commit | c421203f43a6379d6385f26baeaa23080233b4be (patch) | |
| tree | aa4d69e0f9fb0797883248418ab4adf05f62f4a8 /compiler/optimizing | |
| parent | 8d96e0389a11e60c4ab8fb09d80dc66e4fcccc05 (diff) | |
| parent | 858429596e53e1e60978b25274e6130eb81734aa (diff) | |
Merge "ART: Fix TypeConversion from long const to float on x86_64" am: 922b88c
am: 8584295
* commit '858429596e53e1e60978b25274e6130eb81734aa':
ART: Fix TypeConversion from long const to float on x86_64
Change-Id: Ife107276244aa7cbc94f5ad40a51cf31446abc9c
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator_x86_64.cc | 2 |
1 files changed, 1 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); |