diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-01-26 23:25:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-26 23:25:13 +0000 |
| commit | 6f04628765d738b648c1f9bccdebd4b2704314cd (patch) | |
| tree | aec2e7d7e8b9da02afcf627ebe2c08157851a2a0 /compiler/optimizing/code_generator_arm.h | |
| parent | e38436063fb4baf88152344b465eeeb1b7f6dce5 (diff) | |
| parent | a72859d58e9d18db4a9e33ecca6902d8594266b0 (diff) | |
Merge "You shall know your arm32 calling conventions."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.h')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h index c1b3a40743..df2dbc74ab 100644 --- a/compiler/optimizing/code_generator_arm.h +++ b/compiler/optimizing/code_generator_arm.h @@ -128,9 +128,7 @@ class FieldAccessCallingConventionARM : public FieldAccessCallingConvention { } Location GetSetValueLocation(Primitive::Type type, bool is_instance) const OVERRIDE { return Primitive::Is64BitType(type) - ? (is_instance - ? Location::RegisterPairLocation(R2, R3) - : Location::RegisterPairLocation(R1, R2)) + ? Location::RegisterPairLocation(R2, R3) : (is_instance ? Location::RegisterLocation(R2) : Location::RegisterLocation(R1)); |