diff options
| author | 2014-11-24 23:57:17 +0000 | |
|---|---|---|
| committer | 2014-11-24 23:57:18 +0000 | |
| commit | af2d5307c3beaf3f0e9712f88c56c53cecdc06a7 (patch) | |
| tree | 1df28ced0a76691c2265b493cf50277dbb204cfe /compiler | |
| parent | dd24fcf3e3e76ca2df7d00258e347cc2517fce48 (diff) | |
| parent | 9f612ffab2b188d80027d961d7118eb2c461b5ad (diff) | |
Merge "ART: Fix unused variables and functions"
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/optimizing/graph_visualizer.h | 1 | ||||
| -rw-r--r-- | compiler/optimizing/optimization.h | 1 | ||||
| -rw-r--r-- | compiler/utils/arm/assembler_arm.cc | 3 |
3 files changed, 1 insertions, 4 deletions
diff --git a/compiler/optimizing/graph_visualizer.h b/compiler/optimizing/graph_visualizer.h index 4d8bec2422..60d996ba88 100644 --- a/compiler/optimizing/graph_visualizer.h +++ b/compiler/optimizing/graph_visualizer.h @@ -30,7 +30,6 @@ class HGraph; // TODO: Create an analysis/optimization abstraction. static const char* kLivenessPassName = "liveness"; static const char* kRegisterAllocatorPassName = "register"; -static const char* kGVNPassName = "gvn"; /** * If enabled, emits compilation information suitable for the c1visualizer tool diff --git a/compiler/optimizing/optimization.h b/compiler/optimizing/optimization.h index d281248f4a..e36ef198b6 100644 --- a/compiler/optimizing/optimization.h +++ b/compiler/optimizing/optimization.h @@ -17,7 +17,6 @@ #ifndef ART_COMPILER_OPTIMIZING_OPTIMIZATION_H_ #define ART_COMPILER_OPTIMIZING_OPTIMIZATION_H_ -#include "graph_visualizer.h" #include "nodes.h" namespace art { diff --git a/compiler/utils/arm/assembler_arm.cc b/compiler/utils/arm/assembler_arm.cc index 9c84bc1e37..0f28591775 100644 --- a/compiler/utils/arm/assembler_arm.cc +++ b/compiler/utils/arm/assembler_arm.cc @@ -205,10 +205,9 @@ uint32_t Address::encodingArm() const { encoding = am_ | offset_; } } else { - uint32_t imm5 = offset_; uint32_t shift = shift_; if (shift == RRX) { - imm5 = 0; + CHECK_EQ(offset_, 0); shift = ROR; } encoding = am_ | static_cast<uint32_t>(rm_) | shift << 5 | offset_ << 7 | B25; |