OSDN Git Service

android-x86/art.git
7 years agoDon't push handle scope for critical native generic JNI
Mathieu Chartier [Tue, 4 Oct 2016 22:41:42 +0000 (15:41 -0700)]
Don't push handle scope for critical native generic JNI

Leaving a stale handle scope causes problems for the GC the next
time roots are visited. At this point the stack will have other
contents and the GC will attempt to mark many invalid roots.

Bug: 31933313

Test: non preopt eng build booting.
Test: test-art-host

Change-Id: I26607c271a2f50a8a8ab745e8d665e4b3c0778a5

7 years agoMerge "Option to gnuplot dex layout" am: b4f0076e7f am: 5538962ddf am: c127ab0771
David Sehr [Tue, 4 Oct 2016 18:21:48 +0000 (18:21 +0000)]
Merge "Option to gnuplot dex layout" am: b4f0076e7f am: 5538962ddf am: c127ab0771
am: b482032794

Change-Id: Ib4e8f98a2b6b90f7f253e84de293ae520acc6d4e

7 years agoMerge "Option to gnuplot dex layout" am: b4f0076e7f am: 5538962ddf
David Sehr [Tue, 4 Oct 2016 18:19:48 +0000 (18:19 +0000)]
Merge "Option to gnuplot dex layout" am: b4f0076e7f am: 5538962ddf
am: c127ab0771

Change-Id: I293901a8ea2ea22c6818a14bc7c88530b696e712

7 years agoMerge "Option to gnuplot dex layout" am: b4f0076e7f
David Sehr [Tue, 4 Oct 2016 18:16:14 +0000 (18:16 +0000)]
Merge "Option to gnuplot dex layout" am: b4f0076e7f
am: 5538962ddf

Change-Id: Ie3062d0a2342ceeeb227e218ce625a17143a582c

7 years agoMerge "Option to gnuplot dex layout"
David Sehr [Tue, 4 Oct 2016 18:14:15 +0000 (18:14 +0000)]
Merge "Option to gnuplot dex layout"
am: b4f0076e7f

Change-Id: I1d9f8ada132c74306291ecb42762959d69a41aac

7 years agoMerge "Option to gnuplot dex layout"
David Sehr [Tue, 4 Oct 2016 18:06:48 +0000 (18:06 +0000)]
Merge "Option to gnuplot dex layout"

7 years agoOption to gnuplot dex layout
David Sehr [Mon, 26 Sep 2016 14:44:04 +0000 (07:44 -0700)]
Option to gnuplot dex layout

Display the portions of the dex file that are accessed by the classes in
the dex file.  Optionally limit the display to only those classes that
are present in a runtime profile.

Bug: 29921113
Change-Id: I2a998fba448fec6c23941d3b4358531b1336e1b3
Test: dexlayout test

7 years agoMerge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852 am: 79dbc88b60
Colin Cross [Tue, 4 Oct 2016 16:57:39 +0000 (16:57 +0000)]
Merge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852 am: 79dbc88b60
am: 53317a19a4

Change-Id: I979219e7ff1770763ec00090bb9aec4565508759

7 years agoMerge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852
Colin Cross [Tue, 4 Oct 2016 16:55:43 +0000 (16:55 +0000)]
Merge "Compute PPID at ninja time" am: 82d4838d6b am: 6adda1d852
am: 79dbc88b60

Change-Id: Id80b2592ad4823d0018dcb7f5d6ceb53dede1714

7 years agoMerge "Compute PPID at ninja time" am: 82d4838d6b
Colin Cross [Tue, 4 Oct 2016 16:53:40 +0000 (16:53 +0000)]
Merge "Compute PPID at ninja time" am: 82d4838d6b
am: 6adda1d852

Change-Id: I95513f5611c952ae1a445667ebf076d8e5680e08

7 years agoMerge "Compute PPID at ninja time"
Colin Cross [Tue, 4 Oct 2016 16:51:11 +0000 (16:51 +0000)]
Merge "Compute PPID at ninja time"
am: 82d4838d6b

Change-Id: If36dc12209df40a91680fed5d085d56bebe8bf6e

7 years agoMerge "Compute PPID at ninja time"
Colin Cross [Tue, 4 Oct 2016 16:45:44 +0000 (16:45 +0000)]
Merge "Compute PPID at ninja time"

