OSDN Git Service
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
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
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: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: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>
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 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
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
Aart Bik [Wed, 30 Mar 2016 19:15:54 +0000 (19:15 +0000)]
Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)." am:
20eef17
am:
6461885
* commit '
64618859ba57957c05001c0be137a2c472e254f3':
Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64).
Change-Id: I2fb7a4c4540d7d10c7059c4a9331cba41609e1d6
Aart Bik [Wed, 30 Mar 2016 19:11:09 +0000 (19:11 +0000)]
Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)."
am:
20eef17
* commit '
20eef176101924d5047895214bad4e73b8ae35ec':
Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64).
Change-Id: I3ed9c6d138c987981dd965d758cbb965c9ad0964
Andreas Gampe [Wed, 30 Mar 2016 19:02:56 +0000 (19:02 +0000)]
Merge "ART: Fix unstarted runtime for Security" am:
13ce07a
am:
946c902
* commit '
946c90280f9a699ca88fc59b0da65428bf085eb2':
ART: Fix unstarted runtime for Security
Change-Id: I7bfaf0dc748f6fbfb64db57acaae3949c71230ba
Bill Buzbee [Wed, 30 Mar 2016 19:02:56 +0000 (19:02 +0000)]
Merge "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""" am:
77376a4
am:
fbf9863
* commit '
fbf9863fbb24f9c9cc1ee03ad1770962d4c43516':
Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
Change-Id: I1c8a1b9e9e8be5bee22398c5cc064224d4ac1878
Vladimir Marko [Wed, 30 Mar 2016 19:02:56 +0000 (19:02 +0000)]
Merge "Optimizing: Clean up after const-string sharpening." am:
3d8762c
am:
2408bd4
* commit '
2408bd47b90d2e6d1536083d3f56932e71aadf76':
Optimizing: Clean up after const-string sharpening.
Change-Id: I98dc57984f56ff2108277821570d8118366ea193
Richard Uhler [Wed, 30 Mar 2016 19:02:55 +0000 (19:02 +0000)]
Merge "Don\'t return kPatchOatNeeded if there is no patch info." am:
20df4e4
am:
a51239e
* commit '
a51239e0c30c87e678876696041ef01e2d7f2962':
Don't return kPatchOatNeeded if there is no patch info.
Change-Id: I4a01f2dde0efd37d8c8849a2b6a055cf19992451
Aart Bik [Wed, 30 Mar 2016 18:59:27 +0000 (18:59 +0000)]
Merge "Fix arm64 simplifier bug that tries to remove same statement twice. With fail-before/pass-after test (on arm64)."
Calin Juravle [Wed, 30 Mar 2016 18:36:51 +0000 (18:36 +0000)]
Merge "Fix and tune ProfileSaver" into nyc-dev
am:
cbb3251
* commit '
cbb3251dc8f906c33c884380548c24ecd90a7d94':
Fix and tune ProfileSaver
Change-Id: I3fc2d2975b3ad013fede7f8c24d36d9efb2d6a9c
Andreas Gampe [Wed, 30 Mar 2016 18:27:36 +0000 (18:27 +0000)]
Merge "ART: Fix unstarted runtime for Security"
am:
13ce07a
* commit '
13ce07a99ac84ec5819dbb1d872e3eebc087e355':
ART: Fix unstarted runtime for Security
Change-Id: Ib3ec6bf0dc460e5160699f3fae0af1e986ca9e47
Calin Juravle [Wed, 30 Mar 2016 18:27:26 +0000 (18:27 +0000)]
Merge "Fix and tune ProfileSaver" into nyc-dev
Andreas Gampe [Wed, 30 Mar 2016 18:20:01 +0000 (18:20 +0000)]
Merge "ART: Fix unstarted runtime for Security"
Aart Bik [Tue, 29 Mar 2016 20:54:53 +0000 (13:54 -0700)]
Fix arm64 simplifier bug that tries to remove same statement twice.
With fail-before/pass-after test (on arm64).
Rationale:
This visitor removes statement "forward", which is a bit unusual, and
exposes a bug if statement is revisited and qualifies for removal again.
BUG=
27851582
Change-Id: Ia8cddba32b4dfe9fd480852deb358eaa977f0e1f
Bill Buzbee [Wed, 30 Mar 2016 18:10:25 +0000 (18:10 +0000)]
Merge "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
am:
77376a4
* commit '
77376a4126f01e04e396ab71383a55be934939b2':
Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
Change-Id: I735e2459ffac61f6a15d1eba9147dfb224792d2e
Roland Levillain [Wed, 30 Mar 2016 18:09:03 +0000 (19:09 +0100)]
Fix Boolean to integral types conversions.
Bug:
27616343
Change-Id: I050f92045bca1b8b5d6da53547cc617f17be84b1
Bill Buzbee [Wed, 30 Mar 2016 18:02:22 +0000 (18:02 +0000)]
Merge "Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp"""
Vladimir Marko [Wed, 30 Mar 2016 17:47:59 +0000 (17:47 +0000)]
Merge "Optimizing: Clean up after const-string sharpening."
am:
3d8762c
* commit '
3d8762ce57f1975eccd7a9dab92974db41535949':
Optimizing: Clean up after const-string sharpening.
Change-Id: I642b53133157e328f5e6425e41c40d7bdb408e75
Calin Juravle [Wed, 30 Mar 2016 17:18:58 +0000 (18:18 +0100)]
Fix and tune ProfileSaver
- the statement to mark the profile saved was not guarded by the right
condition.
- increase the backoff to 2x and maximum period time to 10 minutes.
As part of this change also
- fix typos
- remove uneeded warning
- add more VLOGs for easier debuging in the future
Bug:
27914456
Change-Id: I877c3256aa96d727ac4f443dc6e1f2bdb33c56c6
Vladimir Marko [Wed, 30 Mar 2016 17:29:44 +0000 (17:29 +0000)]
Merge "Optimizing: Clean up after const-string sharpening."
Vladimir Marko [Wed, 30 Mar 2016 15:30:21 +0000 (16:30 +0100)]
Optimizing: Clean up after const-string sharpening.
Do not look up the String for JIT, just check if it's in the
dex cache. Strings on hot paths should already be resolved
and we don't want to unnecessarily increase JIT compile time
to have a chance of improving a cold path.
Also, change the enum LinkerPatchType to be an inner enum
class of LinkerPatch and clean up casts between pointers and
uint64_t.
Change-Id: Ia6e0513af1a84ce94a3b30edac0c592157d374ec
Richard Uhler [Wed, 30 Mar 2016 15:29:13 +0000 (15:29 +0000)]
Merge "Don\'t return kPatchOatNeeded if there is no patch info."
am:
20df4e4
* commit '
20df4e408e9d285920558e6afc8442a412df3ac4':
Don't return kPatchOatNeeded if there is no patch info.
Change-Id: I916b37e140ac3296d1dc9046ae41993e9db79758
Richard Uhler [Wed, 30 Mar 2016 15:29:13 +0000 (15:29 +0000)]
Merge "Don\'t return kPatchOatNeeded if there is no patch info." into nyc-dev
am:
f7a9ff9
* commit '
f7a9ff9b6474d0cbebefa45149ed3827ed4e1048':
Don't return kPatchOatNeeded if there is no patch info.
Change-Id: I5eb28e0eb19f7484e652405f6df025f3e68aee54
Richard Uhler [Wed, 30 Mar 2016 15:21:57 +0000 (15:21 +0000)]
Merge "Don't return kPatchOatNeeded if there is no patch info." into nyc-dev
Richard Uhler [Wed, 30 Mar 2016 15:19:11 +0000 (15:19 +0000)]
Merge "Don't return kPatchOatNeeded if there is no patch info."
Vladimir Marko [Wed, 30 Mar 2016 14:05:33 +0000 (14:05 +0000)]
Merge "Optimizing: Improve const-string code generation." am:
085055f
am:
0b92b73
* commit '
0b92b73c62ab4cc13ca040d4233fa69d182971cc':
Optimizing: Improve const-string code generation.
Change-Id: I2246aca0c0b1b12b537479ee47c293bb3079081c
Vladimir Marko [Wed, 30 Mar 2016 14:01:24 +0000 (14:01 +0000)]
Merge "Optimizing: Improve const-string code generation."
am:
085055f
* commit '
085055f933d76579c32586488951a4497ffcf10e':
Optimizing: Improve const-string code generation.
Change-Id: Idd5a215e18abba1e2161f1848cb08aefb4719cf0
Vladimir Marko [Wed, 30 Mar 2016 13:47:59 +0000 (13:47 +0000)]
Merge "Optimizing: Improve const-string code generation."
Calin Juravle [Wed, 30 Mar 2016 12:42:49 +0000 (12:42 +0000)]
Merge "Take into account the change in classes when analysing profiles" into nyc-dev
am:
c736384
* commit '
c736384b7e6f92d479c90811939f7619a97bf3fc':
Take into account the change in classes when analysing profiles
Change-Id: I2c06df94b5973756cf9c743ae7a81fa6a3226f9a
Calin Juravle [Wed, 30 Mar 2016 12:32:15 +0000 (12:32 +0000)]
Merge "Take into account the change in classes when analysing profiles" into nyc-dev
Mark Mendell [Wed, 30 Mar 2016 10:12:21 +0000 (10:12 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use" am:
a1eff4f
am:
01098af
* commit '
01098af7a530ca65dcf5a40b3799c5147e49bd64':
X86_64: Replace x86_64 xchg instruction use
Change-Id: Ifbc573d474fe34e6892ee323d53fc93c95c53dba
Mark Mendell [Wed, 30 Mar 2016 10:08:25 +0000 (10:08 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use"
am:
a1eff4f
* commit '
a1eff4f279253bbc90d2697d7c15390bcab65d1e':
X86_64: Replace x86_64 xchg instruction use
Change-Id: I3a95d8b662a424f0f218acf31894fdf86b4bbca2
David Brazdil [Wed, 30 Mar 2016 10:00:28 +0000 (10:00 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer" am:
15a605e
am:
9049d07
* commit '
9049d072d9d815c8056d80d700cffa4b97971ecd':
ART: Flush ostream less frequently in GraphVisualizer
Change-Id: Ib0a084edf89452e9ec52002b905bcd2997b71135
Vladimir Marko [Wed, 30 Mar 2016 09:58:54 +0000 (09:58 +0000)]
Merge "X86_64: Replace x86_64 xchg instruction use"
David Brazdil [Wed, 30 Mar 2016 09:56:32 +0000 (09:56 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer"
am:
15a605e
* commit '
15a605e8fba716297cef70b8396ffe011c420f94':
ART: Flush ostream less frequently in GraphVisualizer
Change-Id: Iae7e60ede55207aab504de596170a0bf7615e787
David Brazdil [Wed, 30 Mar 2016 09:46:14 +0000 (09:46 +0000)]
Merge "ART: Flush ostream less frequently in GraphVisualizer"
David Brazdil [Wed, 30 Mar 2016 08:41:02 +0000 (09:41 +0100)]
ART: Flush ostream less frequently in GraphVisualizer
We have seen Checker tests timing out on debug-GC configurations after
having switched to Optimizing because its GraphVisualizer makes too
many syscalls which the configuration keeps track of.
This patch replaces std::endl with "\n" across GraphVisualizer so as
to not flush the stream after every line of output.
Bug:
27826765
Change-Id: I5e3f1e92f8a84f36d324d56945e2d420b2d36a5d
Andreas Gampe [Wed, 30 Mar 2016 02:33:56 +0000 (19:33 -0700)]
ART: Fix unstarted runtime for Security
Derive the path for the libcore jar from the boot classpath string
instead of from the dex file location.
Bug:
27899446
Change-Id: I22a9be76303edb2ec72f4cf2e7a4b3bfed37d9c7
Andreas Gampe [Wed, 30 Mar 2016 01:00:37 +0000 (01:00 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37" am:
a923025
am:
94eae20
* commit '
94eae2002dd31d1b4a828120dc724cdcb3fe68a0':
ART: Postpone interface-related dex failure to version 37
Change-Id: I051fb6b72f3c8650e5af51fcce65aa8a21512886
Andreas Gampe [Wed, 30 Mar 2016 00:56:54 +0000 (00:56 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37"
am:
a923025
* commit '
a923025e08e61fd2ff26e3d60c26e9db29637736':
ART: Postpone interface-related dex failure to version 37
Change-Id: Ifa0aa5b79843957efd2c17a298bb052ac1c13800
Andreas Gampe [Wed, 30 Mar 2016 00:47:15 +0000 (00:47 +0000)]
Merge "ART: Postpone interface-related dex failure to version 37"
Andreas Gampe [Tue, 29 Mar 2016 01:31:29 +0000 (18:31 -0700)]
ART: Postpone interface-related dex failure to version 37
For app compat, at least for now make the check for public-final-static
of interface members not fail on dex file versions less than 37. This
may be changed in future releases.
Bug:
27831184
Change-Id: If8ee50321298b951d4a78062c8eb583fec27394f
Bill Buzbee [Fri, 25 Mar 2016 13:16:55 +0000 (13:16 +0000)]
Revert "Revert "ART: Improve JitProfile perf in arm/arm64 mterp""
Ready for review.
This reverts commit
6aef867f4d1a98a12bcdd65e9bf2ff894f0f2d7e.
Change-Id: I5d53ed2bedc7e429ce7d3cdf80b6696a9628740e
Richard Uhler [Tue, 29 Mar 2016 20:27:41 +0000 (13:27 -0700)]
Don't return kPatchOatNeeded if there is no patch info.
Bug:
27693977
(cherry picked from commit
d1537b569b6cd18297c5e02d13cdd588c4366c51)
Change-Id: Icd25da796fc2c2b7542a47d1d8d3bcbcace145fb
Andreas Gampe [Tue, 29 Mar 2016 21:36:27 +0000 (21:36 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down" am:
8a31b7d
am:
e54865f
* commit '
e54865fd15676d5241c2f17c8b67518d808ac731':
ART: Update DexFile for compiler-filter pass-down
Change-Id: Ib40e7841f66836212cbc94e9e9559c9ddfb6ee55
Andreas Gampe [Tue, 29 Mar 2016 21:30:03 +0000 (21:30 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down"
am:
8a31b7d
* commit '
8a31b7d44a13b1d7e71852dc3c992598698d351d':
ART: Update DexFile for compiler-filter pass-down
Change-Id: Ib809573c3d6de424461584639d69baedb38bcdc9
Richard Uhler [Tue, 29 Mar 2016 20:27:41 +0000 (13:27 -0700)]
Don't return kPatchOatNeeded if there is no patch info.
Bug:
27693977
Change-Id: Ie1f27cc45f3cb434108a375136480cb92fd95e26
Andreas Gampe [Tue, 29 Mar 2016 21:24:18 +0000 (21:24 +0000)]
Merge "ART: Update DexFile for compiler-filter pass-down"
Calin Juravle [Tue, 29 Mar 2016 19:33:33 +0000 (20:33 +0100)]
Take into account the change in classes when analysing profiles
Bug:
27894914
Change-Id: I8a060bedf133823c283b2ec23f56f2b3f0f208ee
Vladimir Marko [Tue, 29 Mar 2016 19:08:29 +0000 (19:08 +0000)]
Merge "Disable oatdump_test on mips due to timeouts." am:
335b8fb
am:
2f943e6
* commit '
2f943e67403ae10c513b5c3db8183998d7a08b33':
Disable oatdump_test on mips due to timeouts.
Change-Id: I76b9e33db4b5ce1a6b7405d5553cd78dee7d0006
Vladimir Marko [Tue, 29 Mar 2016 19:05:36 +0000 (19:05 +0000)]
Merge "Disable oatdump_test on mips due to timeouts."
am:
335b8fb
* commit '
335b8fb64d29a201b4012cadae7acc85842d13fd':
Disable oatdump_test on mips due to timeouts.
Change-Id: Idb02e23f7c699fdc445ba91dca70cdcc5fc2cf41
Vladimir Marko [Tue, 29 Mar 2016 18:58:43 +0000 (18:58 +0000)]
Merge "Disable oatdump_test on mips due to timeouts."
Vladimir Marko [Mon, 22 Feb 2016 10:39:50 +0000 (10:39 +0000)]
Optimizing: Improve const-string code generation.
For strings in the boot image, use either direct pointers
or pc-relative addresses. For other strings, use PC-relative
access to the dex cache arrays for AOT and direct address of
the string's dex cache slot for JIT.
For aosp_flounder-userdebug:
- 32-bit boot.oat: -692KiB (-0.9%)
- 64-bit boot.oat: -948KiB (-1.1%)
- 32-bit dalvik cache total: -900KiB (-0.9%)
- 64-bit dalvik cache total: -3672KiB (-1.5%)
(contains more files than the 32-bit dalvik cache)
For aosp_flounder-userdebug forced to compile PIC:
- 32-bit boot.oat: -380KiB (-0.5%)
- 64-bit boot.oat: -928KiB (-1.0%)
- 32-bit dalvik cache total: -468KiB (-0.4%)
- 64-bit dalvik cache total: -1928KiB (-0.8%)
(contains more files than the 32-bit dalvik cache)
Bug:
26884697
Change-Id: Iec7266ce67e6fedc107be78fab2e742a8dab2696
Andreas Gampe [Wed, 23 Mar 2016 22:03:46 +0000 (15:03 -0700)]
ART: Update DexFile for compiler-filter pass-down
Update getDexOptNeeded. Add implementations for isValidCompilerFilter
and isProfileGuidedCompilerFilter.
Bug:
27689078
(cherry picked from commit
1d23d43e29e41adb3d504332c8833acaacb49e50)
Change-Id: I06b9d75f58c59cb07ef5170f784ea6745168efaa
Vladimir Marko [Tue, 29 Mar 2016 17:42:21 +0000 (18:42 +0100)]
Disable oatdump_test on mips due to timeouts.
Bug:
27824283
Change-Id: I8014471385fdfe0e98760af04507cd81338f9952
Nicolas Geoffray [Tue, 29 Mar 2016 17:36:53 +0000 (17:36 +0000)]
Fix dex2oat/oatdump cross-compilation.
am:
e930027
* commit '
e9300271556e47639cade1ec5fdf8f66b3724d03':
Fix dex2oat/oatdump cross-compilation.
Change-Id: I9e7bda8f5771931f8d8941be3b02879962bc836a
Nicolas Geoffray [Wed, 23 Mar 2016 16:35:51 +0000 (16:35 +0000)]
Fix dex2oat/oatdump cross-compilation.
Only set the ImtConflictTable when not in AOT, to not mess up
with the image.
(cherry picked from commit
40c68c690546e8c15dcb2de6137e72c74f573a75)
Change-Id: I7bff3a18cc06184ed9d7d63ab433f286884f19e7
Calin Juravle [Tue, 29 Mar 2016 13:11:42 +0000 (13:11 +0000)]
Merge "Fix debug leftover in profman" into nyc-dev
am:
a54e05a
* commit '
a54e05aa8d2c4dca042ea924558738adb23ac730':
Fix debug leftover in profman
Change-Id: I4dc49d786576d46b2bdef8cbd97546d1dccfe3fa
Calin Juravle [Tue, 29 Mar 2016 13:05:05 +0000 (13:05 +0000)]
Merge "Fix debug leftover in profman" into nyc-dev
Calin Juravle [Tue, 29 Mar 2016 13:03:10 +0000 (14:03 +0100)]
Fix debug leftover in profman
Bug:
27600652
Change-Id: I32466623379928cdaad839303e6ea3a39d673cd4
Vladimir Marko [Tue, 29 Mar 2016 09:03:48 +0000 (09:03 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker." am:
6f51d77
am:
80ec300
* commit '
80ec300c68d58180ad68169930f56b86d0a3eaa7':
Optimizing: Reduce arena memory used by GraphChecker.
Change-Id: I778fe511e30d7c57582fba273c8f1d857b509fe0
Vladimir Marko [Tue, 29 Mar 2016 09:01:03 +0000 (09:01 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker."
am:
6f51d77
* commit '
6f51d7756a9c66007fe7666b19399e1f60ff6092':
Optimizing: Reduce arena memory used by GraphChecker.
Change-Id: Ibed1731665038d681998b8d31d1cd218e074f5ff
Vladimir Marko [Tue, 29 Mar 2016 08:56:19 +0000 (08:56 +0000)]
Merge "Optimizing: Reduce arena memory used by GraphChecker."
Andreas Gampe [Tue, 29 Mar 2016 02:39:14 +0000 (02:39 +0000)]
Merge "ART: Make verifier fail log level adjustable" am:
fedcd0a
am:
226f52d
* commit '
226f52d3c487ce56aa11565966b1e96ffffe86c6':
ART: Make verifier fail log level adjustable
Change-Id: I2c70e3fa252951d1dde9ca5aff49c5cb6dbd6eb3
Andreas Gampe [Tue, 29 Mar 2016 02:36:24 +0000 (02:36 +0000)]
Merge "ART: Make verifier fail log level adjustable"
am:
fedcd0a
* commit '
fedcd0a6870cf4d940d231f6725ca95c590d04bd':
ART: Make verifier fail log level adjustable
Change-Id: Ia860a719def57f0ff1a914a93947d11b6fd58f49
Andreas Gampe [Tue, 29 Mar 2016 02:31:16 +0000 (02:31 +0000)]
Merge "ART: Make verifier fail log level adjustable"
Andreas Gampe [Tue, 29 Mar 2016 01:48:44 +0000 (01:48 +0000)]
Merge "ART: Clean up verifier" am:
ef94b54
am:
361aa38
* commit '
361aa3820e18657f5aca9da7a662497d22343168':
ART: Clean up verifier
Change-Id: I934d1c10c93e589beafa15c865b386dbb7a30b4f
Andreas Gampe [Tue, 29 Mar 2016 01:46:28 +0000 (01:46 +0000)]
Merge "ART: Clean up verifier"
am:
ef94b54
* commit '
ef94b5484a75902404e975cba55a7e825941b2fa':
ART: Clean up verifier
Change-Id: I975423bbf31948bacee17a077d54001b60f23870
Andreas Gampe [Tue, 29 Mar 2016 01:38:19 +0000 (01:38 +0000)]
Merge "ART: Clean up verifier"
Andreas Gampe [Fri, 25 Mar 2016 23:58:00 +0000 (16:58 -0700)]
ART: Make verifier fail log level adjustable
To help for build failures.
Change-Id: I6c94dfb50177daa7d89902d78715ccec31bf0e45
Alex Light [Mon, 28 Mar 2016 23:06:10 +0000 (23:06 +0000)]
Add support for Dex version 37 in Runtime.
am:
2190d92
* commit '
2190d929695c31ad7195e2c366f4102836a7d827':
Add support for Dex version 37 in Runtime.
Andreas Gampe [Fri, 25 Mar 2016 23:58:00 +0000 (16:58 -0700)]
ART: Clean up verifier
Clean up verifier post-Quick.
Change-Id: I0b05e10dd06edd228fe2068c8afffc4b7d7fdffa
Alex Light [Mon, 28 Mar 2016 21:44:31 +0000 (21:44 +0000)]
Merge "Add support for Dex version 37 in Runtime."
am:
ec89839
* commit '
ec898396658bc6a36e2b3c32569fbcb034d60e22':
Add support for Dex version 37 in Runtime.
Alex Light [Wed, 23 Mar 2016 17:20:41 +0000 (10:20 -0700)]
Add support for Dex version 37 in Runtime.
We are skipping version 36 of the dex file format due to a bug in
Dalvik dating back to ICS where dex files marked version 036 would
erroneously be accepted.
Bug:
27538761
Bug:
27809626
(cherry picked from commit
c49618160d5fa64ca4883d2e09fa34b83491c8ea)
Change-Id: Ic053f7e25f5a8c3df83ff34b6656528824b2df12
Alex Light [Mon, 28 Mar 2016 21:26:05 +0000 (21:26 +0000)]
Merge "Add support for Dex version 37 in Runtime."
Calin Juravle [Mon, 28 Mar 2016 10:34:42 +0000 (10:34 +0000)]
Do not profile fully compiled oat files.
am:
6044fa7
* commit '
6044fa747867413912d0de3049dc570c769d3cf8':
Do not profile fully compiled oat files.
Aart Bik [Sat, 26 Mar 2016 00:53:49 +0000 (00:53 +0000)]
Merge "Fix bug not accounting for type in induction comparison. Extended unit tests."
am:
e28ad4b
* commit '
e28ad4b91591c226ed404a2b01104bb99bfeb28f':
Fix bug not accounting for type in induction comparison. Extended unit tests.
Aart Bik [Sat, 26 Mar 2016 00:44:53 +0000 (00:44 +0000)]
Merge "Fix bug not accounting for type in induction comparison. Extended unit tests."
Andreas Gampe [Sat, 26 Mar 2016 00:00:15 +0000 (00:00 +0000)]
Merge "ART: Relax verifier checks"
am:
782d046
* commit '
782d0464ddc92fd5d55a330068d2d255336c16ba':
ART: Relax verifier checks
Andreas Gampe [Fri, 25 Mar 2016 23:53:20 +0000 (23:53 +0000)]
Merge "ART: Relax verifier checks"
Andreas Gampe [Fri, 25 Mar 2016 23:24:20 +0000 (16:24 -0700)]
ART: Relax verifier checks
Only bail for unresolved merge types in a couple of cases. Follow-up
to
bb18a03c44d99b3cae232d445d56e80d8388cca9.
Bug:
27799205
Change-Id: If448e14036bc5e245677e0cd8cdddee02b320525
Aart Bik [Fri, 25 Mar 2016 20:14:53 +0000 (13:14 -0700)]
Fix bug not accounting for type in induction comparison.
Extended unit tests.
Rationale:
Now that inductions are typed, comparisons should take
the type into account as well.
Change-Id: Ie533bb728d2006390646657573fa743e6fc37ff2
Ying Wang [Fri, 25 Mar 2016 21:51:10 +0000 (21:51 +0000)]
Merge "Allow x86+arm multilib build."
am:
91ac272
* commit '
91ac272c11775630735dde3190de9f2da8f3f3eb':
Allow x86+arm multilib build.
Ying Wang [Fri, 25 Mar 2016 21:41:41 +0000 (21:41 +0000)]
Merge "Allow x86+arm multilib build."