diff options
| author | Andreas Gampe <agampe@google.com> | 2015-01-27 00:41:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-27 00:41:53 +0000 |
| commit | 94fc0e7be35ab1dd42c6336071ea53dfc565faee (patch) | |
| tree | 7d147efe2ff42daafa328a260f75b669e631b4b3 | |
| parent | 413f99a82808162dcce1de26a81a4fb9fd43f048 (diff) | |
| parent | a2e18ed9397f21c96eae4a26df9ca35a6a97341d (diff) | |
| download | art-94fc0e7be35ab1dd42c6336071ea53dfc565faee.tar.gz art-94fc0e7be35ab1dd42c6336071ea53dfc565faee.tar.bz2 art-94fc0e7be35ab1dd42c6336071ea53dfc565faee.zip | |
Merge "ART: Fix inlining of Mir2Lir"
| -rw-r--r-- | compiler/dex/quick/arm/assemble_arm.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/quick/arm64/assemble_arm64.cc | 2 | ||||
| -rw-r--r-- | compiler/dex/quick/mips/assemble_mips.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/compiler/dex/quick/arm/assemble_arm.cc b/compiler/dex/quick/arm/assemble_arm.cc index 05e2abec8e..3d64833942 100644 --- a/compiler/dex/quick/arm/assemble_arm.cc +++ b/compiler/dex/quick/arm/assemble_arm.cc @@ -19,7 +19,7 @@ #include "arm_lir.h" #include "base/logging.h" #include "dex/compiler_ir.h" -#include "dex/quick/mir_to_lir.h" +#include "dex/quick/mir_to_lir-inl.h" namespace art { diff --git a/compiler/dex/quick/arm64/assemble_arm64.cc b/compiler/dex/quick/arm64/assemble_arm64.cc index 54956d9b16..806617be2a 100644 --- a/compiler/dex/quick/arm64/assemble_arm64.cc +++ b/compiler/dex/quick/arm64/assemble_arm64.cc @@ -20,7 +20,7 @@ #include "arm64_lir.h" #include "base/logging.h" #include "dex/compiler_ir.h" -#include "dex/quick/mir_to_lir.h" +#include "dex/quick/mir_to_lir-inl.h" #include "driver/compiler_driver.h" namespace art { diff --git a/compiler/dex/quick/mips/assemble_mips.cc b/compiler/dex/quick/mips/assemble_mips.cc index a531317237..5c98b10b58 100644 --- a/compiler/dex/quick/mips/assemble_mips.cc +++ b/compiler/dex/quick/mips/assemble_mips.cc @@ -18,7 +18,7 @@ #include "base/logging.h" #include "dex/compiler_ir.h" -#include "dex/quick/mir_to_lir.h" +#include "dex/quick/mir_to_lir-inl.h" #include "mips_lir.h" namespace art { |