OSDN Git Service
Andreas Gampe [Thu, 14 Jul 2016 23:50:52 +0000 (16:50 -0700)]
ART: Fix build break
Build break introduced by mismatch from merges.
Bug:
28251566
Change-Id: I83a333dd7394af630c5a79153d4838eb3a910714
Philip Cuadra [Thu, 14 Jul 2016 23:04:01 +0000 (23:04 +0000)]
Merge \\"Add API for getting location of odex or oat file\\" into nyc-mr1-dev am:
9397e9782c
am:
9a881eb106
Change-Id: I0139572af72d50533e0c6fb36348dc164db301a7
Philip Cuadra [Thu, 14 Jul 2016 22:38:20 +0000 (22:38 +0000)]
Merge \"Add API for getting location of odex or oat file\" into nyc-mr1-dev
am:
9397e9782c
Change-Id: Ie0b1e17bd308de129cc8adf9dc1914d32dbc3517
Philip Cuadra [Thu, 14 Jul 2016 22:26:20 +0000 (22:26 +0000)]
Merge "Add API for getting location of odex or oat file" into nyc-mr1-dev
Mathieu Chartier [Thu, 14 Jul 2016 21:26:56 +0000 (21:26 +0000)]
Merge \\\\"Revert \\\\"Revert \\\\"Dump more dex file data in oatdump\\\\"\\\\"\\\\" am:
05d9a647a6 am:
9c26f22584 am:
fe788fe5ef
am:
fa5cb55abc
Change-Id: Id72a042934e87e9021dd7cf7b63b23e6545f1f0e
Mathieu Chartier [Thu, 14 Jul 2016 21:21:53 +0000 (21:21 +0000)]
Merge \\\"Revert \\\"Revert \\\"Dump more dex file data in oatdump\\\"\\\"\\\" am:
05d9a647a6 am:
9c26f22584
am:
fe788fe5ef
Change-Id: I0a8fa636d48da81bae88f189c23a13f24eec2c42
Mathieu Chartier [Thu, 14 Jul 2016 21:19:25 +0000 (21:19 +0000)]
Merge \\"Revert \\"Revert \\"Dump more dex file data in oatdump\\"\\"\\" am:
05d9a647a6
am:
9c26f22584
Change-Id: If4cbcba0fe9853d787eadaf731abcb5f96984f51
Mathieu Chartier [Thu, 14 Jul 2016 21:16:25 +0000 (21:16 +0000)]
Merge \"Revert \"Revert \"Dump more dex file data in oatdump\"\"\"
am:
05d9a647a6
Change-Id: Id0e8315df8d934d1ac652c8baa520ba58d2db19d
Treehugger Robot [Thu, 14 Jul 2016 21:09:55 +0000 (21:09 +0000)]
Merge "Revert "Revert "Dump more dex file data in oatdump"""
Philip Cuadra [Tue, 12 Jul 2016 23:37:40 +0000 (16:37 -0700)]
Add API for getting location of odex or oat file
Add an API for getting the file path of odex or oat file given a dex
path.
Bug
28251566
Change-Id: Ibebaa20f15d8135b25d9eb5927b7979801ebf0b2
Mathieu Chartier [Thu, 14 Jul 2016 17:10:44 +0000 (10:10 -0700)]
Revert "Revert "Dump more dex file data in oatdump""
Delete runtime to fix leak before callin exit.
Bug:
29462018
This reverts commit
9c05578dd2306231437bd290c0f70abc2bb3b6d8.
Change-Id: Ica23ba0f2d07496d0e4a3288329945f612ac3b20
xueliang.zhong [Thu, 14 Jul 2016 20:00:51 +0000 (20:00 +0000)]
Merge \\\\"Integer.bitCount and Long.bitCount intrinsics for ARM\\\\" am:
f18f3cb337 am:
bc76799ba9 am:
93c765d638
am:
ccb79c5981
Change-Id: I186b03a238e74f4bf6fea9d653d08c1a39745433
Andreas Gampe [Thu, 14 Jul 2016 20:00:51 +0000 (20:00 +0000)]
Merge \\\\"ART: Add FdFile constructors\\\\" am:
2fce5cf079 am:
0c2edd89b6 am:
8cfa3b43b7
am:
98a381f54b
Change-Id: Icfe5c3be8bb0add1a6fca4ebbe9368339593f150
xueliang.zhong [Thu, 14 Jul 2016 19:55:18 +0000 (19:55 +0000)]
Merge \\\"Integer.bitCount and Long.bitCount intrinsics for ARM\\\" am:
f18f3cb337 am:
bc76799ba9
am:
93c765d638
Change-Id: I275e4bffebd8513de04990f887deafdd5568dcb5
xueliang.zhong [Thu, 14 Jul 2016 19:52:50 +0000 (19:52 +0000)]
Merge \\"Integer.bitCount and Long.bitCount intrinsics for ARM\\" am:
f18f3cb337
am:
bc76799ba9
Change-Id: Ie63a98345ac7be6f2a4bd3f001c2b884487ade90
xueliang.zhong [Thu, 14 Jul 2016 19:49:51 +0000 (19:49 +0000)]
Merge \"Integer.bitCount and Long.bitCount intrinsics for ARM\"
am:
f18f3cb337
Change-Id: I920dbbe308feb3999966fb9f9fa7e1f6cf1d1fa1
Treehugger Robot [Thu, 14 Jul 2016 19:44:38 +0000 (19:44 +0000)]
Merge "Integer.bitCount and Long.bitCount intrinsics for ARM"
Andreas Gampe [Thu, 14 Jul 2016 19:28:44 +0000 (19:28 +0000)]
Merge \\\"ART: Add FdFile constructors\\\" am:
2fce5cf079 am:
0c2edd89b6
am:
8cfa3b43b7
Change-Id: Id37d0fd862e1f0fded6abf00685fc90685de667a
Andreas Gampe [Thu, 14 Jul 2016 18:58:13 +0000 (18:58 +0000)]
Merge \\"ART: Add FdFile constructors\\" am:
2fce5cf079
am:
0c2edd89b6
Change-Id: Ie1b78347e3d64b95c0f2ddae97b530cf1f5dd1e9
Andreas Gampe [Thu, 14 Jul 2016 18:55:19 +0000 (18:55 +0000)]
Merge \"ART: Add FdFile constructors\"
am:
2fce5cf079
Change-Id: Iba1dd0dbe494aa365dc0b6a4727a34721f2bd1d8
Treehugger Robot [Thu, 14 Jul 2016 18:48:03 +0000 (18:48 +0000)]
Merge "ART: Add FdFile constructors"
Nicolas Geoffray [Thu, 14 Jul 2016 16:43:07 +0000 (16:43 +0000)]
Fix a bug in ClassTableGet code generation for IMTs. am:
b3cd84a2fb
am:
fdc414859d
Change-Id: Ic6739bf23a703ac11e90d3d980eebdaf4b0067bb
Nicolas Geoffray [Thu, 14 Jul 2016 16:04:52 +0000 (16:04 +0000)]
Fix a bug in ClassTableGet code generation for IMTs.
am:
b3cd84a2fb
Change-Id: Ic92c76555825ebbd9c4ffa3300744abd4e4e4e6d
xueliang.zhong [Tue, 5 Jul 2016 14:28:19 +0000 (15:28 +0100)]
Integer.bitCount and Long.bitCount intrinsics for ARM
Change-Id: I4ed3e779415be026c7d090b61a3e356b37c418e5
Roland Levillain [Thu, 14 Jul 2016 09:53:26 +0000 (09:53 +0000)]
Merge \\\\"Introduce more compact ReadBarrierMark slow-paths.\\\\" am:
2c30a37342 am:
333b9e1f3b am:
7b864ea95d
am:
ed67ced4a8
Change-Id: Id6ce3cbbe76574c9ff6fc407aa424b393a203121
Nicolas Geoffray [Thu, 14 Jul 2016 09:53:20 +0000 (09:53 +0000)]
Merge \\\\"Revert \\\\"Dump more dex file data in oatdump\\\\"\\\\" am:
7598736db0 am:
da9d11c5c3 am:
33218f4e92
am:
187a4d685c
Change-Id: I138f4090d257a439780b2363787b94c49d9ca610
Roland Levillain [Thu, 14 Jul 2016 09:46:49 +0000 (09:46 +0000)]
Merge \\\"Introduce more compact ReadBarrierMark slow-paths.\\\" am:
2c30a37342 am:
333b9e1f3b
am:
7b864ea95d
Change-Id: Iead2f282a2512ee95b20b08998fc1110fda91d04
Nicolas Geoffray [Thu, 14 Jul 2016 09:46:48 +0000 (09:46 +0000)]
Merge \\\"Revert \\\"Dump more dex file data in oatdump\\\"\\\" am:
7598736db0 am:
da9d11c5c3
am:
33218f4e92
Change-Id: I543d92aeb8691a6bdfc8c921167b19ae93cc8d9e
Roland Levillain [Thu, 14 Jul 2016 09:41:58 +0000 (09:41 +0000)]
Merge \\"Introduce more compact ReadBarrierMark slow-paths.\\" am:
2c30a37342
am:
333b9e1f3b
Change-Id: Ie71cb6cd05a6590137b35cd3dd4761e5704ca107
Nicolas Geoffray [Thu, 14 Jul 2016 09:41:55 +0000 (09:41 +0000)]
Merge \\"Revert \\"Dump more dex file data in oatdump\\"\\" am:
7598736db0
am:
da9d11c5c3
Change-Id: I49eb03f31456e8a542aeaf6b7f67f35247b0d7b7
Roland Levillain [Thu, 14 Jul 2016 09:37:56 +0000 (09:37 +0000)]
Merge \"Introduce more compact ReadBarrierMark slow-paths.\"
am:
2c30a37342
Change-Id: I2101a1ca0c37c53499bb1bb75a6acb6e6b921c11
Nicolas Geoffray [Thu, 14 Jul 2016 09:37:35 +0000 (09:37 +0000)]
Merge \"Revert \"Dump more dex file data in oatdump\"\"
am:
7598736db0
Change-Id: I2d2efa7dbbd64d28d5ed80dc00940ca1e284e39d
Roland Levillain [Thu, 14 Jul 2016 09:32:34 +0000 (09:32 +0000)]
Merge "Introduce more compact ReadBarrierMark slow-paths."
Nicolas Geoffray [Thu, 14 Jul 2016 09:24:45 +0000 (09:24 +0000)]
Merge "Revert "Dump more dex file data in oatdump""
Nicolas Geoffray [Thu, 14 Jul 2016 09:24:30 +0000 (09:24 +0000)]
Revert "Dump more dex file data in oatdump"
Breaks valgrind.
Bug:
29462018
This reverts commit
8e2c56252aa9527bd9a82bdd147fdc46cf5deb9c.
Change-Id: If58cedcee75dd0eda8571e90d63e080a4709d773
Nicolas Geoffray [Thu, 14 Jul 2016 08:13:16 +0000 (08:13 +0000)]
Merge \\\\"Fix a bug in ClassTableGet code generation for IMTs.\\\\" am:
09d77fac67 am:
75141e1212 am:
60e4a7dfc6
am:
932b4c6985
Change-Id: I9142d12e9b4fe0d66f941e05ff7fa4971ccc3b51
Nicolas Geoffray [Thu, 14 Jul 2016 08:09:30 +0000 (08:09 +0000)]
Merge \\\"Fix a bug in ClassTableGet code generation for IMTs.\\\" am:
09d77fac67 am:
75141e1212
am:
60e4a7dfc6
Change-Id: I48a0463585acd022f4033cb495cd1fd54880f8f5
Nicolas Geoffray [Thu, 14 Jul 2016 08:05:46 +0000 (08:05 +0000)]
Merge \\"Fix a bug in ClassTableGet code generation for IMTs.\\" am:
09d77fac67
am:
75141e1212
Change-Id: If809ab128ac7cae16176ca6776b93678880526dd
Nicolas Geoffray [Wed, 13 Jul 2016 13:13:48 +0000 (14:13 +0100)]
Fix a bug in ClassTableGet code generation for IMTs.
Introduced by:
https://android-review.googlesource.com/#/c/244980/
test:566-polymorphic-inling for fixing x86 crash. Also
fixes a performance regression.
bug:
29188168
(cherry picked from commit
ff484b95b25a5181a6a8a191cbd11da501c97651)
Change-Id: Iae5a63cb24017222c3fefda695a0a39673719f51
Nicolas Geoffray [Thu, 14 Jul 2016 08:02:29 +0000 (08:02 +0000)]
Merge \"Fix a bug in ClassTableGet code generation for IMTs.\"
am:
09d77fac67
Change-Id: I2b756a64600300f000e304990ba0f7e9c8dbea0b
Nicolas Geoffray [Thu, 14 Jul 2016 07:56:16 +0000 (07:56 +0000)]
Merge "Fix a bug in ClassTableGet code generation for IMTs."
Andreas Gampe [Thu, 13 Aug 2015 23:44:54 +0000 (16:44 -0700)]
ART: Add FdFile constructors
Make Open protected, and expose constructors instead. Add a move
constructor and move assignment operator.
Add OS functions that return the FdFile non-pointer version.
Add tests.
Bug:
21192156
Test: m test-art-host
Test: m test-art-target (shamu)
Change-Id: I83e390edde7cd37c900e9d5c3e4d21da22981b3f
Mathieu Chartier [Wed, 13 Jul 2016 21:49:04 +0000 (21:49 +0000)]
Merge \\\\"Dump more dex file data in oatdump\\\\" am:
d2c44723e6 am:
9bbe6eb837 am:
750d7dd1dc
am:
b9ffb89980
Change-Id: Ic157774b18c22a04f9303bed1dd1a3dd6a194118
Mathieu Chartier [Wed, 13 Jul 2016 21:43:58 +0000 (21:43 +0000)]
Merge \\\"Dump more dex file data in oatdump\\\" am:
d2c44723e6 am:
9bbe6eb837
am:
750d7dd1dc
Change-Id: I29460e6c50aedb5301fee7e2c3849c2bdd839b1f
Mathieu Chartier [Wed, 13 Jul 2016 21:41:13 +0000 (21:41 +0000)]
Merge \\"Dump more dex file data in oatdump\\" am:
d2c44723e6
am:
9bbe6eb837
Change-Id: Ib38dbb57a771b8f12bd6cad0ad1dc2b058b3a935
Mathieu Chartier [Wed, 13 Jul 2016 21:38:47 +0000 (21:38 +0000)]
Merge \"Dump more dex file data in oatdump\"
am:
d2c44723e6
Change-Id: Ife43250c61de0d71a0122b85869e40b8141a4ebe
Treehugger Robot [Wed, 13 Jul 2016 21:35:59 +0000 (21:35 +0000)]
Merge "Dump more dex file data in oatdump"
Andreas Gampe [Wed, 13 Jul 2016 21:29:10 +0000 (21:29 +0000)]
Merge \\"ART: Remove zygote OTA code\\" into nyc-mr1-dev am:
7d6a39acf2
am:
ab4c9fbb69
Change-Id: I2337a8e515347398212cb7d1c41b6e1e742b6c88
Mathieu Chartier [Tue, 21 Jun 2016 22:14:20 +0000 (15:14 -0700)]
Dump more dex file data in oatdump
Dump some statistics for each dex file along side with strings loaded
from code and dex code bytes.
Sample output:
Cumulative dex file data
Num string ids: 202809
Num method ids: 320464
Num field ids: 162822
Num type ids: 68151
Num class defs: 48061
Unique strings loaded from dex code: 51049
Total strings loaded from dex code: 106651
Number of unique dex code items: 247929
Total number of dex code bytes:
11090574
Added content testing to oat dump test. No significant slowdown.
TEST: test-art-host
Bug:
29462018
Change-Id: I60effd3087d8c427eda4ee26431d5d77165b3939
Andreas Gampe [Wed, 13 Jul 2016 18:37:32 +0000 (18:37 +0000)]
Merge \"ART: Remove zygote OTA code\" into nyc-mr1-dev
am:
7d6a39acf2
Change-Id: I3e78678c2e6307533ce681077ff1d8ca033b7543
Andreas Gampe [Wed, 13 Jul 2016 18:29:47 +0000 (18:29 +0000)]
Merge "ART: Remove zygote OTA code" into nyc-mr1-dev
Matthew Gharrity [Wed, 13 Jul 2016 18:22:48 +0000 (18:22 +0000)]
Merge \\\\"Improve search for available spill slots in RA\\\\" am:
633c22de95 am:
54c4ee43e6 am:
0ad38215c6
am:
25d4de5769
Change-Id: I5be3170d01210580d51ca8487f472f7d21a7d5e9
Matthew Gharrity [Wed, 13 Jul 2016 18:17:09 +0000 (18:17 +0000)]
Merge \\\"Improve search for available spill slots in RA\\\" am:
633c22de95 am:
54c4ee43e6
am:
0ad38215c6
Change-Id: Ib25847e599157a77fce2eb011e38270b6ff271b1
Aart Bik [Wed, 13 Jul 2016 18:14:40 +0000 (18:14 +0000)]
Merge \\\\"Refactored a few dexdump alloc/free into unique_ptr\\\\" am:
bcdc888a39 am:
346cb25ef5 am:
03a07dd3a8
am:
9b53cefb46
Change-Id: Ic77367d5f37729dc6f76f18174170dd648106165
Aart Bik [Wed, 13 Jul 2016 18:11:56 +0000 (18:11 +0000)]
Merge \\\"Refactored a few dexdump alloc/free into unique_ptr\\\" am:
bcdc888a39 am:
346cb25ef5
am:
03a07dd3a8
Change-Id: I4a2970b8d826b1f7088a7ca94d8c916e0f3b9c75
Matthew Gharrity [Wed, 13 Jul 2016 18:11:50 +0000 (18:11 +0000)]
Merge \\"Improve search for available spill slots in RA\\" am:
633c22de95
am:
54c4ee43e6
Change-Id: I6eb8762522c9d2c983071ed7fdb33e8136d9bb42
Matthew Gharrity [Wed, 13 Jul 2016 18:09:11 +0000 (18:09 +0000)]
Merge \"Improve search for available spill slots in RA\"
am:
633c22de95
Change-Id: I10995d473788006890fa0346ffde795e5152d0a9
Aart Bik [Wed, 13 Jul 2016 18:09:08 +0000 (18:09 +0000)]
Merge \\"Refactored a few dexdump alloc/free into unique_ptr\\" am:
bcdc888a39
am:
346cb25ef5
Change-Id: I12207fcbec4f305858de0f3e32e6d76dd48e32de
Treehugger Robot [Wed, 13 Jul 2016 18:07:04 +0000 (18:07 +0000)]
Merge "Improve search for available spill slots in RA"
Aart Bik [Wed, 13 Jul 2016 18:05:31 +0000 (18:05 +0000)]
Merge \"Refactored a few dexdump alloc/free into unique_ptr\"
am:
bcdc888a39
Change-Id: Ic18afd294dca850e2fadf338141edc888828d8bd
Treehugger Robot [Wed, 13 Jul 2016 17:55:52 +0000 (17:55 +0000)]
Merge "Refactored a few dexdump alloc/free into unique_ptr"
Vladimir Marko [Wed, 13 Jul 2016 17:25:13 +0000 (17:25 +0000)]
Merge \\\\"X86: Use memory to do array range checks\\\\" am:
a708355691 am:
cf9d7a63c8 am:
4a07ae6135
am:
77669ae550
Change-Id: I00b80e2526e0ab1aa3f729df8d4fde648771b1dd
Mark Mendell [Wed, 13 Jul 2016 17:07:29 +0000 (17:07 +0000)]
Merge \\\"X86: Use memory to do array range checks\\\" am:
a708355691 am:
cf9d7a63c8
am:
4a07ae6135
Change-Id: I5048e13aec2f041329303d8008bda87d4b4c0db5
Vladimir Marko [Wed, 13 Jul 2016 17:02:39 +0000 (17:02 +0000)]
Merge \\"X86: Use memory to do array range checks\\" am:
a708355691
am:
cf9d7a63c8
Change-Id: Ib1ae67fe150f939683b64f46fe18f1a330e97937
Mark Mendell [Wed, 13 Jul 2016 16:55:39 +0000 (16:55 +0000)]
Merge \"X86: Use memory to do array range checks\"
am:
a708355691
Change-Id: I51fc867a67ab05db1f1c93175518f35fc18d9f78
Vladimir Marko [Wed, 13 Jul 2016 16:37:34 +0000 (16:37 +0000)]
Merge "X86: Use memory to do array range checks"
Richard Uhler [Wed, 13 Jul 2016 16:04:12 +0000 (16:04 +0000)]
Merge changes I91249ba8,Ic93812d9 am:
c8cbda6596 am:
1dacb48805 am:
e06947f340
am:
f1ce3f8230
Change-Id: If37507340ba4d781483d2b40e11dbcd201881a78
Richard Uhler [Wed, 13 Jul 2016 16:00:21 +0000 (16:00 +0000)]
Merge changes I91249ba8,Ic93812d9 am:
c8cbda6596 am:
1dacb48805
am:
e06947f340
Change-Id: I9b31e5f81510052439142b48e7081b9bbd6bb728
Richard Uhler [Wed, 13 Jul 2016 15:56:29 +0000 (15:56 +0000)]
Merge changes I91249ba8,Ic93812d9 am:
c8cbda6596
am:
1dacb48805
Change-Id: Icb403ddde43d3491f403b01a24f2f40d073fb94d
Richard Uhler [Wed, 13 Jul 2016 15:52:30 +0000 (15:52 +0000)]
Merge changes I91249ba8,Ic93812d9
am:
c8cbda6596
Change-Id: Id1f8627e00b38987647525539973b0f51802f549
Treehugger Robot [Wed, 13 Jul 2016 15:42:18 +0000 (15:42 +0000)]
Merge changes I91249ba8,Ic93812d9
* changes:
Use "" to indicate the oat filename could not be computed.
Compute and cache oat file status in OatFileAssistant.
Nicolas Geoffray [Wed, 13 Jul 2016 13:13:48 +0000 (14:13 +0100)]
Fix a bug in ClassTableGet code generation for IMTs.
Introduced by:
https://android-review.googlesource.com/#/c/244980/
test:566-polymorphic-inling for fixing x86 crash. Also
fixes a performance regression.
bug:
29188168
Change-Id: Id90cb819c88e7ba3db1cb3c50c517a112ab7d784
Mark Mendell [Tue, 12 Jul 2016 15:13:15 +0000 (11:13 -0400)]
X86: Use memory to do array range checks
Currently, an HBoundsCheck is fed by an HArrayLength, causing a load of
the array length, followed by a register compare.
Avoid the load when we can by comparing directly with the array length
in memory. Implement this by marking the HArrayLength as 'emitted at
use site', and then generating the code in the HBoundsCheck.
Only do this replacement when we are the only user of the ArrayLength
and it isn't visible to the environment.
Handle the special case where the array is 'null' and where an implicit
null check can't be eliminated.
This code moves the load of the length to the slow code for the failed
check, which is what we want.
Test: 609-checker-x86-bounds-check
Change-Id: I9cdb183301e048234bb0ffeda940eedcf4a655bd
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Roland Levillain [Wed, 13 Jul 2016 10:54:35 +0000 (11:54 +0100)]
Introduce more compact ReadBarrierMark slow-paths.
Replace entry point ReadBarrierMark with 32
ReadBarrierMarkRegX entry points, using register
number X as input and output (instead of the standard
runtime calling convention) to save two moves in Baker's
read barrier mark slow-path code.
Test: ART host and target (ARM, ARM64) tests.
Bug:
29506760
Bug:
12687968
Change-Id: I73cfb82831cf040b8b018e984163c865cc44ed87
Nicolas Geoffray [Wed, 13 Jul 2016 09:37:37 +0000 (09:37 +0000)]
Merge \\\\"Blacklist flaky test.\\\\" am:
1fd3473032 am:
65a3500dbe am:
851264ae05
am:
03e18090df
Change-Id: Ic4717b1e7bd10e0cef5f812449e256ef74be9c46
Nicolas Geoffray [Wed, 13 Jul 2016 09:34:00 +0000 (09:34 +0000)]
Merge \\\"Blacklist flaky test.\\\" am:
1fd3473032 am:
65a3500dbe
am:
851264ae05
Change-Id: I7ab8f04e1e5781f2599e9e9b627cef8db12fc0f3
Nicolas Geoffray [Wed, 13 Jul 2016 09:30:16 +0000 (09:30 +0000)]
Merge \\"Blacklist flaky test.\\" am:
1fd3473032
am:
65a3500dbe
Change-Id: I023f8ed3893d94d629d67d1cfec84d832b07d35f
Nicolas Geoffray [Wed, 13 Jul 2016 09:26:42 +0000 (09:26 +0000)]
Merge \"Blacklist flaky test.\"
am:
1fd3473032
Change-Id: I8d8d1e356b23e034ab9d531f69a35fcf5a2e7562
Nicolas Geoffray [Wed, 13 Jul 2016 09:19:45 +0000 (09:19 +0000)]
Merge "Blacklist flaky test."
Nicolas Geoffray [Wed, 13 Jul 2016 09:18:48 +0000 (10:18 +0100)]
Blacklist flaky test.
bug:
30107038
Change-Id: Id976c6c7d764a44c1b30155714fb64b4441cdac2
Dmitriy Filchenko [Wed, 13 Jul 2016 01:08:31 +0000 (01:08 +0000)]
Merge \\\\"Update the get_process_name call.\\\\" am:
e8508094c3 am:
820c55f6b0 am:
c5e9bd998c
am:
411b8efe84
Change-Id: I6f0911f9c3a2772b96428ad22d005cef9a5ed55b
Dmitriy Filchenko [Wed, 13 Jul 2016 00:58:37 +0000 (00:58 +0000)]
Merge \\\"Update the get_process_name call.\\\" am:
e8508094c3 am:
820c55f6b0
am:
c5e9bd998c
Change-Id: I3ddf4a5b47e3f1b9f0bde27a5b267c49e585a91e
Dmitriy Filchenko [Wed, 13 Jul 2016 00:54:50 +0000 (00:54 +0000)]
Merge \\"Update the get_process_name call.\\" am:
e8508094c3
am:
820c55f6b0
Change-Id: I604cd538424c39abb3674218e6f2308305d65251
Dmitriy Filchenko [Wed, 13 Jul 2016 00:51:36 +0000 (00:51 +0000)]
Merge \"Update the get_process_name call.\"
am:
e8508094c3
Change-Id: I6a85cf5d753ad13604d81b42eac882fdb8403fb2
Treehugger Robot [Wed, 13 Jul 2016 00:35:48 +0000 (00:35 +0000)]
Merge "Update the get_process_name call."
Aart Bik [Tue, 12 Jul 2016 22:53:13 +0000 (15:53 -0700)]
Refactored a few dexdump alloc/free into unique_ptr
Rationale: easier to read
Test: dexdump's output is well-tested
Change-Id: Ib5b36dce68d442e555599f9427bd9bfa7c6f3831
Richard Uhler [Tue, 12 Jul 2016 18:58:35 +0000 (18:58 +0000)]
Merge changes Iafd12677,I40595d15 am:
0599c5976a am:
7292a51227 am:
6439d4b528
am:
827b25f0aa
Change-Id: I1e2d0c1797190f47cabbb416b02f31d3628a1900
Richard Uhler [Tue, 12 Jul 2016 18:54:51 +0000 (18:54 +0000)]
Merge changes Iafd12677,I40595d15 am:
0599c5976a am:
7292a51227
am:
6439d4b528
Change-Id: Id7a25458038c2bc9c864485b098323bc04edda1e
Richard Uhler [Tue, 12 Jul 2016 18:51:49 +0000 (18:51 +0000)]
Merge changes Iafd12677,I40595d15 am:
0599c5976a
am:
7292a51227
Change-Id: I55c49f897c6f5a288af11683e67fdf2fb53b5e84
Richard Uhler [Tue, 12 Jul 2016 18:46:40 +0000 (18:46 +0000)]
Merge changes Iafd12677,I40595d15
am:
0599c5976a
Change-Id: I71f0f22446cf13cbc87ebd5b97021b9df13c8c26
Treehugger Robot [Tue, 12 Jul 2016 18:32:29 +0000 (18:32 +0000)]
Merge changes Iafd12677,I40595d15
* changes:
profile_changed should not effect GetBestOatFile.
Make OpenImageSpace static and ArtFileName internal.
Matthew Gharrity [Mon, 11 Jul 2016 21:45:01 +0000 (14:45 -0700)]
Improve search for available spill slots in RA
Previously we always searched for two adjacent spill slots, even if
we only needed one. This small change fixes that.
Test: m test-art-host
Change-Id: I021d355e6602ffee687c8537a959232b1504dcf1
Vladimir Marko [Tue, 12 Jul 2016 15:16:11 +0000 (15:16 +0000)]
Merge \\\\"ARM64: Shorter fast-path for read barrier field load.\\\\" am:
058d934b42 am:
cf71164f35 am:
fc99784c16
am:
f00138d7c4
Change-Id: I57e01548f617807dc594bc34c020c02c80823da2
Vladimir Marko [Tue, 12 Jul 2016 15:13:28 +0000 (15:13 +0000)]
Merge \\\"ARM64: Shorter fast-path for read barrier field load.\\\" am:
058d934b42 am:
cf71164f35
am:
fc99784c16
Change-Id: I443e56a7f316cf0b891a0f7625e03a3d61a04422
Vladimir Marko [Tue, 12 Jul 2016 15:10:42 +0000 (15:10 +0000)]
Merge \\"ARM64: Shorter fast-path for read barrier field load.\\" am:
058d934b42
am:
cf71164f35
Change-Id: I0d817158b977df3d61d1badedc7c6f2cb7434dca
Vladimir Marko [Tue, 12 Jul 2016 15:08:00 +0000 (15:08 +0000)]
Merge \"ARM64: Shorter fast-path for read barrier field load.\"
am:
058d934b42
Change-Id: I0ce4ad02d01bc9153b48182e6f0d69daa49700e4
Vladimir Marko [Tue, 12 Jul 2016 15:02:31 +0000 (15:02 +0000)]
Merge "ARM64: Shorter fast-path for read barrier field load."
Vladimir Marko [Tue, 12 Jul 2016 14:29:55 +0000 (14:29 +0000)]
Merge \\\\"Two more patterns for instruction simplifier\\\\" am:
2f378bf675 am:
d038662902 am:
3c70ecec27
am:
fc12705e4c
Change-Id: I6954a119dee29e9b94962a3bf4441f507b61d9f5
Maxim Kazantsev [Tue, 12 Jul 2016 14:27:11 +0000 (14:27 +0000)]
Merge \\\"Two more patterns for instruction simplifier\\\" am:
2f378bf675 am:
d038662902
am:
3c70ecec27
Change-Id: I9623cf9cde5936f7f360c73c47ad7f69fe451a3b
Vladimir Marko [Tue, 12 Jul 2016 14:24:28 +0000 (14:24 +0000)]
Merge \\"Two more patterns for instruction simplifier\\" am:
2f378bf675
am:
d038662902
Change-Id: Ia4aa80a167969da4cfebd216e0eafe7014c45f0d
OSDN Git Service
