diff options
| author | 2014-03-28 17:44:50 +0000 | |
|---|---|---|
| committer | 2014-03-28 17:44:50 +0000 | |
| commit | 2bc4246f3dc045036da962a326b6f0b70541c2c8 (patch) | |
| tree | ce462af6aafc2f830556814a45715d8eaa4f4e6c /compiler/jni/quick/jni_compiler.cc | |
| parent | a708e32a9f764a48175e705ec4bcd2201c84f492 (diff) | |
| parent | fca82208f7128fcda09b6a4743199308332558a2 (diff) | |
Merge "x86_64: JNI compiler"
Diffstat (limited to 'compiler/jni/quick/jni_compiler.cc')
| -rw-r--r-- | compiler/jni/quick/jni_compiler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/jni/quick/jni_compiler.cc b/compiler/jni/quick/jni_compiler.cc index 1c9aed83c3..c89bc40fda 100644 --- a/compiler/jni/quick/jni_compiler.cc +++ b/compiler/jni/quick/jni_compiler.cc @@ -271,7 +271,7 @@ CompiledMethod* ArtJniCompileMethodInternal(CompilerDriver& compiler, mr_conv->InterproceduralScratchRegister()); // 10. Fix differences in result widths. - if (instruction_set == kX86) { + if (instruction_set == kX86 || instruction_set == kX86_64) { if (main_jni_conv->GetReturnType() == Primitive::kPrimByte || main_jni_conv->GetReturnType() == Primitive::kPrimShort) { __ SignExtend(main_jni_conv->ReturnRegister(), |