diff options
| author | Christopher R. Palmer <crpalmer@gmail.com> | 2015-09-20 05:49:10 -0400 |
|---|---|---|
| committer | AdrianDC <radian.dc@gmail.com> | 2015-11-09 01:19:59 +0100 |
| commit | 7890e2edd305ddacfe76b37337cdbe95bcd588f8 (patch) | |
| tree | 5872f3268dff1d8b5964ab3d37ec93f19b84239b /compiler/dex/quick/arm64/codegen_arm64.h | |
| parent | 487963318e176f5e63d7e32475bfe93cf3c2decd (diff) | |
| download | art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.zip art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.tar.gz art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.tar.bz2 | |
art: Fix whitespace errors added by caf
All of these errors break compilation with GCC 4.9 and based on
a spot check appear to be all CAF introduced changes. Fix these
to avoid future breakage.
Conflicts:
compiler/dex/mir_graph.h
compiler/dex/quick/arm/assemble_arm.cc
compiler/dex/quick/arm/codegen_arm.h
compiler/dex/quick/arm/target_arm.cc
compiler/dex/quick/arm64/codegen_arm64.h
compiler/dex/quick/arm64/target_arm64.cc
compiler/dex/quick/mir_to_lir.h
compiler/utils/growable_array.h
Changes:
compiler/dex/mir_graph.h
compiler/dex/mir_optimization.cc
compiler/dex/quick/arm/codegen_arm.h
compiler/dex/quick/arm/target_arm.cc
compiler/dex/quick/mir_to_lir.h
compiler/dex/quick/quick_compiler.cc
compiler/driver/compiler_driver.cc
compiler/optimizing/inliner.cc
compiler/optimizing/nodes.cc
compiler/optimizing/optimizing_compiler.cc
Change-Id: I3e23e1449eea0565fbe6f91251190b1e153f16cf
Signed-off-by: AdrianDC <radian.dc@gmail.com>
Diffstat (limited to 'compiler/dex/quick/arm64/codegen_arm64.h')
| -rw-r--r-- | compiler/dex/quick/arm64/codegen_arm64.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/arm64/codegen_arm64.h b/compiler/dex/quick/arm64/codegen_arm64.h index 0570332..016cb0f 100644 --- a/compiler/dex/quick/arm64/codegen_arm64.h +++ b/compiler/dex/quick/arm64/codegen_arm64.h @@ -275,7 +275,7 @@ class Arm64Mir2Lir FINAL : public Mir2Lir { void CleanupCodeGenData() QC_WEAK; -private: + private: /** * @brief Given register xNN (dNN), returns register wNN (sNN). * @param reg #RegStorage containing a Solo64 input register (e.g. @c x1 or @c d2). @@ -423,7 +423,7 @@ private: void Cleanup() QC_WEAK; -private: + private: static uint32_t ProcessMoreEncodings(const A64EncodingMap* encoder, int i, uint32_t operand) QC_WEAK; static const A64EncodingMap* GetEncoder(int opcode) QC_WEAK; |