diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2015-01-26 12:49:35 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-01-26 12:52:16 +0000 |
| commit | a0bb2bd5b6a049ad806c223f00672d1f0210db67 (patch) | |
| tree | 206723aac52d4ccdf692f1d6a3c82c059f1cf6a1 /compiler/optimizing/code_generator_arm.cc | |
| parent | 2dadc9df0ffb822870a150f81257792b83241c77 (diff) | |
| download | art-a0bb2bd5b6a049ad806c223f00672d1f0210db67.tar.gz art-a0bb2bd5b6a049ad806c223f00672d1f0210db67.tar.bz2 art-a0bb2bd5b6a049ad806c223f00672d1f0210db67.zip | |
Fix codegen_test.
Native and ART do not have the same calling convention for ART,
so we need to adjust blocked and allocated registers.
Change-Id: I606b2620c0e5a54bd60d6100a137c06616ad40b4
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; |