7 years agoMerge "Remove dead code from compiler driver." am: eebe142e93 am: 440ae0e8fe am:...
Nicolas Geoffray [Tue, 4 Oct 2016 14:18:46 +0000 (14:18 +0000)]
Merge "Remove dead code from compiler driver." am: eebe142e93 am: 440ae0e8fe am: d4e34fead1
am: 9f5b8bc9e3

Change-Id: I12cf842e902b1931b4edbddb6b05a86ca347b201

7 years agoMerge "Remove dead code from compiler driver." am: eebe142e93 am: 440ae0e8fe
Nicolas Geoffray [Tue, 4 Oct 2016 14:16:33 +0000 (14:16 +0000)]
Merge "Remove dead code from compiler driver." am: eebe142e93 am: 440ae0e8fe
am: d4e34fead1

Change-Id: Idc60c4dec289af320b9a6edb01f684d285a742a8

7 years agoMerge "Remove dead code from compiler driver." am: eebe142e93
Nicolas Geoffray [Tue, 4 Oct 2016 14:14:30 +0000 (14:14 +0000)]
Merge "Remove dead code from compiler driver." am: eebe142e93
am: 440ae0e8fe

Change-Id: I07c255e41e056cfd1146cdbcc384b13eeceb00c8

7 years agoMerge "Remove dead code from compiler driver."
Nicolas Geoffray [Tue, 4 Oct 2016 14:12:30 +0000 (14:12 +0000)]
Merge "Remove dead code from compiler driver."
am: eebe142e93

Change-Id: Ic7aebf11851cc6706b6cd3a99cb013eeda850544

7 years agoMerge "Remove dead code from compiler driver."
Nicolas Geoffray [Tue, 4 Oct 2016 14:08:10 +0000 (14:08 +0000)]
Merge "Remove dead code from compiler driver."

7 years agoRemove dead code from compiler driver.
Nicolas Geoffray [Mon, 3 Oct 2016 14:09:25 +0000 (15:09 +0100)]
Remove dead code from compiler driver.

test: m test-art-host
Change-Id: Ie4b6a4c371fff6c9c213d8d6604eb09a5e71d595

