summaryrefslogtreecommitdiffstats
path: root/compiler/optimizing/code_generator_x86.h
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-11-13 09:58:56 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-11-13 09:58:57 +0000
commita3279c80b4f92e0cc96902cf069c09424ed94ed0 (patch)
tree2d566e00a4976fe72c54663192715f919d3fa1dd /compiler/optimizing/code_generator_x86.h
parenta1af1b59256820dde25ec21581e9e64f698e182f (diff)
parentf0e3937b87453234d0d7970b8712082062709b8d (diff)
downloadart-a3279c80b4f92e0cc96902cf069c09424ed94ed0.zip
art-a3279c80b4f92e0cc96902cf069c09424ed94ed0.tar.gz
art-a3279c80b4f92e0cc96902cf069c09424ed94ed0.tar.bz2
Merge "Do a parallel move in BoundsCheckSlowPath."
Diffstat (limited to 'compiler/optimizing/code_generator_x86.h')
-rw-r--r--compiler/optimizing/code_generator_x86.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/code_generator_x86.h b/compiler/optimizing/code_generator_x86.h
index 9e42b0a..841b28b 100644
--- a/compiler/optimizing/code_generator_x86.h
+++ b/compiler/optimizing/code_generator_x86.h
@@ -183,7 +183,7 @@ class CodeGeneratorX86 : public CodeGenerator {
// Blocks all register pairs made out of blocked core registers.
void UpdateBlockedPairRegisters() const;
- ParallelMoveResolverX86* GetMoveResolver() {
+ ParallelMoveResolverX86* GetMoveResolver() OVERRIDE {
return &move_resolver_;
}