OSDN Git Service
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.
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
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"
Andreas Gampe [Tue, 4 Nov 2014 08:42:32 +0000 (00:42 -0800)]
ART: Fix unused parameter warning on Mac
Change-Id: Ibf462b90a44c41e2f450724be8cc934b00f17f41
Andreas Gampe [Tue, 4 Nov 2014 07:53:25 +0000 (07:53 +0000)]
am
ad17d418: Merge "ART: Replace COMPILE_ASSERT with static_assert (compiler)"
* commit '
ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3':
ART: Replace COMPILE_ASSERT with static_assert (compiler)
Andreas Gampe [Tue, 4 Nov 2014 07:53:23 +0000 (07:53 +0000)]
am
8851cbae: Merge "ART: Replace COMPILE_ASSERT with static_assert (runtime)"
* commit '
8851cbaeb75f5a89ec88cbf4b26d6f846bbf6411':
ART: Replace COMPILE_ASSERT with static_assert (runtime)
Andreas Gampe [Tue, 4 Nov 2014 07:51:34 +0000 (07:51 +0000)]
Merge "ART: Replace COMPILE_ASSERT with static_assert (compiler)"
Andreas Gampe [Tue, 4 Nov 2014 07:49:16 +0000 (07:49 +0000)]
Merge "ART: Replace COMPILE_ASSERT with static_assert (runtime)"
Andreas Gampe [Tue, 4 Nov 2014 07:41:03 +0000 (23:41 -0800)]
ART: Replace COMPILE_ASSERT with static_assert (runtime)
Replace all occurrences of COMPILE_ASSERT in the runtime tree.
Change-Id: I01e420899c760094fb342cc6cb9e692dd670a0b2
Andreas Gampe [Tue, 4 Nov 2014 06:57:30 +0000 (22:57 -0800)]
ART: Replace COMPILE_ASSERT with static_assert (compiler)
Replace all occurrences of COMPILE_ASSERT in the compiler tree.
Change-Id: Icc40a38c8bdeaaf7305ab3352a838a2cd7e7d840
Andreas Gampe [Tue, 4 Nov 2014 04:31:30 +0000 (04:31 +0000)]
am
2998e9cd: Merge "ART: Fix unused parameters in libsigchain"
* commit '
2998e9cdc9f19c30c4944a4726ed9f147de79ebd':
ART: Fix unused parameters in libsigchain
Andreas Gampe [Tue, 4 Nov 2014 04:27:33 +0000 (04:27 +0000)]
Merge "ART: Fix unused parameters in libsigchain"
Andreas Gampe [Tue, 4 Nov 2014 04:25:24 +0000 (20:25 -0800)]
ART: Fix unused parameters in libsigchain
The sigchain dummy implementation does not use any parameters.
Change-Id: Icbb71677e5092cd5990a69ea3a62703c0747ae17
Ian Rogers [Tue, 4 Nov 2014 04:06:06 +0000 (04:06 +0000)]
am
a10a8b56: Merge "Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags."
* commit '
a10a8b56a01be95b3ec13022d3a155e163a11673':
Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags.
Ian Rogers [Tue, 4 Nov 2014 04:02:48 +0000 (04:02 +0000)]
Merge "Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags."
Ian Rogers [Fri, 31 Oct 2014 07:33:20 +0000 (00:33 -0700)]
Remove -Wno-unused-parameter and -Wno-sign-promo from base cflags.
Fix associated errors about unused paramenters and implict sign conversions.
For sign conversion this was largely in the area of enums, so add ostream
operators for the effected enums and fix tools/generate-operator-out.py.
Tidy arena allocation code and arena allocated data types, rather than fixing
new and delete operators.
Remove dead code.
Change-Id: I5b433e722d2f75baacfacae4d32aef4a828bfe1b
Mingyao Yang [Tue, 4 Nov 2014 00:53:39 +0000 (00:53 +0000)]
am
c6e09557: Merge "Some improvement to reg alloc."
* commit '
c6e0955737e15f7c0c3575d4e13789b3411f4993':
Some improvement to reg alloc.
Andreas Gampe [Tue, 4 Nov 2014 00:53:37 +0000 (00:53 +0000)]
am
9aee6fc7: Merge "ART: Add missing test dependency"
* commit '
9aee6fc7f23ca4c23d11b8b269da02a383d8debb':
ART: Add missing test dependency
Jeff Hao [Tue, 4 Nov 2014 00:53:36 +0000 (00:53 +0000)]
am
0c25f441: Merge "Check null this pointer for direct methods in FindMethodFast."
* commit '
0c25f441d0d85ec882b4634f496ed5bb71995f7c':
Check null this pointer for direct methods in FindMethodFast.
Mingyao Yang [Tue, 4 Nov 2014 00:21:46 +0000 (00:21 +0000)]
Merge "Some improvement to reg alloc."
Mingyao Yang [Mon, 6 Oct 2014 23:47:28 +0000 (16:47 -0700)]
Some improvement to reg alloc.
Change-Id: If579a37791278500a7e5bc763f144c241f261920
Andreas Gampe [Mon, 3 Nov 2014 23:41:18 +0000 (23:41 +0000)]
Merge "ART: Add missing test dependency"
Andreas Gampe [Mon, 3 Nov 2014 23:36:53 +0000 (15:36 -0800)]
ART: Add missing test dependency
Change-Id: Ic37fd3b8885a9745e1efe4f42578d9ab090a201c
Jeff Hao [Mon, 3 Nov 2014 22:27:16 +0000 (22:27 +0000)]
Merge "Check null this pointer for direct methods in FindMethodFast."
Jeff Hao [Thu, 30 Oct 2014 00:24:25 +0000 (17:24 -0700)]
Check null this pointer for direct methods in FindMethodFast.
Also adds regression test 127-secondarydex.
Bug:
18150997
(cherry picked from commit
d2bee3dffa2f552512f47bca605ed857e3ae30ea)
Change-Id: I911dd7c92c51939504cfee5a3d18a835987b8388
Andreas Gampe [Mon, 3 Nov 2014 18:37:14 +0000 (18:37 +0000)]
am
a338da43: Merge "ART: Add miranda checking"
* commit '
a338da434433b180c33e043929ea79b18f4c093c':
ART: Add miranda checking
Andreas Gampe [Mon, 3 Nov 2014 18:30:41 +0000 (18:30 +0000)]
Merge "ART: Add miranda checking"
Andreas Gampe [Mon, 3 Nov 2014 18:28:32 +0000 (18:28 +0000)]
am
4450721d: Merge "ART: Discard generated image in a low-memory environment"
* commit '
4450721d3d396b392b1ec27bafbf3b6f956682f7':
ART: Discard generated image in a low-memory environment
Andreas Gampe [Mon, 3 Nov 2014 18:24:44 +0000 (18:24 +0000)]
Merge "ART: Discard generated image in a low-memory environment"
Andreas Gampe [Sat, 1 Nov 2014 01:12:30 +0000 (18:12 -0700)]
ART: Add miranda checking
Add a test for resolution of miranda methods across dex-files. See
CL 112688 and b/
18193682 for the code change.
Fix the test script to support no-verify again.
Weaken the dex cache check to a check whether the found method is a
miranda method. This will penalize miranda methods, as they will
always have to be resolved by name, but does not require the multi-step
load of the method's dex cache.
Bug:
18193682
Change-Id: I1dae2a9ec0985dc8625acd7dd5686a5d3cdc8888
Mathieu Chartier [Mon, 3 Nov 2014 18:20:52 +0000 (18:20 +0000)]
am
a88219f1: Merge "Add image strings to intern table"
* commit '
a88219f157a53d6ba334bee92ad4718bfa6eb9c1':
Add image strings to intern table
Nicolas Geoffray [Mon, 3 Nov 2014 18:20:50 +0000 (18:20 +0000)]
am
71ed8c7e: Merge "Remove generated file if compiling the image failed."
* commit '
71ed8c7e38595e650dbd5a9fd17852776a938848':
Remove generated file if compiling the image failed.
Mathieu Chartier [Mon, 3 Nov 2014 18:18:40 +0000 (18:18 +0000)]
Merge "Add image strings to intern table"
Nicolas Geoffray [Mon, 3 Nov 2014 18:17:53 +0000 (18:17 +0000)]
Merge "Remove generated file if compiling the image failed."
Mathieu Chartier [Fri, 31 Oct 2014 18:49:27 +0000 (11:49 -0700)]
Add image strings to intern table
When we create the runtime, we now add the image strings to the
intern table if we are the zygote. This caused some memory bloat,
so I added an extra unordered set to the intern table.
There is now two unordered sets (hash talbe). One for pre-zygote
interns and one for post-zygote interns. This helps since the
pre-zygote hash table doesn't get dirtied. Even with adding
the image strings, we get total memory savings of around 5-7 MB
native PSS after device boot.
FB launch Before:
2.20% art::DexFile::FindStringId(char const*) const
TotalTime: 2069
TotalTime: 1985
TotalTime: 2088
TotalTime: 2003
TotalTime: 2034
TotalTime: 2049
After boot native PSS: 175585 kB: Native
After:
0.27% art::DexFile::FindStringId(char const*) const
TotalTime: 1682
TotalTime: 1756
TotalTime: 1825
TotalTime: 1751
TotalTime: 1666
TotalTime: 1813
After boot native PSS: 167089 kB: Native
Bug:
18054905
Bug:
16828525
Bug:
17808975
(cherry picked from commit
b6e292bf7eac9d73c6b79b1e9b7b87beb02436c9)
Change-Id: Ie367f3222f8c4db409ec49c3845276908b51e9c9
Andreas Gampe [Mon, 3 Nov 2014 18:17:18 +0000 (18:17 +0000)]
am
31e7c162: Merge "ART: Remove unnecessary includes"
* commit '
31e7c1628ffd90018a971e6650c924dc804b9a9a':
ART: Remove unnecessary includes
Andreas Gampe [Mon, 3 Nov 2014 18:12:44 +0000 (18:12 +0000)]
Merge "ART: Remove unnecessary includes"
Andreas Gampe [Mon, 3 Nov 2014 16:47:01 +0000 (08:47 -0800)]
ART: Remove unnecessary includes
Remove unnecessary includes from context_ISA.cc
Change-Id: Ic9919c0afd081ec405a5d972d152fe996d12fa3d
Nicolas Geoffray [Mon, 3 Nov 2014 16:23:48 +0000 (16:23 +0000)]
Remove generated file if compiling the image failed.
Change-Id: Ie809ad15d090e8303ec6ce308f76fc7f3f80cadd
Nicolas Geoffray [Mon, 3 Nov 2014 14:45:34 +0000 (14:45 +0000)]
am
07f09809: Merge "Add missing when testing TARGET_ARCH."
* commit '
07f09809c0575e985249450843b06f266b831fe1':
Add missing $() when testing TARGET_ARCH.
Nicolas Geoffray [Mon, 3 Nov 2014 14:40:29 +0000 (14:40 +0000)]
Merge "Add missing $() when testing TARGET_ARCH."
Nicolas Geoffray [Mon, 3 Nov 2014 14:39:21 +0000 (14:39 +0000)]
Add missing $() when testing TARGET_ARCH.
Change-Id: I02a25022d144ad2a502278755ff286278109a830
Nicolas Geoffray [Mon, 3 Nov 2014 14:00:33 +0000 (14:00 +0000)]
am
17231d03: Merge "Only use Quick for optimizing on arm64."
* commit '
17231d03bddaca260d8988d1007bb39c02383601':
Only use Quick for optimizing on arm64.
Nicolas Geoffray [Mon, 3 Nov 2014 14:00:32 +0000 (14:00 +0000)]
am
6cc88a7e: Merge "Disable kNoOutputOverlap optimization."
* commit '
6cc88a7e5ad695ce4f2651009231fd8f025d1a99':
Disable kNoOutputOverlap optimization.
Nicolas Geoffray [Mon, 3 Nov 2014 13:57:55 +0000 (13:57 +0000)]
Merge "Only use Quick for optimizing on arm64."
Nicolas Geoffray [Mon, 3 Nov 2014 13:57:14 +0000 (13:57 +0000)]
Merge "Disable kNoOutputOverlap optimization."
Andreas Gampe [Fri, 31 Oct 2014 23:45:19 +0000 (16:45 -0700)]
ART: Discard generated image in a low-memory environment
In case the available memory after image generation is low,
discard the image and continue in interpreted mode to mitigate
low-mem issues.
Bug:
17975190
(cherry picked from commit
e059b778a6a471455659eb8c3616858eb189fda8)
Change-Id: I9bbb5e52ffbf3570f85510efb76bcd7654e6951c
Brian Carlstrom [Fri, 31 Oct 2014 21:37:37 +0000 (21:37 +0000)]
am
9a41fb16: Merge "Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods"
* commit '
9a41fb1616df7e966e58cabc2abc1b5d90c9e14f':
Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods
Brian Carlstrom [Fri, 31 Oct 2014 21:33:35 +0000 (21:33 +0000)]
Merge "Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods"
Brian Carlstrom [Fri, 31 Oct 2014 07:01:54 +0000 (00:01 -0700)]
Fix FindDeclaredVirtualMethod(DexCache...) for miranda methods
If a class in classes.dex implements an interface from classes2.dex,
the miranda method will be in the dex cache for classes2.dex, but
pointed to by the virtual methods of the class in the dex caches for
classes.dex.
Therefore the fast path for DexCache::ResolveMethod that searches via
class and superclass virtual methods should ensure that any method
matching on dex method_idx should be from the same dex cache as the
class itself, which is not the case for miranda methods.
Bug:
18193682
(cherry picked from commit
9a783d6a0cb437fc0d9ffcc84502912f3d1cb73b)
Change-Id: Ia44f72c2ed2701e48153d14d2c5ca4ccc4959b30
Nicolas Geoffray [Fri, 31 Oct 2014 16:30:17 +0000 (16:30 +0000)]
am
57b4d1c4: Merge "Fix armv8 testing with default ANDROID_ROOT."
* commit '
57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e':
Fix armv8 testing with default ANDROID_ROOT.
Nicolas Geoffray [Fri, 31 Oct 2014 16:30:16 +0000 (16:30 +0000)]
am
f6e59f57: Merge "More armv8 failures now that optimizing supports CONST_STRING."
* commit '
f6e59f57d0c0cbbbe64d6862507350e4853495cd':
More armv8 failures now that optimizing supports CONST_STRING.
Nicolas Geoffray [Fri, 31 Oct 2014 15:50:18 +0000 (15:50 +0000)]
Merge "Fix armv8 testing with default ANDROID_ROOT."