7 years agoMerge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e am: a2f2e1031f...
Nicolas Geoffray [Tue, 4 Oct 2016 11:10:22 +0000 (11:10 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e am: a2f2e1031f am: f652164bf3
am: 4fba08b7fc

Change-Id: I484e0cd8ca334732d7e60b00bb47dede6894a0ff

7 years agoMerge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e am: a2f2e1031f
Nicolas Geoffray [Tue, 4 Oct 2016 11:08:24 +0000 (11:08 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e am: a2f2e1031f
am: f652164bf3

Change-Id: I2e3888c90a2dd5329ae84e487fe40339bcd33603

7 years agoMerge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e
Nicolas Geoffray [Tue, 4 Oct 2016 11:06:21 +0000 (11:06 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool."" am: 148768f51e
am: a2f2e1031f

Change-Id: Ia8013df96a788dcb5d6077b41de02041d0e3c579

7 years agoMerge "Revert "Add dex file writer to dexlayout tool.""
Nicolas Geoffray [Tue, 4 Oct 2016 11:04:21 +0000 (11:04 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool.""
am: 148768f51e

Change-Id: I0a9e96f33e5be196fd5631bd58acd05de9e5a697

7 years agoMerge "Revert "Add dex file writer to dexlayout tool.""
Nicolas Geoffray [Tue, 4 Oct 2016 11:01:53 +0000 (11:01 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool.""

7 years agoRevert "Add dex file writer to dexlayout tool."
Nicolas Geoffray [Tue, 4 Oct 2016 11:01:17 +0000 (11:01 +0000)]
Revert "Add dex file writer to dexlayout tool."

Bug: 29921113

This reverts commit 69b58cf399c3507ca3debf9ec9b2db3c5a0fe7f2.

Change-Id: I8bf9b1222d99489059e45f47d220396a853170a4

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352...
Narayan Kamath [Tue, 4 Oct 2016 08:46:45 +0000 (08:46 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352c am: b9523df0ba am: 5074e753af
am: a30a08367f

Change-Id: Ica84d62ee2b4ab448c772b35c58b908390c2a668

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352...
Narayan Kamath [Tue, 4 Oct 2016 08:44:46 +0000 (08:44 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352c am: b9523df0ba
am: 5074e753af

Change-Id: Ic230b5b43f33f7b8fcd70b66d57a2b74ee3cd770

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352c
Narayan Kamath [Tue, 4 Oct 2016 08:40:44 +0000 (08:40 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon." am: f12831352c
am: b9523df0ba

Change-Id: I7aa0a12ddbe25218a449d2f9a1007a88f07bda95

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon."
Narayan Kamath [Tue, 4 Oct 2016 08:38:43 +0000 (08:38 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon."
am: f12831352c

Change-Id: I6e97ab2c8f574cd794a8d3f3d0fe4762f92d8891

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon."
Narayan Kamath [Tue, 4 Oct 2016 08:35:13 +0000 (08:35 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon."

7 years agointerpreter: Remove unnecessary template arg from DoCallCommon.
Narayan Kamath [Mon, 3 Oct 2016 15:51:22 +0000 (16:51 +0100)]
interpreter: Remove unnecessary template arg from DoCallCommon.

The function was always called with a fixed size array so there's
no real advantage in templatizing it this way.

Test: make build-art-host

Change-Id: I782e113225f1c97877f2bcb5afe8df9ae8efd26e

7 years agoMerge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c am: 3145346c0...
Mathieu Chartier [Tue, 4 Oct 2016 08:12:12 +0000 (08:12 +0000)]
Merge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c am: 3145346c01 am: d8a5425ebd
am: 3227043828

Change-Id: I41e0f5b5ff68cee61c8bdba0c68fc374976f5a34

7 years agoMerge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c am: 3145346c01
Mathieu Chartier [Tue, 4 Oct 2016 08:10:16 +0000 (08:10 +0000)]
Merge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c am: 3145346c01
am: d8a5425ebd

Change-Id: Iec273bc9d4939677cd8bd4f83ee5924cbc128da7

7 years agoMerge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c
Mathieu Chartier [Tue, 4 Oct 2016 08:07:41 +0000 (08:07 +0000)]
Merge "Add handle wrapper for interpreter field get/set" am: 8c2983be6c
am: 3145346c01

Change-Id: If3103f1be5c4ce098bfb29117af200040637cf71

7 years agoMerge "Add handle wrapper for interpreter field get/set"
Mathieu Chartier [Tue, 4 Oct 2016 08:06:11 +0000 (08:06 +0000)]
Merge "Add handle wrapper for interpreter field get/set"
am: 8c2983be6c

Change-Id: Ic954db30680bb152d40378ed752387e4537337ca

7 years agoMerge "Add handle wrapper for interpreter field get/set"
Mathieu Chartier [Tue, 4 Oct 2016 08:02:59 +0000 (08:02 +0000)]
Merge "Add handle wrapper for interpreter field get/set"

7 years agoAdd handle wrapper for interpreter field get/set
Mathieu Chartier [Tue, 4 Oct 2016 05:49:46 +0000 (22:49 -0700)]
Add handle wrapper for interpreter field get/set

The listeners have thread suspension for jdwp tests.

Bug: 31113334

Test: tools/run-jdwp-tests.sh '--mode=host' '--variant=X32' --no-jit --debug

Change-Id: I08f17432cc0c79ee9a0163eb88d4d6355f6851ca

7 years agoMerge changes I50493bca,I8b266ad0 am: 5075b0e5e2 am: deee36b949 am: 29c844550e
Mathieu Chartier [Tue, 4 Oct 2016 01:15:08 +0000 (01:15 +0000)]
Merge changes I50493bca,I8b266ad0 am: 5075b0e5e2 am: deee36b949 am: 29c844550e
am: b6764c7a76

Change-Id: I7421d28b17e608219ecfc8bf8910bd730f46ce5d

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66...
Mathieu Chartier [Tue, 4 Oct 2016 01:14:58 +0000 (01:14 +0000)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66 am: c6eb6f5f75 am: ee27fd39d7
am: 531cdf55e0

Change-Id: Ibf76f526a7aff8cb98d0529c48fce28f7cb93921

7 years agoMove ArtField to ObjPtr am: 3398c7874e am: bb26f317ba am: 6fded28a51
Mathieu Chartier [Tue, 4 Oct 2016 01:14:49 +0000 (01:14 +0000)]
Move ArtField to ObjPtr am: 3398c7874e am: bb26f317ba am: 6fded28a51
am: f242199223

Change-Id: Id2ecd31026a8c1bf1b989b7186b92391f8122aa3

7 years agoMerge changes I50493bca,I8b266ad0 am: 5075b0e5e2 am: deee36b949
Mathieu Chartier [Tue, 4 Oct 2016 01:13:10 +0000 (01:13 +0000)]
Merge changes I50493bca,I8b266ad0 am: 5075b0e5e2 am: deee36b949
am: 29c844550e

Change-Id: I9151ac06eeccdb477d9975a44e27a4e8eb16974c

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66...
Mathieu Chartier [Tue, 4 Oct 2016 01:13:02 +0000 (01:13 +0000)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66 am: c6eb6f5f75
am: ee27fd39d7

Change-Id: I45d272bb3fe1de2125e637f8214d32ca47efb1a7

7 years agoMove ArtField to ObjPtr am: 3398c7874e am: bb26f317ba
Mathieu Chartier [Tue, 4 Oct 2016 01:12:52 +0000 (01:12 +0000)]
Move ArtField to ObjPtr am: 3398c7874e am: bb26f317ba
am: 6fded28a51

Change-Id: I15b4684a7d404a9e96f4a41bbb9307157b0cb5fc

7 years agoMerge changes I50493bca,I8b266ad0 am: 5075b0e5e2
Mathieu Chartier [Tue, 4 Oct 2016 01:11:36 +0000 (01:11 +0000)]
Merge changes I50493bca,I8b266ad0 am: 5075b0e5e2
am: deee36b949

Change-Id: Ica63db11f1d6fdd1c1d7a6a2be5eec1df4e04ad8

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66
Mathieu Chartier [Tue, 4 Oct 2016 01:11:28 +0000 (01:11 +0000)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest am: b890130a66
am: c6eb6f5f75

Change-Id: Ifbb17ca510af262d4484798fd798d3479a487a9c

7 years agoMove ArtField to ObjPtr am: 3398c7874e
Mathieu Chartier [Tue, 4 Oct 2016 01:11:20 +0000 (01:11 +0000)]
Move ArtField to ObjPtr am: 3398c7874e
am: bb26f317ba

Change-Id: Iae6010717e74a0ab66fd80f31ee62147fddcf6a8

7 years agoMerge changes I50493bca,I8b266ad0
Mathieu Chartier [Tue, 4 Oct 2016 01:09:28 +0000 (01:09 +0000)]
Merge changes I50493bca,I8b266ad0
am: 5075b0e5e2

Change-Id: Id9374c534cf2dd03a4a71d38d83d3e670ca1ec7e

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
Mathieu Chartier [Tue, 4 Oct 2016 01:09:27 +0000 (01:09 +0000)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
am: b890130a66

Change-Id: I8394cd377bf81f4d367067d101a8734c3999d18e

7 years agoMove ArtField to ObjPtr
Mathieu Chartier [Tue, 4 Oct 2016 01:09:18 +0000 (01:09 +0000)]
Move ArtField to ObjPtr
am: 3398c7874e

Change-Id: I0aa82905394f02357eaaf96507382344ca6e6292

7 years agoMerge changes I50493bca,I8b266ad0
Mathieu Chartier [Tue, 4 Oct 2016 01:06:05 +0000 (01:06 +0000)]
Merge changes I50493bca,I8b266ad0

* changes:
  Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
  Move ArtField to ObjPtr

7 years agoMerge "Add dex file writer to dexlayout tool." am: 3ee94eea2a am: 2cb1fa6827 am:...
Jeff Hao [Tue, 4 Oct 2016 00:56:19 +0000 (00:56 +0000)]
Merge "Add dex file writer to dexlayout tool." am: 3ee94eea2a am: 2cb1fa6827 am: d1db4b09b9
am: 0c49c93f19

Change-Id: I6d0bbe37f7534a093dda0b7a7f681142a6e43b7d

7 years agoCompute PPID at ninja time
Colin Cross [Mon, 3 Oct 2016 23:40:13 +0000 (16:40 -0700)]
Compute PPID at ninja time

Using $(shell $$PPID) to compute PPID will return the pid of kati, which
will be the same for multiple sequential runs of make without changing
any makefiles.  Replace it with a bash subshell command to return the pid
of ninja, which will be different for every call to make.

ART_HOST_TEST_DIR now contains $ that need to propagate to the final
bash command, and must be evaluated exactly once.  Escape the $ in
${ART_HOST_TEST_DIR} in define-test-art-run-test so that
${ART_HOST_TEST_DIR} is not substituted in the function call to prevent
evaluating its contents in the $(eval) that wraps it, which would
substitute out the necessary $.

Test: m -j test-art-host
Change-Id: I3303805481cc1c77d1a321674e8c7c003043a7c4

7 years agoMerge "Add dex file writer to dexlayout tool." am: 3ee94eea2a am: 2cb1fa6827
Jeff Hao [Tue, 4 Oct 2016 00:54:21 +0000 (00:54 +0000)]
Merge "Add dex file writer to dexlayout tool." am: 3ee94eea2a am: 2cb1fa6827
am: d1db4b09b9

Change-Id: I0a87bcc212723ea1e0a42576753e15721d24ec43

7 years agoMerge "Add dex file writer to dexlayout tool." am: 3ee94eea2a
Jeff Hao [Tue, 4 Oct 2016 00:52:19 +0000 (00:52 +0000)]
Merge "Add dex file writer to dexlayout tool." am: 3ee94eea2a
am: 2cb1fa6827

Change-Id: I8e4db9d197feca033f0b167598149cf1e5ecec44

7 years agoMerge "Add dex file writer to dexlayout tool."
Jeff Hao [Tue, 4 Oct 2016 00:50:17 +0000 (00:50 +0000)]
Merge "Add dex file writer to dexlayout tool."
am: 3ee94eea2a

Change-Id: I45e84a7997c835bf2d556c8b4b0102bbe6b59b0f

7 years agoMerge "Add dex file writer to dexlayout tool."
Jeff Hao [Tue, 4 Oct 2016 00:46:26 +0000 (00:46 +0000)]
Merge "Add dex file writer to dexlayout tool."

7 years agoMerge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e am: 0fd7fbbe8f...
Mark Salyzyn [Mon, 3 Oct 2016 23:16:14 +0000 (23:16 +0000)]
Merge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e am: 0fd7fbbe8f am: 2fff50a61a
am: 1da94711c8

Change-Id: I9f502e8386aeca08ba64901f17e222fd9e75e495

7 years agoMerge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e am: 0fd7fbbe8f
Mark Salyzyn [Mon, 3 Oct 2016 23:14:19 +0000 (23:14 +0000)]
Merge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e am: 0fd7fbbe8f
am: 2fff50a61a

Change-Id: I2c72ae5be27873e48907dfca678c5bcbc5737f9b

7 years agoMerge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e
Mark Salyzyn [Mon, 3 Oct 2016 23:10:10 +0000 (23:10 +0000)]
Merge "art: Replace cutils/log.h with android/log.h" am: bd590cbd0e
am: 0fd7fbbe8f

Change-Id: Ia963a8bee63195dc27ed150a5f3778e64e5763a2

7 years agoMerge "art: Replace cutils/log.h with android/log.h"
Mark Salyzyn [Mon, 3 Oct 2016 23:07:39 +0000 (23:07 +0000)]
Merge "art: Replace cutils/log.h with android/log.h"
am: bd590cbd0e

Change-Id: I4f4cf2064c2e1eb3c9c9f07c02da9bf272087c94

7 years agoMerge "art: Replace cutils/log.h with android/log.h"
Mark Salyzyn [Mon, 3 Oct 2016 23:02:27 +0000 (23:02 +0000)]
Merge "art: Replace cutils/log.h with android/log.h"

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
Mathieu Chartier [Fri, 30 Sep 2016 17:27:43 +0000 (10:27 -0700)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest

Also added LookupResolvedType that is guaranteed to not do thread
suspension but deals with multidex since GetResolvedType will
return null if the type was resolved in another dex file.

Added test.

Bug: 31113334

Test: test-art-host CC baker

Change-Id: I50493bca7d8ce9760546c3116b717484c62c47a4

7 years agoMerge "Run dexfuzz in bisection-search mode" am: 6ba406580e am: 4834194b84 am: 9e9d141632
Aart Bik [Mon, 3 Oct 2016 21:39:05 +0000 (21:39 +0000)]
Merge "Run dexfuzz in bisection-search mode" am: 6ba406580e am: 4834194b84 am: 9e9d141632
am: e0681f9828

Change-Id: I604afc081a4d1cc87bc479b4381b1a9b36e14ebc

7 years agoMerge "Run dexfuzz in bisection-search mode" am: 6ba406580e am: 4834194b84
Aart Bik [Mon, 3 Oct 2016 21:37:09 +0000 (21:37 +0000)]
Merge "Run dexfuzz in bisection-search mode" am: 6ba406580e am: 4834194b84
am: 9e9d141632

Change-Id: I5f4ce5d49ede98297e61ff98c6d42daccc99770e

7 years agoAdd dex file writer to dexlayout tool.
Jeff Hao [Fri, 23 Sep 2016 01:02:49 +0000 (18:02 -0700)]
Add dex file writer to dexlayout tool.

All sections are being written out properly.
There is one small difference:
  - unindexed string data is not written out

Bug: 29921113
Test: mm test-art-host-gtest-dexlayout_test
Change-Id: I3872327526a350f33f0f851516a389622c1a54ae

7 years agoMerge "Run dexfuzz in bisection-search mode" am: 6ba406580e
Aart Bik [Mon, 3 Oct 2016 21:33:04 +0000 (21:33 +0000)]
Merge "Run dexfuzz in bisection-search mode" am: 6ba406580e
am: 4834194b84

Change-Id: Ie26a8c71e138f3adc63aba91d3198bc8dd150114

7 years agoMerge "Run dexfuzz in bisection-search mode"
Aart Bik [Mon, 3 Oct 2016 21:31:34 +0000 (21:31 +0000)]
Merge "Run dexfuzz in bisection-search mode"
am: 6ba406580e

Change-Id: I11f9d561ed89856a8675e68b773d5adb98a24c9d

7 years agoMerge "Run dexfuzz in bisection-search mode"
Aart Bik [Mon, 3 Oct 2016 21:29:19 +0000 (21:29 +0000)]
Merge "Run dexfuzz in bisection-search mode"

7 years agoMove ArtField to ObjPtr
Mathieu Chartier [Fri, 30 Sep 2016 17:27:43 +0000 (10:27 -0700)]
Move ArtField to ObjPtr

Added EXPECT_OBJ_PTR_EQ and variants to gtests.

Fixed moving GC bugs in:
ClassLinker::CreatePathClassLoader
ClassLinkerTest: StaticFields

ObjPtr Decode call sites: 186 -> 181.

Some tests fail due to ResolvedFieldAccessTest, will fix in follow
up CL.

Bug: 31113334

Test: test-art-host CC baker

Change-Id: I8b266ad00f3c20c8cbe7cfdf280d175083df0b88

7 years agoMerge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd...
Igor Murashkin [Mon, 3 Oct 2016 19:51:59 +0000 (19:51 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd am: 7d909c4a2b am: 2f1a24fda5
am: d01317fafc

Change-Id: Ida47dda5c0c0cdbcc081c79a87e5dac6ce55fc05

7 years agoMerge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd...
Igor Murashkin [Mon, 3 Oct 2016 19:50:02 +0000 (19:50 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd am: 7d909c4a2b
am: 2f1a24fda5

Change-Id: I007bd6699e96c3058daa6492eb57857ae6348e3e

7 years agoRun dexfuzz in bisection-search mode
Wojciech Staszkiewicz [Thu, 29 Sep 2016 22:12:48 +0000 (15:12 -0700)]
Run dexfuzz in bisection-search mode

Call dexfuzz with --bisection-search switch to automatically bisect
discovered divergences.

Test: ./run_dex_fuzz_test.py
Change-Id: I87af8b45675b464e984a05e06eac24cad3650d2b

7 years agoMerge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd
Igor Murashkin [Mon, 3 Oct 2016 19:45:59 +0000 (19:45 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent" am: a845d07bbd
am: 7d909c4a2b

Change-Id: Ideca54195ee11cdf741a1bb94021d610ccaea164

7 years agoMerge "benchmark: Add a build target that's not Android-dependent"
Igor Murashkin [Mon, 3 Oct 2016 19:43:58 +0000 (19:43 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent"
am: a845d07bbd

Change-Id: I681a857e3366bd6d61bd149c50ecdf9b3cbcf9a8

7 years agoMerge "benchmark: Add a build target that's not Android-dependent"
Treehugger Robot [Mon, 3 Oct 2016 19:39:28 +0000 (19:39 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent"

7 years agoMerge "Delete some unused bitmap walking code" am: 462e21cc8d am: 6c5c5a16b6 am:...
Mathieu Chartier [Mon, 3 Oct 2016 18:54:55 +0000 (18:54 +0000)]
Merge "Delete some unused bitmap walking code" am: 462e21cc8d am: 6c5c5a16b6 am: 72adaa9bb7
am: 55d4adda63

Change-Id: Ic7088aaaf5d8004fb28bcdf2063f6a589427c7a1

7 years agoMerge "Delete some unused bitmap walking code" am: 462e21cc8d am: 6c5c5a16b6
Mathieu Chartier [Mon, 3 Oct 2016 18:49:03 +0000 (18:49 +0000)]
Merge "Delete some unused bitmap walking code" am: 462e21cc8d am: 6c5c5a16b6
am: 72adaa9bb7

Change-Id: I23c3aafb4a9b1d7adfcfe955674392dc4d500728

7 years agoMerge "Delete some unused bitmap walking code" am: 462e21cc8d
Mathieu Chartier [Mon, 3 Oct 2016 18:45:27 +0000 (18:45 +0000)]
Merge "Delete some unused bitmap walking code" am: 462e21cc8d
am: 6c5c5a16b6

Change-Id: I08531a11bdf99d400a0f41fe163b7efe8401c3ab

7 years agoMerge "Delete some unused bitmap walking code"
Mathieu Chartier [Mon, 3 Oct 2016 18:41:59 +0000 (18:41 +0000)]
Merge "Delete some unused bitmap walking code"
am: 462e21cc8d

Change-Id: Ie01f34d37f895fadfb6e657deacfa8239ce6e4ba

7 years agoart: Replace cutils/log.h with android/log.h
Mark Salyzyn [Wed, 28 Sep 2016 22:29:14 +0000 (15:29 -0700)]
art: Replace cutils/log.h with android/log.h

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: Ie5720d9e1388047856392e8635895895c22f3112

7 years agoMerge "Delete some unused bitmap walking code"
Mathieu Chartier [Mon, 3 Oct 2016 18:27:26 +0000 (18:27 +0000)]
Merge "Delete some unused bitmap walking code"

7 years agobenchmark: Add a build target that's not Android-dependent
Igor Murashkin [Fri, 30 Sep 2016 21:12:14 +0000 (14:12 -0700)]
benchmark: Add a build target that's not Android-dependent

Allow building the micronative portion of libartbenchmark as pure JNI without any android
library dependencies.

Bug: 31401609
Change-Id: I99f1466fb668a9ae5dd2f7229dca44d3bb064e15

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6f...
Jeff Hao [Mon, 3 Oct 2016 18:00:53 +0000 (18:00 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b am: 67396f35de am: 5f894870a2
am: 50c2fa9ab1

Change-Id: I5732c3cd52d0732a603526f3b8b04443d4495bc2

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6f...
Jeff Hao [Mon, 3 Oct 2016 17:56:57 +0000 (17:56 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b am: 67396f35de
am: 5f894870a2

Change-Id: I6637de6f076a9748b95be26ef2c3d4990405a5f9

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b
Jeff Hao [Mon, 3 Oct 2016 17:53:24 +0000 (17:53 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b
am: 67396f35de

Change-Id: I68f1f4598cbeb9a376720d9f4bbd896ed6ec038f

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations"
Jeff Hao [Mon, 3 Oct 2016 17:49:53 +0000 (17:49 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations"
am: ce0db6fb7b

Change-Id: I2e6cb00c5962ebcd9f94a1f7f1d5f82e0b6298ba

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations"
Jeff Hao [Mon, 3 Oct 2016 17:42:15 +0000 (17:42 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations"

7 years agoMerge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca am: c356fc66cf
Narayan Kamath [Mon, 3 Oct 2016 13:26:54 +0000 (13:26 +0000)]
Merge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca am: c356fc66cf
am: f2f0ea052e

Change-Id: I240928815f1bda949efaf653056feb85c4a1c028

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35...
Narayan Kamath [Mon, 3 Oct 2016 13:26:38 +0000 (13:26 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35 am: 5d722d83e6 am: dc7ab3a0e1
am: fae353b771

Change-Id: I5d0b1c5537609abc0413b0a82b7dcb47ed113b47

7 years agoMerge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca
Narayan Kamath [Mon, 3 Oct 2016 13:23:24 +0000 (13:23 +0000)]
Merge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca
am: c356fc66cf

Change-Id: I566af9d8dbab6f7d8218b6735d2d3fe948541e88

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35...
Narayan Kamath [Mon, 3 Oct 2016 13:23:10 +0000 (13:23 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35 am: 5d722d83e6
am: dc7ab3a0e1

Change-Id: I6b5e170b8b805183ecc772d69692405c13259ec9

7 years agoMerge "DexCachePair : Add an Assign method." am: d295618ac7
Narayan Kamath [Mon, 3 Oct 2016 13:19:22 +0000 (13:19 +0000)]
Merge "DexCachePair : Add an Assign method." am: d295618ac7
am: 25912555ca

Change-Id: Icfbe18b08e866e3c1532b3b4c6668ec017f4212e

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35
Narayan Kamath [Mon, 3 Oct 2016 13:19:07 +0000 (13:19 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35
am: 5d722d83e6

Change-Id: I68466df8d8d1a21737d778754622f7cbbb041e26

7 years agoMerge "DexCachePair : Add an Assign method."
Narayan Kamath [Mon, 3 Oct 2016 13:15:50 +0000 (13:15 +0000)]
Merge "DexCachePair : Add an Assign method."
am: d295618ac7

Change-Id: I400ebe914f35dd690902888b8edbc9d78262fc90

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab."
Narayan Kamath [Mon, 3 Oct 2016 13:15:37 +0000 (13:15 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab."
am: 1ec37ada35

Change-Id: I31e88cef1bc1dbcef2bd84dc9dbac2b13723bc40

7 years agoMerge "DexCachePair : Add an Assign method."
Narayan Kamath [Mon, 3 Oct 2016 13:10:42 +0000 (13:10 +0000)]
Merge "DexCachePair : Add an Assign method."

7 years agoDexCachePair : Add an Assign method.
Narayan Kamath [Fri, 30 Sep 2016 15:29:19 +0000 (16:29 +0100)]
DexCachePair : Add an Assign method.

This prevents the logic for determining a slot from the type ID from
being scattered all over the place.

Bug: 30550796
Test: make test-art-host
Change-Id: I4ad6db8b730dc617fa8474a71c3794963b58279b

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab."
Narayan Kamath [Mon, 3 Oct 2016 13:09:34 +0000 (13:09 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab."

7 years agoMerge "class_linker: Add support for resolving method types." am: ebeee75e46 am:...
Narayan Kamath [Mon, 3 Oct 2016 10:48:01 +0000 (10:48 +0000)]
Merge "class_linker: Add support for resolving method types." am: ebeee75e46 am: 838d4b7aff am: 5c4aeb46f5
am: 7cec87f751

Change-Id: I3b9364ebc746e3c129926a22be158bd6a1488bef

7 years agoMerge "class_linker: Add support for resolving method types." am: ebeee75e46 am:...
Narayan Kamath [Mon, 3 Oct 2016 10:44:05 +0000 (10:44 +0000)]
Merge "class_linker: Add support for resolving method types." am: ebeee75e46 am: 838d4b7aff
am: 5c4aeb46f5

Change-Id: I382bf3c92c48b4575f515d822d9e7840ecfb3eeb

7 years agoMerge "class_linker: Add support for resolving method types." am: ebeee75e46
Narayan Kamath [Mon, 3 Oct 2016 10:40:31 +0000 (10:40 +0000)]
Merge "class_linker: Add support for resolving method types." am: ebeee75e46
am: 838d4b7aff

Change-Id: Ied67ad558ac83aafae2fc7b2c7c70ab649f4fb26