OSDN Git Service
Andreas Gampe [Fri, 1 Apr 2016 03:02:51 +0000 (03:02 +0000)]
Merge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
am:
c4d6084
* commit '
c4d608488630222f96257c720c92b60a7bdd99fa':
Revert "ART: Resolve all classes even when verify-profile"
Change-Id: I55ca1396d3cd72dc3cf8ed04db1a8d13c4a9b825
Andreas Gampe [Fri, 1 Apr 2016 02:58:09 +0000 (02:58 +0000)]
Merge "Revert "ART: Resolve all classes even when verify-profile"" into nyc-dev
Andreas Gampe [Fri, 1 Apr 2016 01:30:21 +0000 (01:30 +0000)]
Merge "ART: Actually run tests cross arch for oatdump" am:
afc4829
am:
71bde08
* commit '
71bde0810fdc7e1faa9e1f601bbcbf74a2db837d':
ART: Actually run tests cross arch for oatdump
Change-Id: I678e935a7ab2ec489d3f19e1639ca7dae03644fe
Andreas Gampe [Fri, 1 Apr 2016 01:26:06 +0000 (01:26 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"
am:
afc4829
* commit '
afc4829d593c173e8e9bdca90257a4cc8a104537':
ART: Actually run tests cross arch for oatdump
Change-Id: I18204d0b9268456fd489d3d65c0a752dca5ea032
Andreas Gampe [Fri, 1 Apr 2016 01:21:37 +0000 (01:21 +0000)]
Merge "ART: Do not run verification under lock" into nyc-dev
am:
5f803f0
* commit '
5f803f0f7a5211ecda636293530e18c24b855d49':
ART: Do not run verification under lock
Change-Id: I109a0ddbff391510d600684cb51b8421505bb257
Andreas Gampe [Fri, 1 Apr 2016 01:13:17 +0000 (01:13 +0000)]
Merge "ART: Actually run tests cross arch for oatdump"
Andreas Gampe [Fri, 1 Apr 2016 01:08:44 +0000 (01:08 +0000)]
Merge "ART: Do not run verification under lock" into nyc-dev
Andreas Gampe [Fri, 1 Apr 2016 00:49:34 +0000 (17:49 -0700)]
Revert "ART: Resolve all classes even when verify-profile"
This reverts commit
82e8c1ff6d58e98a52725eeefc6c2407470239d2.
The deadlock is fixed by
884f3b83ed6b2a378535ac6b2be57d6b2e22de09.
Bug:
27924355
Andreas Gampe [Thu, 31 Mar 2016 02:52:58 +0000 (19:52 -0700)]
ART: Do not run verification under lock
Do not hold the object lock for the duration of the verification.
Instead, use the kStatusVerifying indicator to wait, similar to
resolution.
Bug:
27924355
(cherry picked from commit
884f3b83ed6b2a378535ac6b2be57d6b2e22de09)
Change-Id: Ie831f47dd830756a1b7002ca9c792f8ff67570dc
Mathieu Chartier [Thu, 31 Mar 2016 23:14:54 +0000 (23:14 +0000)]
Merge changes from topic \'image_verify\' am:
19a4784
am:
36d4ec6
* commit '
36d4ec60f1d5963b69326cc61e2a6db0fff54ea7':
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Change-Id: I33809874b914d560b214f7363e0f1d4aeeadc8a6
Mathieu Chartier [Thu, 31 Mar 2016 23:11:31 +0000 (23:11 +0000)]
Merge changes from topic \'image_verify\'
am:
19a4784
* commit '
19a4784ce1b9c6a0b3d3cdb91a182baa7adbb946':
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Change-Id: I6caf7ce96acbc0fade0010f9924f5b94f75ead45
Mathieu Chartier [Thu, 31 Mar 2016 23:03:07 +0000 (23:03 +0000)]
Merge changes from topic 'image_verify'
* changes:
Disable checks for b/
27493510
Add verification for image ArtMethod declaring classes
Andreas Gampe [Thu, 31 Mar 2016 23:01:50 +0000 (23:01 +0000)]
Merge "ART: Do not run verification under lock" am:
a455ec2
am:
ff5d050
* commit '
ff5d050631ff042283a18bfa37bec0057db2b450':
ART: Do not run verification under lock
Change-Id: Ibbbd44a0d6121ba4464a092a48ac15baeacaf5ec
Andreas Gampe [Thu, 31 Mar 2016 23:01:50 +0000 (23:01 +0000)]
Merge "ART: Add support for DexFile compiler filter function" am:
e669556
am:
efdf9fb
* commit '
efdf9fb98d356d40ead1f51397bba51ec27ddb96':
ART: Add support for DexFile compiler filter function
Change-Id: Ic7621816f9ea6fd54f37b890f224fdb97f29389e
Andreas Gampe [Thu, 31 Mar 2016 22:58:18 +0000 (22:58 +0000)]
Merge "ART: Do not run verification under lock"
am:
a455ec2
* commit '
a455ec2db2f4a59c524a7a3d3eabca046ed5dd29':
ART: Do not run verification under lock
Change-Id: Iab0d138734de8a5af733728ffe9e52dde8208fe0
Andreas Gampe [Thu, 31 Mar 2016 22:58:17 +0000 (22:58 +0000)]
Merge "ART: Add support for DexFile compiler filter function"
am:
e669556
* commit '
e6695569f086df8d0e9ab0d898aed13b1f1ea740':
ART: Add support for DexFile compiler filter function
Change-Id: Id5ef8876f37cc1048fa1f06a35e51122b3d3567e
Andreas Gampe [Thu, 31 Mar 2016 22:55:31 +0000 (22:55 +0000)]
Merge "ART: Do not run verification under lock"
Mathieu Chartier [Thu, 31 Mar 2016 22:05:45 +0000 (15:05 -0700)]
Disable checks for b/
27493510
Disabled for performance now that the bug is fixed. Still enabled
for debug builds.
Bug:
27493510
(cherry picked from commit
8790c7f9f7d684bff40d5731b2d8e3462ef8ed90)
Change-Id: I049d4319bca1114bd11a35bb13fc9d80c993260c
Andreas Gampe [Thu, 31 Mar 2016 02:52:58 +0000 (19:52 -0700)]
ART: Do not run verification under lock
Do not hold the object lock for the duration of the verification.
Instead, use the kStatusVerifying indicator to wait, similar to
resolution.
Bug:
27924355
Change-Id: Ie831f47dd830756a1b7002ca9c792f8ff67570dc
Mathieu Chartier [Tue, 8 Mar 2016 00:13:54 +0000 (16:13 -0800)]
Add verification for image ArtMethod declaring classes
Try and see if any ArtMethods in the image have declaring classes
that are not marked in the heap live bitmap. Trying to mark these
would cause a SIGSEGV since the bitmap is read only.
TODO: Disable for performance.
(cherry-picked from commit
03c1dd9858962071bf3f0c988abc39e0e6ed7a1e)
Bug:
27493510
Change-Id: I231b07b84d98dcd7ee1557c18956c86264058ee1
Andreas Gampe [Thu, 31 Mar 2016 22:52:51 +0000 (22:52 +0000)]
Merge "ART: Add support for DexFile compiler filter function"
Mathieu Chartier [Thu, 31 Mar 2016 22:47:19 +0000 (22:47 +0000)]
Disable checks for b/
27493510
am:
8790c7f
* commit '
8790c7f9f7d684bff40d5731b2d8e3462ef8ed90':
Disable checks for b/
27493510
Change-Id: If3a564e20bfd268e9660a1c972853dbe150d4917
Sebastien Hertz [Thu, 31 Mar 2016 22:15:12 +0000 (22:15 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK" am:
835e023
am:
d07afb5
* commit '
d07afb559168765ee1fbb24f33314dfd329f3db9':
Remove obsolete ANDROID_COMPILE_WITH_JACK
Change-Id: If47a28193709bc6ce41e35e76b1a7923bcc08fec
Mathieu Chartier [Thu, 31 Mar 2016 22:15:12 +0000 (22:15 +0000)]
Merge "Add way to disable resolving for stack walk" am:
b1e4b48
am:
a611377
* commit '
a611377de7573b2fa38e3d6ab3ff6d81ff87d67e':
Add way to disable resolving for stack walk
Change-Id: I72ab04f95f2251fcf12d6d11cb9317cd17b7abb8
Mathieu Chartier [Thu, 31 Mar 2016 22:05:45 +0000 (15:05 -0700)]
Disable checks for b/
27493510
Disabled for performance now that the bug is fixed. Still enabled
for debug builds.
Bug:
27493510
Change-Id: I4838b63d79163b97b47e13b201349a72c352ff38
Sebastien Hertz [Thu, 31 Mar 2016 22:11:55 +0000 (22:11 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK"
am:
835e023
* commit '
835e02367727fd981330b64ba938ecd7f675b408':
Remove obsolete ANDROID_COMPILE_WITH_JACK
Change-Id: I6af8c6dacad62482cbee673df05d50ed7ea8d2f7
Mathieu Chartier [Thu, 31 Mar 2016 22:11:55 +0000 (22:11 +0000)]
Merge "Add way to disable resolving for stack walk"
am:
b1e4b48
* commit '
b1e4b48c97d79530c863d80453c3d5d9aab056cc':
Add way to disable resolving for stack walk
Change-Id: I45e1f29a5e50a8a51055b0839d919200774f92cd
Ying Wang [Thu, 31 Mar 2016 22:05:04 +0000 (22:05 +0000)]
Merge "Remove obsolete ANDROID_COMPILE_WITH_JACK"
Mathieu Chartier [Thu, 31 Mar 2016 21:59:35 +0000 (21:59 +0000)]
Merge "Add way to disable resolving for stack walk"
Mathieu Chartier [Thu, 31 Mar 2016 21:52:52 +0000 (21:52 +0000)]
Add way to disable resolving for stack walk
am:
be2892b
* commit '
be2892bf771435eb451c74297b553f7dc9fea4ca':
Add way to disable resolving for stack walk
Change-Id: Ib03ce9d113032af97fbf3093e58dacffd46b77f8
Mathieu Chartier [Thu, 31 Mar 2016 18:07:09 +0000 (11:07 -0700)]
Add way to disable resolving for stack walk
Only occurs for walking the inlined frames case.
Bug:
27857910
(cherry picked from commit
be2892bf771435eb451c74297b553f7dc9fea4ca)
Change-Id: Ied92be96f2f74ba02c02168f704443b95e7a4b04
Mathieu Chartier [Thu, 31 Mar 2016 21:13:45 +0000 (21:13 +0000)]
Merge "Obtain stack trace outside of critical section" am:
6872412
am:
e9bc522
* commit '
e9bc5227dae30d8589d6e53f8876e7b7bbf2463f':
Obtain stack trace outside of critical section
Change-Id: I15ee74349d9002d93ff064a26a1eb55a0c215b53
Mathieu Chartier [Thu, 31 Mar 2016 21:10:31 +0000 (21:10 +0000)]
Merge "Obtain stack trace outside of critical section"
am:
6872412
* commit '
68724122b444e531d65413b1d9039f6e5fca52b3':
Obtain stack trace outside of critical section
Change-Id: If75300fc1ea558b5f838e5c521d10cf96a325750
Mathieu Chartier [Thu, 31 Mar 2016 21:05:30 +0000 (21:05 +0000)]
Merge "Obtain stack trace outside of critical section"
Mathieu Chartier [Thu, 31 Mar 2016 18:07:09 +0000 (11:07 -0700)]
Add way to disable resolving for stack walk
Only occurs for walking the inlined frames case.
Bug:
27857910
Change-Id: Idb90254879ebae4c756ee1a3d235999ae589a2a8
Mathieu Chartier [Thu, 31 Mar 2016 20:07:29 +0000 (20:07 +0000)]
Merge "Obtain stack trace outside of critical section" into nyc-dev
am:
91deb8a
* commit '
91deb8a52894c1e8f0d1cb18147bb74083cebb00':
Obtain stack trace outside of critical section
Change-Id: I91a679fde7900c4406221cdcbbb3609e69206a52
Mathieu Chartier [Tue, 29 Mar 2016 21:02:55 +0000 (14:02 -0700)]
Obtain stack trace outside of critical section
Fixes deadlock if the stack walk does allocations, changed stack
trace format to prevent slowdown.
Added missing GetInterfaceMethodIfProxy to fix a crash in maps.
Bug:
27857910
(cherry picked from commit
23428587d32361736d4c5e0ba7270c7602695a43)
Change-Id: I64373bcd87a68fdd1b58fb855db2b16c9f6ed36b
Mathieu Chartier [Thu, 31 Mar 2016 19:59:38 +0000 (19:59 +0000)]
Merge "Obtain stack trace outside of critical section" into nyc-dev
Richard Uhler [Thu, 31 Mar 2016 19:36:16 +0000 (19:36 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result." am:
fd9ac38
am:
6adc6fe
* commit '
6adc6fe4bcadccf2f2aaa6a6159e975dd93eb5f8':
Refine OatFileAssistant.MakeUpToDate failure result.
Change-Id: If78fa58cc605f4999c966585225aa383c7447eec
Richard Uhler [Thu, 31 Mar 2016 19:32:59 +0000 (19:32 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result."
am:
fd9ac38
* commit '
fd9ac384741435902d4fc03034f4cbaafaa85780':
Refine OatFileAssistant.MakeUpToDate failure result.
Change-Id: I58b3390da7f9d704405516873c2bf528c726c46d
Hans Boehm [Thu, 31 Mar 2016 19:32:59 +0000 (19:32 +0000)]
Merge "Only log excessive timeouts if those appear accidental" into nyc-dev
am:
b655c37
* commit '
b655c37fd00876fa61ea6a41e317028866283028':
Only log excessive timeouts if those appear accidental
Change-Id: I886bd1094723dec9a55ae11b32886bc1dd348b5b
Richard Uhler [Thu, 31 Mar 2016 19:27:54 +0000 (19:27 +0000)]
Merge "Refine OatFileAssistant.MakeUpToDate failure result."
Hans Boehm [Thu, 31 Mar 2016 19:25:13 +0000 (19:25 +0000)]
Merge "Only log excessive timeouts if those appear accidental" into nyc-dev
Andreas Gampe [Thu, 31 Mar 2016 18:24:53 +0000 (18:24 +0000)]
ART: Add support for DexFile compiler filter function
am:
fd97429
* commit '
fd97429f258acde6ee24a6f74c9050b2343e40cd':
ART: Add support for DexFile compiler filter function
Change-Id: I09e3971bdb40af4400f15c08420e335f6dfa422e
Andreas Gampe [Thu, 31 Mar 2016 00:19:48 +0000 (17:19 -0700)]
ART: Add support for DexFile compiler filter function
Add support for getting a non-profile-guided version of a given
compiler filter.
Bug:
27921071
(cherry picked from commit
fd97429f258acde6ee24a6f74c9050b2343e40cd)
Change-Id: I54735b61732e6a5c9dc62425d04bc740dd365083
Vladimir Marko [Thu, 31 Mar 2016 18:07:12 +0000 (18:07 +0000)]
Merge "Remove many `instrumentation` variables from goto interpreter." am:
9590a53
am:
82be946
* commit '
82be9464f9f160df4bd9086a0f69f254455dcf88':
Remove many `instrumentation` variables from goto interpreter.
Change-Id: I2beeb39a9a813b7af208ff38076dd3985737edae
Vladimir Marko [Thu, 31 Mar 2016 18:04:17 +0000 (18:04 +0000)]
Merge "Remove many `instrumentation` variables from goto interpreter."
am:
9590a53
* commit '
9590a5388ae80c7edba96de777eb5f96a896e681':
Remove many `instrumentation` variables from goto interpreter.
Change-Id: I8f119dbab35a9391a2de261e922cd4f7c52376c4
Vladimir Marko [Thu, 31 Mar 2016 17:53:44 +0000 (17:53 +0000)]
Merge "Remove many `instrumentation` variables from goto interpreter."
Mathieu Chartier [Tue, 29 Mar 2016 21:02:55 +0000 (14:02 -0700)]
Obtain stack trace outside of critical section
Fixes deadlock if the stack walk does allocations, changed stack
trace format to prevent slowdown.
Added missing GetInterfaceMethodIfProxy to fix a crash in maps.
Bug:
27857910
Change-Id: Iba86b7390a87349c38785297ac76751417b0fc87
Hans Boehm [Mon, 28 Mar 2016 21:36:23 +0000 (14:36 -0700)]
Only log excessive timeouts if those appear accidental
Do not generate a log message even when timeout would cause us to wake
up past the end of Linux time, if the timeout specification looks like
it was meant to wait forever. Avoids log spam.
Bug:
27723547
Change-Id: I98d0fc1b1813a10ad906282957675b85bd933472
(cherry picked from commit
fe76a629e7f9932c8e6a476d25358445273d893d)
Vladimir Marko [Thu, 31 Mar 2016 17:38:23 +0000 (18:38 +0100)]
Remove many `instrumentation` variables from goto interpreter.
Clean up after
https://android-review.googlesource.com/210440 .
Change-Id: I7e7b1863a5627365de8d9a74f559ffe56cb4fdfa
Andreas Gampe [Thu, 31 Mar 2016 00:19:48 +0000 (17:19 -0700)]
ART: Add support for DexFile compiler filter function
Add support for getting a non-profile-guided version of a given
compiler filter.
Bug:
27921071
Change-Id: I54735b61732e6a5c9dc62425d04bc740dd365083
Ying Wang [Thu, 31 Mar 2016 17:01:59 +0000 (17:01 +0000)]
Merge "Remove obsolete LOCAL_DX_FLAGS." am:
eede886
am:
e565277
* commit '
e565277b5b7529870b9e20c09009c0df3c01a922':
Remove obsolete LOCAL_DX_FLAGS.
Change-Id: I1d10c6d3bb7748412dd683707d1cc2b192564d11
Ying Wang [Thu, 31 Mar 2016 16:58:57 +0000 (16:58 +0000)]
Merge "Remove obsolete LOCAL_DX_FLAGS."
am:
eede886
* commit '
eede88620e4dc9f6363c0990c04b7c0c7dd7202e':
Remove obsolete LOCAL_DX_FLAGS.
Change-Id: Iee79119e73711cf7f20404fcca2720bb5c89272b
Ying Wang [Thu, 31 Mar 2016 16:52:56 +0000 (16:52 +0000)]
Merge "Remove obsolete LOCAL_DX_FLAGS."
Hans Boehm [Thu, 31 Mar 2016 16:49:54 +0000 (16:49 +0000)]
Merge "Only log excessive timeouts if those appear accidental" am:
9f168cc
am:
d92d9e0
* commit '
d92d9e0ce8e0a073cf049b576c1a1846f5b39761':
Only log excessive timeouts if those appear accidental
Change-Id: I6deaaae08af8ea19eafa4456882a3413a778e3d8
Hans Boehm [Thu, 31 Mar 2016 16:46:47 +0000 (16:46 +0000)]
Merge "Only log excessive timeouts if those appear accidental"
am:
9f168cc
* commit '
9f168ccb8e77626fd99c4ee5c296a5ed82f8d541':
Only log excessive timeouts if those appear accidental
Change-Id: I519e12bb2ef5edd4aef66eb28846b99e1f952157
Hans Boehm [Thu, 31 Mar 2016 16:41:46 +0000 (16:41 +0000)]
Merge "Only log excessive timeouts if those appear accidental"
Calin Juravle [Thu, 31 Mar 2016 16:09:09 +0000 (16:09 +0000)]
Merge "Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""" into nyc-dev
am:
97cd457 -s ours
* commit '
97cd4574ae103adf05176e31c3b4a08ae4841f45':
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Change-Id: I8fc2a16c7aaead9d484f273a24badff57e9c4e05
Calin Juravle [Thu, 31 Mar 2016 15:57:42 +0000 (15:57 +0000)]
Merge "Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""" into nyc-dev
Calin Juravle [Thu, 31 Mar 2016 15:45:32 +0000 (15:45 +0000)]
Fix profile save MaxBaxBackoff time
am:
28530da
* commit '
28530daffc05fe376dbd0df3b1b44257bce5a16f':
Fix profile save MaxBaxBackoff time
Change-Id: Ic44fce75ef4da255ea2dfa6a4fd5e3643fe4db9e
Serdjuk, Nikolay Y [Thu, 31 Mar 2016 15:45:32 +0000 (15:45 +0000)]
Merge remote-tracking branch \'goog/master\' into nyc-dev
am:
c0b2763
* commit '
c0b2763154e4219e65bb3f827e783512c962364d':
Allow x86+arm multilib build.
Change-Id: I535e71691cec5500dd084e49a7ee7e1828fb4c0d
Serguei Katkov [Thu, 31 Mar 2016 15:42:35 +0000 (15:42 +0000)]
Merge "ART: Improve JitProfile perf in x86_64 mterp" am:
87ad82e
am:
2636f54
* commit '
2636f54c265a58e7db26687def305e19129048e4':
ART: Improve JitProfile perf in x86_64 mterp
Change-Id: If9448c7d17602a0280e30acd4443d34661474f05
Serguei Katkov [Thu, 31 Mar 2016 15:42:35 +0000 (15:42 +0000)]
Merge "ART: Improve JitProfile perf in x86 mterp" am:
a236234
am:
01f4917
* commit '
01f49174db9cc75316bbcd277d023f61916ffa2d':
ART: Improve JitProfile perf in x86 mterp
Change-Id: I1dc2dec935d2e01114e127da0b01986b8b8a3374
Vladimir Marko [Thu, 31 Mar 2016 15:42:34 +0000 (15:42 +0000)]
Merge "Fix silly gcc warning." am:
f7cdec5
am:
2901872
* commit '
2901872d93275350b89434a3ea7884f4f8d53030':
Fix silly gcc warning.
Change-Id: I19a70f5f8f6e1a4e2093a47418a03c75fbd0109f
Roland Levillain [Thu, 31 Mar 2016 15:42:33 +0000 (15:42 +0000)]
Merge "Rename run-test 593-checker-boolean-to-integral-conversions." am:
897886f
am:
b5613c2
* commit '
b5613c23da0c6030eda8c61ecbc83277d6396621':
Rename run-test 593-checker-boolean-to-integral-conversions.
Change-Id: I0d9f86619bfbb067041518fd824532f3823ab8a3
Serguei Katkov [Thu, 31 Mar 2016 15:39:35 +0000 (15:39 +0000)]
Merge "ART: Improve JitProfile perf in x86_64 mterp"
am:
87ad82e
* commit '
87ad82eb1e085ccc6ed3ec54945937582334dbbc':
ART: Improve JitProfile perf in x86_64 mterp
Change-Id: Ie0c5a82723b54297550246773e9099df4aa3500d
Serguei Katkov [Thu, 31 Mar 2016 15:39:35 +0000 (15:39 +0000)]
Merge "ART: Improve JitProfile perf in x86 mterp"
am:
a236234
* commit '
a23623447c44758ec0369af778d5bd1adae442e6':
ART: Improve JitProfile perf in x86 mterp
Change-Id: I89628928a67b1c14ec4ca0f6dae0582a0688bfb9
Vladimir Marko [Thu, 31 Mar 2016 15:39:34 +0000 (15:39 +0000)]
Merge "Fix silly gcc warning."
am:
f7cdec5
* commit '
f7cdec554371aad9dd8f40c6cd195a5635abc3d6':
Fix silly gcc warning.
Change-Id: Id962ef258d4faa8f6362f9e9e3774f308dd5043f
Roland Levillain [Thu, 31 Mar 2016 15:39:33 +0000 (15:39 +0000)]
Merge "Rename run-test 593-checker-boolean-to-integral-conversions."
am:
897886f
* commit '
897886f804fcad5634362e0a8c5b6d1682198af4':
Rename run-test 593-checker-boolean-to-integral-conversions.
Change-Id: I0fae951b69ae41631635d99de9a2f7833945c859
Calin Juravle [Thu, 31 Mar 2016 14:29:54 +0000 (15:29 +0100)]
Fix profile save MaxBaxBackoff time
Bug:
27914456
Bug:
27937568
Change-Id: Icb1de7ff09ed4305dcd247d4653329b3cae0c05e
Calin Juravle [Thu, 31 Mar 2016 14:37:30 +0000 (15:37 +0100)]
Revert "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
This reverts commit
4a8ac9cee4312ac910fabf31c64d28d4c8362836.
Bug:
27939339
Bill Buzbee [Thu, 31 Mar 2016 14:21:18 +0000 (14:21 +0000)]
Merge "ART: Improve JitProfile perf in x86_64 mterp"
Bill Buzbee [Thu, 31 Mar 2016 14:07:15 +0000 (14:07 +0000)]
Merge "ART: Improve JitProfile perf in x86 mterp"
Calin Juravle [Thu, 31 Mar 2016 10:56:29 +0000 (11:56 +0100)]
Merge remote-tracking branch 'goog/master' into nyc-dev
Bug:
27616343
Bug:
27851582
Bug:
27693977
Bug:
27690481
Bug:
27799205
Bug:
27683071
Bug:
27625564
Change-Id: I261eb9f3e8144e85233dc4313e674e75f812003c
Vladimir Marko [Thu, 31 Mar 2016 13:24:15 +0000 (13:24 +0000)]
Merge "Fix silly gcc warning."
Vladimir Marko [Thu, 31 Mar 2016 11:34:48 +0000 (12:34 +0100)]
Fix silly gcc warning.
Explicitly specify the underlying type of LinkerPatch::Type
as uint8_t because gcc would select a bigger type and then
complain that
'art::LinkerPatch::patch_type_' is too small to hold all
values of 'enum class art::LinkerPatch::Type'
which is really ridiculous given that the enum contains only
a handful enumerators with default (small) values.
Change-Id: I4c4b21cde62e56b62488bae99d3690d900c3c29e
Roland Levillain [Thu, 31 Mar 2016 11:39:53 +0000 (11:39 +0000)]
Merge "Rename run-test 593-checker-boolean-to-integral-conversions."
Roland Levillain [Thu, 31 Mar 2016 11:32:07 +0000 (12:32 +0100)]
Rename run-test 593-checker-boolean-to-integral-conversions.
Shorten its name to "593-checker-boolean-to-integral-conv"
as some build configurations choke on too long filenames.
Bug:
27616343
Change-Id: I43439d7283920539817511249c6c1b430b3c9c95
Roland Levillain [Thu, 31 Mar 2016 10:49:19 +0000 (10:49 +0000)]
Merge "Fix Boolean to integral types conversions." am:
b0170f0
am:
0cf12a0
* commit '
0cf12a0dc3e321a754fb921e79328b1f0c72f461':
Fix Boolean to integral types conversions.
Change-Id: I951c3d54d7a63f80dd62231ffeee894c9c0ae5c7
Roland Levillain [Thu, 31 Mar 2016 10:46:19 +0000 (10:46 +0000)]
Merge "Fix Boolean to integral types conversions."
am:
b0170f0
* commit '
b0170f0457f60b81dd232bb3fa505b22f10f324c':
Fix Boolean to integral types conversions.
Change-Id: Ide620cd42daaa05553d7d16603d65f7105232637
Roland Levillain [Thu, 31 Mar 2016 10:39:52 +0000 (10:39 +0000)]
Merge "Fix Boolean to integral types conversions."
Serdjuk, Nikolay Y [Thu, 31 Mar 2016 10:18:47 +0000 (10:18 +0000)]
Merge "ART: Save or erase the file even if I/O failed" am:
6656f30 am:
4f4fc1a
am:
09c508b
* commit '
09c508be59e56e040288a4a76b8a14e1f1cd8164':
ART: Save or erase the file even if I/O failed
Change-Id: Iddc6534cd50b9e6122ab4ea9141a205f3f809c7f
Serdjuk, Nikolay Y [Thu, 31 Mar 2016 10:15:46 +0000 (10:15 +0000)]
Merge "ART: Save or erase the file even if I/O failed" am:
6656f30
am:
4f4fc1a
* commit '
4f4fc1a69a24278009a91144d4a05997b02f3a4c':
ART: Save or erase the file even if I/O failed
Change-Id: I1d230538f5be74f9eefe38c8d52153e79c9163b3
Serdjuk, Nikolay Y [Thu, 31 Mar 2016 10:13:07 +0000 (10:13 +0000)]
Merge "ART: Save or erase the file even if I/O failed"
am:
6656f30
* commit '
6656f30115c4a6a52ca01f46ca84df125179466a':
ART: Save or erase the file even if I/O failed
Change-Id: I0f4a5c3bf7b6a34a307a7eaf2fcf50c9c8c564f2
Pavel Vyssotski [Thu, 31 Mar 2016 10:13:07 +0000 (10:13 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64" am:
922b88c am:
8584295
am:
c421203
* commit '
c421203f43a6379d6385f26baeaa23080233b4be':
ART: Fix TypeConversion from long const to float on x86_64
Change-Id: I79d66be9e1447dd4b3064ae6ff02f07279a154e6
Pavel Vyssotski [Thu, 31 Mar 2016 10:10:25 +0000 (10:10 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64" am:
922b88c
am:
8584295
* commit '
858429596e53e1e60978b25274e6130eb81734aa':
ART: Fix TypeConversion from long const to float on x86_64
Change-Id: Ife107276244aa7cbc94f5ad40a51cf31446abc9c
Vladimir Marko [Thu, 31 Mar 2016 10:10:07 +0000 (10:10 +0000)]
Merge "ART: Save or erase the file even if I/O failed"
Pavel Vyssotski [Thu, 31 Mar 2016 10:07:45 +0000 (10:07 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64"
am:
922b88c
* commit '
922b88cd4203482b66ea4bee28e9921717ad2e6a':
ART: Fix TypeConversion from long const to float on x86_64
Change-Id: I6bab607cad3e1d2bc81977c363531d942edbe4cd
David Brazdil [Thu, 31 Mar 2016 10:00:41 +0000 (10:00 +0000)]
Merge "ART: Fix TypeConversion from long const to float on x86_64"
Pavel Vyssotski [Wed, 16 Mar 2016 07:59:53 +0000 (13:59 +0600)]
ART: Fix TypeConversion from long const to float on x86_64
LocationsBuilderX86_64::VisitTypeConversion should load 32-bit
constant for float type.
Change-Id: I24335568af65e6b98bf07d36f90c8696497dd137
Signed-off-by: Pavel Vyssotski <pavel.n.vyssotski@intel.com>
Serguei Katkov [Tue, 29 Mar 2016 11:04:00 +0000 (17:04 +0600)]
ART: Improve JitProfile perf in x86_64 mterp
Change-Id: Ieae39e2cc8de8d381e6f9de0faa440c90e20a7a5
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Serguei Katkov [Tue, 29 Mar 2016 06:09:06 +0000 (12:09 +0600)]
ART: Improve JitProfile perf in x86 mterp
Change-Id: Id4c1e52352da8f6b7ce2008bc4adf52bc08847b2
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Sebastien Hertz [Thu, 31 Mar 2016 07:22:50 +0000 (09:22 +0200)]
Remove obsolete ANDROID_COMPILE_WITH_JACK
Removes the checks on ANDROID_COMPILE_WITH_JACK since it is going
to disappear and build tests with Jack by default.
Bug:
27400061
Change-Id: I1c08796a946411070e2aab6fe8c3c0262dfb4c52
Serdjuk, Nikolay Y [Tue, 22 Mar 2016 04:06:33 +0000 (10:06 +0600)]
ART: Save or erase the file even if I/O failed
It should close the file in any case.
Change-Id: Idb7db15bfecb0ac47839be3544cc2dce91096d7b
Signed-off-by: Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com>
Andreas Gampe [Wed, 30 Mar 2016 21:03:43 +0000 (21:03 +0000)]
Merge "ART: Resolve all classes even when verify-profile" into nyc-dev am:
6d1b247
am:
8d96e03
* commit '
8d96e0389a11e60c4ab8fb09d80dc66e4fcccc05':
ART: Resolve all classes even when verify-profile
Change-Id: I8693decc9b801d3c9f47153745ded1fa1f7d10ea
Andreas Gampe [Wed, 30 Mar 2016 20:59:17 +0000 (20:59 +0000)]
Merge "ART: Resolve all classes even when verify-profile" into nyc-dev
am:
6d1b247
* commit '
6d1b2472155335ef4e53af01543f9b208bf98dca':
ART: Resolve all classes even when verify-profile
Change-Id: I9475c85db80c3c7438b9250d047caa8f83c9d95a
Ying Wang [Wed, 30 Mar 2016 20:55:33 +0000 (13:55 -0700)]
Remove obsolete LOCAL_DX_FLAGS.
Bug:
27400061
Change-Id: Iff834b58b47f8e5759e868159f85bab0f5c544ee
Andreas Gampe [Wed, 30 Mar 2016 20:40:15 +0000 (20:40 +0000)]
Merge "ART: Resolve all classes even when verify-profile" into nyc-dev
Andreas Gampe [Wed, 30 Mar 2016 20:28:44 +0000 (13:28 -0700)]
ART: Resolve all classes even when verify-profile
Avoid deadlocks.
Bug:
27924355
Change-Id: I41e194a7b92075884cbc485d89baf32feb6783cb