diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-01-26 13:33:33 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-26 13:33:33 +0000 |
commit | 0da7a26e1ae2a701529c5c15c280f3efae0ccec0 (patch) | |
tree | 92971e2efa73cac2ed9148eaa8ebc27ad96ae13c /compiler/optimizing/code_generator_arm.cc | |
parent | ebb3cbc5869f78170f08ffdb1e782b3b3371e638 (diff) | |
parent | a0bb2bd5b6a049ad806c223f00672d1f0210db67 (diff) | |
download | art-0da7a26e1ae2a701529c5c15c280f3efae0ccec0.tar.gz art-0da7a26e1ae2a701529c5c15c280f3efae0ccec0.tar.bz2 art-0da7a26e1ae2a701529c5c15c280f3efae0ccec0.zip |
Merge "Fix codegen_test."
Diffstat (limited to 'compiler/optimizing/code_generator_arm.cc')
-rw-r--r-- | compiler/optimizing/code_generator_arm.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_arm.cc b/compiler/optimizing/code_generator_arm.cc index 824663a3a6..0fe28e8352 100644 --- a/compiler/optimizing/code_generator_arm.cc +++ b/compiler/optimizing/code_generator_arm.cc @@ -455,7 +455,7 @@ Location CodeGeneratorARM::AllocateFreeRegister(Primitive::Type type) const { return Location(); } -void CodeGeneratorARM::SetupBlockedRegisters(bool is_baseline ATTRIBUTE_UNUSED) const { +void CodeGeneratorARM::SetupBlockedRegisters(bool is_baseline) const { // Don't allocate the dalvik style register pair passing. blocked_register_pairs_[R1_R2] = true; |