OSDN Git Service
Nicolas Geoffray [Thu, 6 Nov 2014 17:02:16 +0000 (17:02 +0000)]
am
38efdf51: Merge "Implement try/catch/throw in optimizing."
* commit '
38efdf51947eaec866059e62626f2409ef4c19db':
Implement try/catch/throw in optimizing.
Nicolas Geoffray [Thu, 6 Nov 2014 16:57:00 +0000 (16:57 +0000)]
Merge "Implement try/catch/throw in optimizing."
Nicolas Geoffray [Wed, 5 Nov 2014 12:46:03 +0000 (12:46 +0000)]
Implement try/catch/throw in optimizing.
- We currently don't run optimizations in the presence of a try/catch.
- We therefore implement Quick's mapping table.
- Also fix a missing null check on array-length.
Change-Id: I6917dfcb868e75c1cf6eff32b7cbb60b6cfbd68f
Andreas Gampe [Thu, 6 Nov 2014 16:26:12 +0000 (16:26 +0000)]
am
3ed86e4e: Merge "ART: Fix warnings in memcmp16 for arm32"
* commit '
3ed86e4e98dfe1b05c9a03aa2aee42c145a018c3':
ART: Fix warnings in memcmp16 for arm32
Andreas Gampe [Thu, 6 Nov 2014 16:22:29 +0000 (16:22 +0000)]
Merge "ART: Fix warnings in memcmp16 for arm32"
Andreas Gampe [Thu, 6 Nov 2014 07:49:43 +0000 (23:49 -0800)]
ART: Fix warnings in memcmp16 for arm32
Rewrite conditional infixes to silence the warnings. Use push and
pop for consistency with our other assembly files.
Change-Id: I3c059ff44b5242fa21c640457d36aaee62f8d59b
Nicolas Geoffray [Thu, 6 Nov 2014 16:05:42 +0000 (16:05 +0000)]
am
a710c500: Merge "Fix failures after div support."
* commit '
a710c50023cd343d1cf765069426f678cee19eb7':
Fix failures after div support.
Nicolas Geoffray [Thu, 6 Nov 2014 16:02:48 +0000 (16:02 +0000)]
Merge "Fix failures after div support."
Nicolas Geoffray [Thu, 6 Nov 2014 15:59:38 +0000 (15:59 +0000)]
Fix failures after div support.
- We need to special case divide by -1 because of x86.
- Disable div test on arm64, which does not support div yet.
Change-Id: I07e137cb555a958b02a6c4070f296503b7e30bae
Calin Juravle [Thu, 6 Nov 2014 15:19:47 +0000 (15:19 +0000)]
Calin Juravle [Thu, 6 Nov 2014 15:19:45 +0000 (15:19 +0000)]
am
803ad870: Merge "[optimizing compiler] Add div-int and exception handling."
* commit '
803ad870017503849a22ef4fcb702847c18201c0':
[optimizing compiler] Add div-int and exception handling.
Roland Levillain [Thu, 6 Nov 2014 15:19:44 +0000 (15:19 +0000)]
am
863b844e: Merge "Add more int-to-long tests for the optimizing compiler."
* commit '
863b844e206cddbcd18c77d356766a5fd4e5df22':
Add more int-to-long tests for the optimizing compiler.
Nicolas Geoffray [Thu, 6 Nov 2014 15:19:42 +0000 (15:19 +0000)]
am
e8469ac1: Merge "Don\'t use R4 for suspend check."
* commit '
e8469ac1ac8a2f65774e2fe53e3a195f6357d660':
Don't use R4 for suspend check.
Roland Levillain [Thu, 6 Nov 2014 15:19:41 +0000 (15:19 +0000)]
am
a88b7b93: Merge "Fix ART build issues."
* commit '
a88b7b93e28ea86969dd3ec6a6bf6929d697fc31':
Fix ART build issues.
Roland Levillain [Thu, 6 Nov 2014 15:19:39 +0000 (15:19 +0000)]
am
508368cc: Merge "Support int-to-long conversions in the optimizing compiler."
* commit '
508368cc013f146b4348793d72d66d4f0e96f07c':
Support int-to-long conversions in the optimizing compiler.
Nicolas Geoffray [Thu, 6 Nov 2014 15:19:38 +0000 (15:19 +0000)]
am
eaeff2ab: Merge "Fix typo in test name."
* commit '
eaeff2abedc2b63198761894619f51b1921b0111':
Fix typo in test name.
Nicolas Geoffray [Thu, 6 Nov 2014 15:19:35 +0000 (15:19 +0000)]
am
2be4e406: Merge "Mark 703-floating-point-div as failing on optimizing/arm64."
* commit '
2be4e4063f4cde7d9244a433b8f517eaa0157392':
Mark 703-floating-point-div as failing on optimizing/arm64.
Calin Juravle [Thu, 6 Nov 2014 15:04:02 +0000 (15:04 +0000)]
Merge "Fix build."
Calin Juravle [Thu, 6 Nov 2014 15:03:23 +0000 (15:03 +0000)]
Fix build.
BuildCheckedDiv doesn't handle 12x instruction correctly.
Change-Id: I59571397cfb1b7ee89538e8e0b57725b863b0ee1
Calin Juravle [Thu, 6 Nov 2014 14:49:23 +0000 (14:49 +0000)]
Merge "[optimizing compiler] Add div-int and exception handling."
Calin Juravle [Tue, 4 Nov 2014 16:40:20 +0000 (16:40 +0000)]
[optimizing compiler] Add div-int and exception handling.
- for backends: arm, x86, x86_64
- fixed a register allocator bug: the request for a fixed register for
the first input was ignored if the output was kSameAsFirstInput
- added divide by zero exception
- more tests
- shuffle around some code in the builder to reduce the number of lines
of code for a single function.
Change-Id: Id3a515e02bfbc66cd9d16cb9746f7551bdab3d42
Roland Levillain [Thu, 6 Nov 2014 14:18:39 +0000 (14:18 +0000)]
Merge "Add more int-to-long tests for the optimizing compiler."
Nicolas Geoffray [Thu, 6 Nov 2014 13:50:29 +0000 (13:50 +0000)]
Merge "Don't use R4 for suspend check."
Roland Levillain [Thu, 6 Nov 2014 12:24:42 +0000 (12:24 +0000)]
Add more int-to-long tests for the optimizing compiler.
Exercise Java byte- and short-to-long conversions producing
int-to-long Dex instructions.
Change-Id: I371af3f1dfcfe5b8b1ef3b16747987da93ff133c
Nicolas Geoffray [Thu, 6 Nov 2014 12:00:54 +0000 (12:00 +0000)]
Don't use R4 for suspend check.
Change-Id: I57ccfaa527e2676f21339860b28955468a87adfe
Roland Levillain [Thu, 6 Nov 2014 11:32:47 +0000 (11:32 +0000)]
Merge "Fix ART build issues."
Roland Levillain [Thu, 6 Nov 2014 11:10:17 +0000 (11:10 +0000)]
Fix ART build issues.
- Use ATTRIBUTE_UNUSED to avoid a warning about an unused
argument in compiler/optimizing/nodes.h instead of
simply commenting it out.
- Disable run test 002-sleep on ARM64.
Change-Id: I96911904289b73611e0fc168e7b597a9a2df8141
Roland Levillain [Thu, 6 Nov 2014 10:39:07 +0000 (10:39 +0000)]
Merge "Support int-to-long conversions in the optimizing compiler."
Nicolas Geoffray [Thu, 6 Nov 2014 09:34:33 +0000 (09:34 +0000)]
Merge "Fix typo in test name."
Nicolas Geoffray [Thu, 6 Nov 2014 09:33:43 +0000 (09:33 +0000)]
Fix typo in test name.
Change-Id: Ib1cbb66fdae118358d7903e8455838e3955c19e6
Nicolas Geoffray [Thu, 6 Nov 2014 09:11:26 +0000 (09:11 +0000)]
Merge "Mark 703-floating-point-div as failing on optimizing/arm64."
Nicolas Geoffray [Thu, 6 Nov 2014 09:10:23 +0000 (09:10 +0000)]
Mark 703-floating-point-div as failing on optimizing/arm64.
Change-Id: Id778a0944e49158eadc9a1b4629dc2647139477e
Ian Rogers [Thu, 6 Nov 2014 00:05:33 +0000 (00:05 +0000)]
am
1991fed6: Merge "Don\'t enable ARM_R4_SUSPEND_FLAG."
* commit '
1991fed6e39fc97c2dd4d55af33818008b3906a1':
Don't enable ARM_R4_SUSPEND_FLAG.
Ian Rogers [Wed, 5 Nov 2014 23:10:54 +0000 (23:10 +0000)]
Merge "Don't enable ARM_R4_SUSPEND_FLAG."
Ian Rogers [Tue, 28 Oct 2014 01:48:49 +0000 (18:48 -0700)]
Don't enable ARM_R4_SUSPEND_FLAG.
Bug:
17953517
Change-Id: I4578f1ffbfc987d5d178c7586b6bb99882ed19bb
Ian Rogers [Wed, 5 Nov 2014 21:24:32 +0000 (21:24 +0000)]
am
77dbcdd2: Merge "Fix LoadValue{Wide} to free temp when reg classes are not matched"
* commit '
77dbcdd24fc99938c37ab0a32373466838ec8880':
Fix LoadValue{Wide} to free temp when reg classes are not matched
Ian Rogers [Wed, 5 Nov 2014 21:21:46 +0000 (21:21 +0000)]
Merge "Fix LoadValue{Wide} to free temp when reg classes are not matched"
Ian Rogers [Wed, 5 Nov 2014 20:12:31 +0000 (20:12 +0000)]
am
40845d26: Merge "ARM: Strength reduction for floating-point division"
* commit '
40845d266e1152a846858d94cee70c33b136de68':
ARM: Strength reduction for floating-point division
Ian Rogers [Wed, 5 Nov 2014 20:12:30 +0000 (20:12 +0000)]
am
211d45e0: Merge "X86 QBE: Mark kX86StartOfMethod as defining reg 0"
* commit '
211d45e059935a7874a1ec89846f03d35ffba29f':
X86 QBE: Mark kX86StartOfMethod as defining reg 0
Ian Rogers [Wed, 5 Nov 2014 19:39:10 +0000 (19:39 +0000)]
Merge "ARM: Strength reduction for floating-point division"
Ningsheng Jian [Thu, 23 Oct 2014 05:48:36 +0000 (13:48 +0800)]
ARM: Strength reduction for floating-point division
For floating-point division by power of two constants, generate
multiplication by the reciprocal instead.
Change-Id: I39c79eeb26b60cc754ad42045362b79498c755be
Ian Rogers [Wed, 5 Nov 2014 19:13:15 +0000 (19:13 +0000)]
Merge "X86 QBE: Mark kX86StartOfMethod as defining reg 0"
Vladimir Marko [Wed, 5 Nov 2014 19:01:45 +0000 (19:01 +0000)]
am
970a25ca: Merge "Clean up arena objects in Mir2Lir."
* commit '
970a25ca627fe13ab381bc4c639868179a3c8f1f':
Clean up arena objects in Mir2Lir.
Nicolas Geoffray [Wed, 5 Nov 2014 19:01:44 +0000 (19:01 +0000)]
am
5e5632ff: Merge "Fix RI testing."
* commit '
5e5632ff1651adbf95faaf8fb3239a36f9f61124':
Fix RI testing.
Roland Levillain [Wed, 5 Nov 2014 19:01:43 +0000 (19:01 +0000)]
am
3c30a723: Merge "Fix store instructions to large frames in ARM opt. compiler."
* commit '
3c30a7232352c3e91423d5e53610915a2969c8a3':
Fix store instructions to large frames in ARM opt. compiler.
Brian Carlstrom [Wed, 5 Nov 2014 19:01:35 +0000 (19:01 +0000)]
am
4a43e79f: Merge "Fix dependency from phony targets to real files to remove need for m or mma"
* commit '
4a43e79f73f9da747896123e383f9dc6013436fd':
Fix dependency from phony targets to real files to remove need for m or mma
Brian Carlstrom [Wed, 5 Nov 2014 19:01:33 +0000 (19:01 +0000)]
am
907080c6: Merge "Restore run-test TIME_OUT feature"
* commit '
907080c64655c2bccba298bca637cfcc0f609d3c':
Restore run-test TIME_OUT feature
Andreas Gampe [Wed, 5 Nov 2014 19:01:32 +0000 (19:01 +0000)]
am
da04f29a: Merge "ART: Fix some redundant declarations"
* commit '
da04f29ab1892c00490f846aba3e435ddd6696cb':
ART: Fix some redundant declarations
Ian Rogers [Wed, 5 Nov 2014 19:01:30 +0000 (19:01 +0000)]
am
3a8a7a44: Merge "Add ATTRIBUTE_UNUSED to unused parameters."
* commit '
3a8a7a44af189b0e43f5d5bde792271addf803d8':
Add ATTRIBUTE_UNUSED to unused parameters.
Vladimir Marko [Wed, 5 Nov 2014 16:55:17 +0000 (16:55 +0000)]
Merge "Clean up arena objects in Mir2Lir."
Roland Levillain [Wed, 5 Nov 2014 14:15:05 +0000 (14:15 +0000)]
Support int-to-long conversions in the optimizing compiler.
- Add support for the int-to-float Dex instruction in the
optimizing compiler.
- Add a HTypeConversion node type for control-flow graphs.
- Generate x86, x86-64 and ARM (but not ARM64) code for
int-to-float HTypeConversion nodes.
- Add a 64-bit "Move doubleword to quadword with
sign-extension" (MOVSXD) instruction to the x86-64
assembler.
- Add related tests to test/422-type-conversion.
Change-Id: Ieb8ec5380f9c411857119c79aa8d0728fd10f780
Vladimir Marko [Wed, 5 Nov 2014 14:54:34 +0000 (14:54 +0000)]
Clean up arena objects in Mir2Lir.
Change-Id: I93fca37be2ae100ddebf80b6ba7a561b187e8886
Nicolas Geoffray [Wed, 5 Nov 2014 12:39:13 +0000 (12:39 +0000)]
Merge "Fix RI testing."
Nicolas Geoffray [Wed, 5 Nov 2014 12:34:24 +0000 (12:34 +0000)]
Fix RI testing.
Change-Id: Ic0f40dfd75f4dd8cd1cd70933f76de94c482756d
Roland Levillain [Wed, 5 Nov 2014 12:08:30 +0000 (12:08 +0000)]
Merge "Fix store instructions to large frames in ARM opt. compiler."
Brian Carlstrom [Wed, 5 Nov 2014 07:21:11 +0000 (07:21 +0000)]
Merge "Fix dependency from phony targets to real files to remove need for m or mma"
Brian Carlstrom [Wed, 5 Nov 2014 07:21:09 +0000 (07:21 +0000)]
Merge "Restore run-test TIME_OUT feature"
Brian Carlstrom [Wed, 5 Nov 2014 07:07:57 +0000 (23:07 -0800)]
Fix dependency from phony targets to real files to remove need for m or mma
Change-Id: I37360fbe2fa3aea6cee14241ef13d5839f9532c9
Brian Carlstrom [Wed, 5 Nov 2014 06:31:35 +0000 (22:31 -0800)]
Restore run-test TIME_OUT feature
Added in
741c02c4027d374279954ce5542754c098055f24
Lost in
1a58b7f6f14a5ed9355e8e447cae25fb41467f09
Bug:
18248300
Change-Id: Ie5afdaf07d7b994e94decd928c6e0a28e49b4b78
Andreas Gampe [Wed, 5 Nov 2014 06:58:18 +0000 (06:58 +0000)]
Merge "ART: Fix some redundant declarations"
Andreas Gampe [Wed, 5 Nov 2014 06:26:32 +0000 (22:26 -0800)]
ART: Fix some redundant declarations
Refactor entrypoint initialization such that there is a large set
of common extern "C" declarations for quick entrypoints.
Change-Id: Iae8548e5f7ebbf51dc6c55c4283fa89437e18c98
Serguei Katkov [Wed, 29 Oct 2014 07:48:02 +0000 (13:48 +0600)]
Fix LoadValue{Wide} to free temp when reg classes are not matched
If the current register mapping does not match the required one we
are allocating a new temp and make a copy. After that we are clobbering
the old mapping of VR to physical register. However we can also free it
for future allocations as soon as it will not used more.
This is a fix of the bug I met. The reason of the dex2oat crash was that
GenInlinedMinMaxFP loaded two sources to fp registers. It appeared that
both of them were live in two pairs of core regs. As a result after
loading of them all 4 temps available for x86 platfrom are marked as in use.
As a result after an attempt to allocate new temp to load a constant
required by GenInlinedMinMaxFP register allocator reported that there is
no available temp registers.
Change-Id: I9233012e39de1e574761f3d9bd3cad80d743e522
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Ian Rogers [Wed, 5 Nov 2014 05:30:41 +0000 (05:30 +0000)]
Merge "Add ATTRIBUTE_UNUSED to unused parameters."
Chih-Hung Hsieh [Tue, 4 Nov 2014 22:39:03 +0000 (14:39 -0800)]
Add ATTRIBUTE_UNUSED to unused parameters.
They are reported by Clang compiler.
BUG:
18244071
Change-Id: I3ebf7a9c324490adbf1135f21818c7ad83c83f3d
Ian Rogers [Wed, 5 Nov 2014 03:37:15 +0000 (03:37 +0000)]
am
4d5d62f4: Merge "Make thread dumping more tolerant of broken invariants during abort."
* commit '
4d5d62f404b164b697490d650ad8e82ad79a25f9':
Make thread dumping more tolerant of broken invariants during abort.
Ian Rogers [Wed, 5 Nov 2014 03:32:56 +0000 (03:32 +0000)]
Merge "Make thread dumping more tolerant of broken invariants during abort."
Andreas Gampe [Wed, 5 Nov 2014 02:55:39 +0000 (02:55 +0000)]
am
78a32333: Merge "ART: More warnings"
* commit '
78a3233313260665fe82ba56257855e043bca3d4':
ART: More warnings
Andreas Gampe [Wed, 5 Nov 2014 02:42:56 +0000 (02:42 +0000)]
Merge "ART: More warnings"
Ian Rogers [Wed, 5 Nov 2014 02:41:57 +0000 (02:41 +0000)]
am
fe50a0f6: Merge "Add a test for SafeMath."
* commit '
fe50a0f644bf57a92612d08ad21dc4ea5a2f652a':
Add a test for SafeMath.
Andreas Gampe [Tue, 4 Nov 2014 05:36:10 +0000 (21:36 -0800)]
ART: More warnings
Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general,
and -Wunused-but-set-parameter for GCC builds.
Change-Id: I81bbdd762213444673c65d85edae594a523836e5
Ian Rogers [Wed, 5 Nov 2014 01:57:02 +0000 (17:57 -0800)]
Make thread dumping more tolerant of broken invariants during abort.
Change-Id: Ie1bc20debe72f2ea2bf4c1be50cd9877c823670a
Ian Rogers [Wed, 5 Nov 2014 00:49:27 +0000 (00:49 +0000)]
Merge "Add a test for SafeMath."
Ian Rogers [Wed, 5 Nov 2014 00:39:32 +0000 (16:39 -0800)]
Add a test for SafeMath.
Change-Id: I445cd168e6f22a4c12f954eb94e32bd28dba9501
Ian Rogers [Tue, 4 Nov 2014 23:59:37 +0000 (23:59 +0000)]
am
b5331ef9: Merge "Fix unused parameters for the Mac."
* commit '
b5331ef9bb2ae68c392e5da3da13816bd43e5b1d':
Fix unused parameters for the Mac.
Ian Rogers [Tue, 4 Nov 2014 23:59:35 +0000 (23:59 +0000)]
Ian Rogers [Tue, 4 Nov 2014 23:59:32 +0000 (23:59 +0000)]
am
4150611d: Merge "Fix mac build."
* commit '
4150611d5229c87e49762b9edf6540995eb325e1':
Fix mac build.
Ian Rogers [Tue, 4 Nov 2014 23:59:29 +0000 (23:59 +0000)]
am
cc19cb68: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN if already defined."
* commit '
cc19cb6845f427036513e155d50c11533933c63f':
Don't define DISALLOW_COPY_AND_ASSIGN if already defined.
Ian Rogers [Tue, 4 Nov 2014 23:36:57 +0000 (23:36 +0000)]
Merge "Fix unused parameters for the Mac."
Ian Rogers [Tue, 4 Nov 2014 23:33:55 +0000 (15:33 -0800)]
Fix unused parameters for the Mac.
Change-Id: I76086cc1f448d058de61a613078055d8f01ba4b3
Ian Rogers [Tue, 4 Nov 2014 23:13:47 +0000 (23:13 +0000)]
Merge "Fix build."
Ian Rogers [Tue, 4 Nov 2014 23:10:55 +0000 (15:10 -0800)]
Fix build.
Change-Id: I7c6657bdc31e57c144999d4a3f8c2836c3d90403
Ian Rogers [Tue, 4 Nov 2014 22:45:09 +0000 (22:45 +0000)]
Merge "Fix mac build."
Ian Rogers [Tue, 4 Nov 2014 22:43:18 +0000 (14:43 -0800)]
Fix mac build.
Change-Id: I228cdb0b25cd0f2c5e745a87a97aa8fd3c8a160a
Ian Rogers [Tue, 4 Nov 2014 22:18:08 +0000 (22:18 +0000)]
Merge "Don't define DISALLOW_COPY_AND_ASSIGN if already defined."
Ian Rogers [Tue, 4 Nov 2014 21:20:30 +0000 (13:20 -0800)]
Don't define DISALLOW_COPY_AND_ASSIGN if already defined.
Required by:
https://android-review.googlesource.com/#/c/113053/
Change-Id: I0226afffc738a4b7c162a0d467513a35d62dbfdc
Roland Levillain [Tue, 4 Nov 2014 17:43:11 +0000 (17:43 +0000)]
Fix store instructions to large frames in ARM opt. compiler.
When accessing a stack frame at a large offset, use an
additional core register (R5 or R6) as a temporary register
whenever IP contains the value to store (and thus cannot be
used by art::Thumb2Assembler::StoreToOffset as a temporary
register to compute the memory address where the value is
to be stored). The previous value of R5 (or R6) is saved
on the stack before the emission of the store instruction
and restored afterwards.
Change-Id: Ic5fd5ab2c09d8327dd1f0f241d40d2c397ce64cd
Nicolas Geoffray [Tue, 4 Nov 2014 13:49:19 +0000 (13:49 +0000)]
am
e03864e9: Merge "Try to fix mac build."
* commit '
e03864e99f5ab0e27a48a17275122ad8f324b615':
Try to fix mac build.
Nicolas Geoffray [Tue, 4 Nov 2014 13:46:22 +0000 (13:46 +0000)]
Merge "Try to fix mac build."
Nicolas Geoffray [Tue, 4 Nov 2014 13:03:29 +0000 (13:03 +0000)]
Try to fix mac build.
Change-Id: I6c7faa1c80bc7c250d14859d51c910d50b7fb562
Nicolas Geoffray [Tue, 4 Nov 2014 11:55:06 +0000 (11:55 +0000)]
am
457e6170: Merge "New failure on optimizing/arm64 after CONST_CLASS support."
* commit '
457e6170ac55e4cbede79a23b021422ef4ccd92f':
New failure on optimizing/arm64 after CONST_CLASS support.
Nicolas Geoffray [Tue, 4 Nov 2014 11:50:23 +0000 (11:50 +0000)]
Merge "New failure on optimizing/arm64 after CONST_CLASS support."
Nicolas Geoffray [Tue, 4 Nov 2014 11:49:17 +0000 (11:49 +0000)]
New failure on optimizing/arm64 after CONST_CLASS support.
Change-Id: I7bae21795bc038e98f17a903e5964feef0718a37
Nicolas Geoffray [Tue, 4 Nov 2014 11:26:56 +0000 (11:26 +0000)]
am
636e1f55: Merge "Implement CONST_CLASS in optimizing compiler."
* commit '
636e1f55be6657a49d1ec536ba576d4c22833bc4':
Implement CONST_CLASS in optimizing compiler.
Nicolas Geoffray [Tue, 4 Nov 2014 11:23:47 +0000 (11:23 +0000)]
Merge "Implement CONST_CLASS in optimizing compiler."
Nicolas Geoffray [Mon, 3 Nov 2014 14:51:25 +0000 (14:51 +0000)]
Implement CONST_CLASS in optimizing compiler.
Change-Id: Ia8c8dfbef87cb2f7893bfb6e178466154eec9efd
Nicolas Geoffray [Tue, 4 Nov 2014 09:57:49 +0000 (09:57 +0000)]
am
793d1023: Merge "miranda multidex test fails on optimizing/arm64."
* commit '
793d1023785f81eb8e29a3eb67fec17d7ee7dcbe':
miranda multidex test fails on optimizing/arm64.
Nicolas Geoffray [Tue, 4 Nov 2014 09:17:11 +0000 (09:17 +0000)]
Merge "miranda multidex test fails on optimizing/arm64."
Nicolas Geoffray [Tue, 4 Nov 2014 09:15:35 +0000 (09:15 +0000)]
miranda multidex test fails on optimizing/arm64.
Change-Id: I9c41f7aaeb77d2a50c177fdc71fa54503eeb612f
Andreas Gampe [Tue, 4 Nov 2014 08:48:15 +0000 (08:48 +0000)]
am
b6b9eeab: Merge "ART: Fix unused parameter warning on Mac"
* commit '
b6b9eeaba9b8006029a56a1c7241e56f82dcbf11':
ART: Fix unused parameter warning on Mac
Andreas Gampe [Tue, 4 Nov 2014 08:45:07 +0000 (08:45 +0000)]
Merge "ART: Fix unused parameter warning on Mac"