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/arm/codegen_arm.h | |
| parent | 487963318e176f5e63d7e32475bfe93cf3c2decd (diff) | |
| download | android_art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.tar.gz android_art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.tar.bz2 android_art-7890e2edd305ddacfe76b37337cdbe95bcd588f8.zip | |
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/arm/codegen_arm.h')
| -rw-r--r-- | compiler/dex/quick/arm/codegen_arm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/dex/quick/arm/codegen_arm.h b/compiler/dex/quick/arm/codegen_arm.h index 2fee96ddb8..3ae8790704 100644 --- a/compiler/dex/quick/arm/codegen_arm.h +++ b/compiler/dex/quick/arm/codegen_arm.h @@ -282,7 +282,7 @@ class ArmMir2Lir FINAL : public Mir2Lir { LIR* InvokeTrampoline(OpKind op, RegStorage r_tgt, QuickEntrypointEnum trampoline) OVERRIDE; size_t GetInstructionOffset(LIR* lir); void GenMoreMachineSpecificExtendedMethodMIR(BasicBlock* bb, MIR* mir) QC_WEAK; - //void MachineSpecificPreprocessMIR(BasicBlock* bb, MIR* mir); + // void MachineSpecificPreprocessMIR(BasicBlock* bb, MIR* mir); void GenMachineSpecificExtendedMethodMIR(BasicBlock* bb, MIR* mir) OVERRIDE; @@ -290,6 +290,7 @@ class ArmMir2Lir FINAL : public Mir2Lir { RegLocation rl_src, RegLocation rl_dest, int lit) OVERRIDE; void CleanupCodeGenData() QC_WEAK; + private: void GenNegLong(RegLocation rl_dest, RegLocation rl_src); void GenMulLong(Instruction::Code opcode, RegLocation rl_dest, RegLocation rl_src1, @@ -379,8 +380,7 @@ class ArmMir2Lir FINAL : public Mir2Lir { friend class QCArmMir2Lir; public: - QCArmMir2Lir * qcm2l ; - + QCArmMir2Lir * qcm2l; }; } // namespace art |