summaryrefslogtreecommitdiffstats
path: root/compiler/Android.mk
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-05-22 18:32:45 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-05-23 10:00:44 +0100
commit4e3d23aa1523718ea1fdf3a32516d2f9d81e84fe (patch)
tree78593d033513a98486a409e7b23678ccced12cd5 /compiler/Android.mk
parent59f3f62534581311c7c403c832f56c272426a17c (diff)
downloadart-4e3d23aa1523718ea1fdf3a32516d2f9d81e84fe.tar.gz
art-4e3d23aa1523718ea1fdf3a32516d2f9d81e84fe.tar.bz2
art-4e3d23aa1523718ea1fdf3a32516d2f9d81e84fe.zip
Import Dart's parallel move resolver.
And write a few tests while at it. A parallel move resolver will be needed for performing multiple moves that are conceptually parallel, for example moves at a block exit that branches to a block with phi nodes. Change-Id: Ib95b247b4fc3f2c2fcab3b8c8d032abbd6104cd7
Diffstat (limited to 'compiler/Android.mk')
-rw-r--r--compiler/Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/Android.mk b/compiler/Android.mk
index cb900eac61..d9417fc825 100644
--- a/compiler/Android.mk
+++ b/compiler/Android.mk
@@ -83,8 +83,10 @@ LIBART_COMPILER_SRC_FILES := \
optimizing/code_generator_arm.cc \
optimizing/code_generator_x86.cc \
optimizing/graph_visualizer.cc \
+ optimizing/locations.cc \
optimizing/nodes.cc \
optimizing/optimizing_compiler.cc \
+ optimizing/parallel_move_resolver.cc \
optimizing/ssa_builder.cc \
optimizing/ssa_liveness_analysis.cc \
trampolines/trampoline_compiler.cc \