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/optimizing | |
| 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/optimizing')
| -rw-r--r-- | compiler/optimizing/inliner.cc | 6 | ||||
| -rw-r--r-- | compiler/optimizing/nodes.cc | 2 | ||||
| -rw-r--r-- | compiler/optimizing/optimizing_compiler.cc | 4 |
3 files changed, 4 insertions, 8 deletions
diff --git a/compiler/optimizing/inliner.cc b/compiler/optimizing/inliner.cc index 9b0a69729e..d434839e9f 100644 --- a/compiler/optimizing/inliner.cc +++ b/compiler/optimizing/inliner.cc @@ -76,16 +76,14 @@ void HInliner::Run() { // additional check for an inlinable method bool HInliner::CanInlineMethod(const DexCompilationUnit& , HGraph&, - HInvoke*) const -{ + HInvoke*) const { return false; } // try if we can remove exception checks void HInliner::TryRemoveExceptionChecks(const DexCompilationUnit&, HGraph&, - HInvoke*) const -{ + HInvoke*) const { return; } diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index 742e316958..119c22c2e4 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -1335,7 +1335,7 @@ void HGraph::InlineInto(HGraph* outer_graph, HInvoke* invoke) { } } } - //inlining loop + // inlining loop if (info_callee != nullptr) { ((ArenaBitVector &)(info_callee->GetBlocks())).ClearAllBits(); info_callee->Populate(); diff --git a/compiler/optimizing/optimizing_compiler.cc b/compiler/optimizing/optimizing_compiler.cc index 6dc20feec6..5f741b9470 100644 --- a/compiler/optimizing/optimizing_compiler.cc +++ b/compiler/optimizing/optimizing_compiler.cc @@ -326,8 +326,7 @@ HOptimization* GetMoreOptimizing(HGraph*, HOptimization* GetMoreOptimizing(HGraph*, const DexCompilationUnit&, CompilerDriver*, - OptimizingCompilerStats*) -{ + OptimizingCompilerStats*) { return nullptr; } @@ -714,7 +713,6 @@ CompiledMethod* TryFastCompile(CompilerDriver*, uint32_t, jobject, const DexFile&) { - return nullptr; } |