OSDN Git Service
Narayan Kamath [Wed, 16 Mar 2016 12:54:15 +0000 (12:54 +0000)]
runtime: delete native/java_lang_Runtime.cc
am:
f525272
* commit '
f525272b1edec721058e7d888545dd5d97b5045d':
runtime: delete native/java_lang_Runtime.cc
Narayan Kamath [Tue, 15 Mar 2016 14:47:29 +0000 (14:47 +0000)]
runtime: delete native/java_lang_Runtime.cc
We're now using Runtime.c from ojluni, which does the same set
of things via the JVM interface. This removes unnecessary duplication
of code between Runtime.cc and OpenJdkJvm.cc.
Also includes a few changes to JVM_NativeLoad to bring it in sync
with the version in Runtime.cc.
bug:
27387202
(cherry picked from commit
5f97157263d1b52bf4aea523b28294b21d694da1)
Change-Id: Ic2848755505a0cb25da8237150b07dadf0a42929
Nicolas Geoffray [Wed, 16 Mar 2016 11:23:13 +0000 (11:23 +0000)]
Merge "Collect memory use for the JIT."
am:
f808e8a
* commit '
f808e8a0cc218c2b98023ef0e91f3c5b74ad2962':
Collect memory use for the JIT.
Nicolas Geoffray [Wed, 16 Mar 2016 11:23:13 +0000 (11:23 +0000)]
Merge "Accept boolean as an input of HDivZeroCheck."
am:
576a13a
* commit '
576a13ab2f1bc82e72245db5fbb4dd8587b19bf1':
Accept boolean as an input of HDivZeroCheck.
Nicolas Geoffray [Wed, 16 Mar 2016 11:19:18 +0000 (11:19 +0000)]
Merge "Collect memory use for the JIT."
Nicolas Geoffray [Tue, 8 Mar 2016 16:57:48 +0000 (16:57 +0000)]
Collect memory use for the JIT.
bug:
27520994
Change-Id: I67b0c5b822001bfde8738a988c1ade69f1a26e3f
Nicolas Geoffray [Wed, 16 Mar 2016 11:15:43 +0000 (11:15 +0000)]
Merge "Accept boolean as an input of HDivZeroCheck."
Nicolas Geoffray [Wed, 16 Mar 2016 11:03:54 +0000 (11:03 +0000)]
Accept boolean as an input of HDivZeroCheck.
All our arithmetic operations accept it.
bug:
27624718
Change-Id: I1f6bb95dc77ecb3fb2fcabb35a93b31c524bfa0a
Nicolas Geoffray [Wed, 16 Mar 2016 11:01:20 +0000 (11:01 +0000)]
Merge "Fix checker test."
am:
41954d8
* commit '
41954d8f0d1cdada0886875508b0653b1be4996c':
Fix checker test.
Nicolas Geoffray [Wed, 16 Mar 2016 10:54:51 +0000 (10:54 +0000)]
Merge "Fix checker test."
Nicolas Geoffray [Wed, 16 Mar 2016 10:41:53 +0000 (10:41 +0000)]
Fix checker test.
Change-Id: I1388868ca69c9f964f2019ff79d5c7aa0f00d57c
Nicolas Geoffray [Wed, 16 Mar 2016 10:29:11 +0000 (10:29 +0000)]
Merge "Revert "Assembly TLAB allocation fast path for arm64.""
am:
d35f4a2
* commit '
d35f4a2eacf9ee9c9d75bb0c00eec7ae31ad1949':
Revert "Assembly TLAB allocation fast path for arm64."
Nicolas Geoffray [Wed, 16 Mar 2016 10:29:11 +0000 (10:29 +0000)]
Merge "Revert "Tentative fix for build breakage with read barriers.""
am:
4344e11
* commit '
4344e11598b3079032773ad7e381658f39bed92e':
Revert "Tentative fix for build breakage with read barriers."
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:43 +0000 (10:23 +0000)]
Merge "Revert "Assembly TLAB allocation fast path for arm64.""
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:03 +0000 (10:23 +0000)]
Revert "Assembly TLAB allocation fast path for arm64."
Assembly code does not compile
Bug:
9986565
This reverts commit
b7e52b02a82c69e59c88f06945fb21672dfe9923.
Change-Id: I80de1bcd6270e2d76f79cb708811a41c039ea5bb
Nicolas Geoffray [Wed, 16 Mar 2016 10:23:20 +0000 (10:23 +0000)]
Merge "Revert "Tentative fix for build breakage with read barriers.""
Nicolas Geoffray [Wed, 16 Mar 2016 10:22:09 +0000 (10:22 +0000)]
Revert "Tentative fix for build breakage with read barriers."
This reverts commit
448f21e2c1cb43b193736598719979ebd2aed0b0.
Change-Id: Id821effa06697b1464581bcd9c8f34cd0ea69896
Vladimir Marko [Wed, 16 Mar 2016 10:19:17 +0000 (10:19 +0000)]
Merge "Optimizing: Fix arm64 shifter operand test."
am:
a0ef558
* commit '
a0ef5582d325485866d34fbaa6276a43bc72de09':
Optimizing: Fix arm64 shifter operand test.
Roland Levillain [Wed, 16 Mar 2016 10:19:17 +0000 (10:19 +0000)]
Merge "Make art::HCompare side effect free."
am:
3e90681
* commit '
3e906819c33d19c9586ecd9441f0ffb8433f2bad':
Make art::HCompare side effect free.
Vladimir Marko [Wed, 16 Mar 2016 10:13:48 +0000 (10:13 +0000)]
Merge "Optimizing: Fix arm64 shifter operand test."
Roland Levillain [Wed, 16 Mar 2016 10:12:39 +0000 (10:12 +0000)]
Merge "Make art::HCompare side effect free."
Vladimir Marko [Wed, 16 Mar 2016 10:04:21 +0000 (10:04 +0000)]
Merge "ART: Fix ignoring duplicate fields."
am:
d9ebad9
* commit '
d9ebad9b52605ed785222a86c84e58fa7cb66686':
ART: Fix ignoring duplicate fields.
Vladimir Marko [Wed, 16 Mar 2016 10:02:39 +0000 (10:02 +0000)]
Optimizing: Fix arm64 shifter operand test.
Generic simplifier removes 3 shifts from the test since
https://android-review.googlesource.com/208199
and then the arm64-specific shifter operands don't apply.
Bug:
27638111
Change-Id: Ie6c6ec1f40ec263f3e40e8129f29e0191fd9de50
Vladimir Marko [Wed, 16 Mar 2016 09:56:14 +0000 (09:56 +0000)]
Merge "ART: Fix ignoring duplicate fields."
Nicolas Geoffray [Wed, 16 Mar 2016 09:44:17 +0000 (09:44 +0000)]
Merge "Tentative fix for build breakage with read barriers."
am:
41bcd81
* commit '
41bcd81aebfb48cb848c84bc40f241a18c376af3':
Tentative fix for build breakage with read barriers.
Nicolas Geoffray [Wed, 16 Mar 2016 09:37:52 +0000 (09:37 +0000)]
Merge "Tentative fix for build breakage with read barriers."
Nicolas Geoffray [Wed, 16 Mar 2016 09:36:35 +0000 (09:36 +0000)]
Tentative fix for build breakage with read barriers.
Change-Id: I490821357525bdeb19c330f350635bd645f8ab53
Nicolas Geoffray [Wed, 16 Mar 2016 09:27:50 +0000 (09:27 +0000)]
Merge "Fix HDoubleConstant::IsZero and HFloatConstant::IsZero."
am:
4d20c08
* commit '
4d20c081ec372a5ec2a405e9ac4521fe09148922':
Fix HDoubleConstant::IsZero and HFloatConstant::IsZero.
Nicolas Geoffray [Wed, 16 Mar 2016 09:19:39 +0000 (09:19 +0000)]
Merge "Fix HDoubleConstant::IsZero and HFloatConstant::IsZero."
Nicolas Geoffray [Tue, 15 Mar 2016 23:11:10 +0000 (23:11 +0000)]
Merge "Disable test."
am:
553ed05100
* commit '
553ed05100f079203371da55e8a9d824b8e9948e':
Disable test.
Nicolas Geoffray [Tue, 15 Mar 2016 23:02:48 +0000 (23:02 +0000)]
Merge "Disable test."
Nicolas Geoffray [Tue, 15 Mar 2016 23:01:33 +0000 (23:01 +0000)]
Disable test.
Change-Id: Id06de23646187967df3035ca423f4cd6c73cf0a7
Vladimir Marko [Tue, 15 Mar 2016 20:31:50 +0000 (20:31 +0000)]
ART: Fix ignoring duplicate fields.
Ignore duplicate fields when calculating class size without
embedded tables. We already ignored them when loading class
members. This fixes a check failure in debug build that the
final class is no smaller than the temporary class.
Bug:
21868015
Bug:
27626707
Change-Id: Id72121724abc093d536c2329c61a24854a20122c
Hiroshi Yamauchi [Tue, 15 Mar 2016 20:02:48 +0000 (20:02 +0000)]
Merge "Assembly TLAB allocation fast path for arm64."
am:
877b18bcf4
* commit '
877b18bcf4c6a69502b9a9b838dedd2528d3de40':
Assembly TLAB allocation fast path for arm64.
Hiroshi Yamauchi [Tue, 15 Mar 2016 19:56:24 +0000 (19:56 +0000)]
Merge "Assembly TLAB allocation fast path for arm64."
Hiroshi Yamauchi [Thu, 10 Mar 2016 05:14:41 +0000 (21:14 -0800)]
Assembly TLAB allocation fast path for arm64.
This is the arm64 version of CL 187537.
Speedup (GSS GC with TLAB on N9):
BinaryTrees: 591 -> 493 ms (-17%)
MemAllocTest: 792 -> 755 ms (-5%)
Bug:
9986565
Change-Id: Icdad28cab0fd835679c640b7eae59b33ac2d6654
Vladimir Marko [Tue, 15 Mar 2016 18:30:59 +0000 (18:30 +0000)]
Merge "ART: Fix shift simplification, x >>> 64."
am:
5942e53716
* commit '
5942e537161a059ef1969a81db101876555cd77d':
ART: Fix shift simplification, x >>> 64.
Vladimir Marko [Tue, 15 Mar 2016 18:23:01 +0000 (18:23 +0000)]
Merge "ART: Fix shift simplification, x >>> 64."
Vladimir Marko [Tue, 15 Mar 2016 18:11:50 +0000 (18:11 +0000)]
ART: Fix shift simplification, x >>> 64.
Fix braino in
https://android-review.googlesource.com/208199
Bug:
27638111
Change-Id: I8f12008af8bba943664c8a9eac3f2d2f7c820e79
Vladimir Marko [Tue, 15 Mar 2016 17:22:31 +0000 (17:22 +0000)]
Merge "ART: Fix valgrind failure in image_test64."
am:
12af36e091
* commit '
12af36e09116dc677820f98e33ff2982e07d652a':
ART: Fix valgrind failure in image_test64.
Vladimir Marko [Tue, 15 Mar 2016 17:03:18 +0000 (17:03 +0000)]
Merge "ART: Fix valgrind failure in image_test64."
Nicolas Geoffray [Tue, 15 Mar 2016 16:23:04 +0000 (16:23 +0000)]
Fix HDoubleConstant::IsZero and HFloatConstant::IsZero.
bug:
27639313
Change-Id: I2f30a65a07662dfce0a6d6f4ed356a8a0b3dcdef
Vladimir Marko [Tue, 15 Mar 2016 16:12:36 +0000 (16:12 +0000)]
Merge "Optimizing: Improve shift simplification, x >>> 64."
am:
6ce4766f13
* commit '
6ce4766f13326bdf704b5205bfbda2c7dfbc72ae':
Optimizing: Improve shift simplification, x >>> 64.
Vladimir Marko [Tue, 15 Mar 2016 16:06:03 +0000 (16:06 +0000)]
Merge "Optimizing: Improve shift simplification, x >>> 64."
Narayan Kamath [Tue, 15 Mar 2016 15:46:06 +0000 (15:46 +0000)]
Merge "runtime: delete native/java_lang_Runtime.cc"
am:
706d2cd559
* commit '
706d2cd55938075f4215e64dd1deeaf966a43316':
runtime: delete native/java_lang_Runtime.cc
Narayan Kamath [Tue, 15 Mar 2016 15:39:10 +0000 (15:39 +0000)]
Merge "runtime: delete native/java_lang_Runtime.cc"
Vladimir Marko [Tue, 15 Mar 2016 14:57:32 +0000 (14:57 +0000)]
Optimizing: Improve shift simplification, x >>> 64.
Simplify shifts by a multiple of bit size, not just 0.
ARM codegen does not expect to see such shifts and it
is guarding against them with a DCHECK().
Bug:
27638111
Change-Id: I3ae8383d7edefa0facd375ce511e7a226d5468a1
Narayan Kamath [Tue, 15 Mar 2016 14:47:29 +0000 (14:47 +0000)]
runtime: delete native/java_lang_Runtime.cc
We're now using Runtime.c from ojluni, which does the same set
of things via the JVM interface. This removes unnecessary duplication
of code between Runtime.cc and OpenJdkJvm.cc.
Also includes a few changes to JVM_NativeLoad to bring it in sync
with the version in Runtime.cc.
bug:
27387202
Change-Id: I92aac81d131661aca588e352aee7a167593e17d4
Roland Levillain [Tue, 15 Mar 2016 14:57:31 +0000 (14:57 +0000)]
Make art::HCompare side effect free.
All our back ends implement all comparisons without making a
runtime call, so we can mark art::HCompare as a side effect
free instruction unconditionally.
Change-Id: I9a9e7c09156c642edb6af1fe84408f887e762f2e
Vladimir Marko [Tue, 15 Mar 2016 13:35:35 +0000 (13:35 +0000)]
Merge "Optimizing: Prevent potential valgrind error."
am:
5681b6638b
* commit '
5681b6638b0001c62d02795b0853e2e82787edf1':
Optimizing: Prevent potential valgrind error.
Vladimir Marko [Tue, 15 Mar 2016 12:41:27 +0000 (12:41 +0000)]
ART: Fix valgrind failure in image_test64.
Explicitly clear LengthPrefixedArray<ArtMethod> padding
in ImageWriter. This also removes a potential source of
non-deterministic data in compiled boot image.
Bug:
26687569
Bug:
27552451
Change-Id: Icf4bf34c9ea5b3159462760fbf556d287841191d
Vladimir Marko [Tue, 15 Mar 2016 13:23:38 +0000 (13:23 +0000)]
Merge "Optimizing: Prevent potential valgrind error."
Vladimir Marko [Tue, 15 Mar 2016 10:40:33 +0000 (10:40 +0000)]
Optimizing: Prevent potential valgrind error.
This CL preemptively extends the workaround from
https://android-review.googlesource.com/208230
to an almost identical bit of code.
Bug:
27651442
Change-Id: I7683d42b46b16f2293916defc6ef1d871dc9af6c
Vladimir Marko [Tue, 15 Mar 2016 10:00:27 +0000 (10:00 +0000)]
Merge "Optimizing: Fix valgrind error in image_test64."
am:
51b7e2d08f
* commit '
51b7e2d08f2bcf528eeec48b42c178b5550f6635':
Optimizing: Fix valgrind error in image_test64.
Vladimir Marko [Tue, 15 Mar 2016 09:51:10 +0000 (09:51 +0000)]
Merge "Optimizing: Fix valgrind error in image_test64."
Jeff Hao [Tue, 15 Mar 2016 02:49:24 +0000 (02:49 +0000)]
Merge "Fix zygote handling of when secondary image is out of date."
am:
ea9aa3ff93
* commit '
ea9aa3ff937a6fdda0aa51df50b64b9ab7c22634':
Fix zygote handling of when secondary image is out of date.
Aart Bik [Tue, 15 Mar 2016 02:49:23 +0000 (02:49 +0000)]
Merge "Fixed bug in BCE, with regression test."
am:
5ee830173b
* commit '
5ee830173bd5d1de3e1e0581e405a910a3089e73':
Fixed bug in BCE, with regression test.
Jeff Hao [Tue, 15 Mar 2016 02:41:14 +0000 (02:41 +0000)]
Merge "Fix zygote handling of when secondary image is out of date."
Aart Bik [Tue, 15 Mar 2016 02:40:15 +0000 (02:40 +0000)]
Merge "Fixed bug in BCE, with regression test."
Jeff Hao [Tue, 15 Mar 2016 01:50:49 +0000 (18:50 -0700)]
Fix zygote handling of when secondary image is out of date.
Simple fix for case when primary image is current, but a secondary image
is out of date. Will want to do a cleaner fix in the future.
Bug:
27340451
(cherry-pick of commit
b8510d2311964489342d8875ef7f5b681ba874b4)
Change-Id: Ia6db863e3d3c72120630bcbae8d399a78dda2710
Mathieu Chartier [Tue, 15 Mar 2016 00:19:39 +0000 (00:19 +0000)]
Merge "Add oatdump support for app images"
am:
d3c8fe76ad
* commit '
d3c8fe76adf3d1447067f2631e7d6ead139ed152':
Add oatdump support for app images
Mathieu Chartier [Tue, 15 Mar 2016 00:11:27 +0000 (00:11 +0000)]
Merge "Add oatdump support for app images"
Mathieu Chartier [Wed, 9 Mar 2016 00:49:58 +0000 (16:49 -0800)]
Add oatdump support for app images
Example usage on host:
oatdumpd --app-oat=art/plus32.odex --app-image=art/plus32.art
--image=art/oats/system@framework@boot.art --instruction-set=arm
TODO: Add to oatdump test.
Bug:
27408512
Bug:
22858531
(cherry picked from commit
bcb6a72569a1401b36a3ad3b6aa4d13e29966cf0)
Change-Id: I9d1aa7eaa16795e5fbabc6974d245849e16b1d03
Andreas Gampe [Mon, 14 Mar 2016 23:45:14 +0000 (23:45 +0000)]
Merge "ART: Update dalvik-cache for zygote after OTA"
am:
c3214fbb66 -s ours
* commit '
c3214fbb66b5f4c436c44d027df5046c803f6432':
ART: Update dalvik-cache for zygote after OTA
Mathieu Chartier [Mon, 14 Mar 2016 23:40:31 +0000 (23:40 +0000)]
Merge "Add oatdump support for app images" into nyc-dev
am:
bc20209fcd
* commit '
bc20209fcd8859fdade71fd1cc27cb8576d6da55':
Add oatdump support for app images
Andreas Gampe [Mon, 14 Mar 2016 23:37:15 +0000 (23:37 +0000)]
Merge "ART: Update dalvik-cache for zygote after OTA"
Andreas Gampe [Sat, 21 Nov 2015 03:26:51 +0000 (19:26 -0800)]
ART: Update dalvik-cache for zygote after OTA
Detect OTA artifacts and move them over to the regular dalvik-cache
on boot.
Bug:
25612095
(cherry picked from commit
754479f7aa056602de8282f4f03718b42c20b89b)
Change-Id: I9a1a22641cc7833435098627a5cc6d954521c4ea
Mathieu Chartier [Mon, 14 Mar 2016 23:29:34 +0000 (23:29 +0000)]
Merge "Add oatdump support for app images" into nyc-dev
Aart Bik [Mon, 14 Mar 2016 21:11:26 +0000 (14:11 -0700)]
Fixed bug in BCE, with regression test.
The fix is twofold:
(1) Ensure that bound checks are never eliminated more than once
to guard against any conceivable situation in which the same
bounds check appears multiple times in array length use list.
(2) Specially reject BoundsCheck(x,x) since that always goes OOB.
BUG=
27628526
Change-Id: I399ec4254323e0cfcd0a68898f403cfab7b35135
Mathieu Chartier [Wed, 9 Mar 2016 00:49:58 +0000 (16:49 -0800)]
Add oatdump support for app images
Example usage on host:
oatdumpd --app-oat=art/plus32.odex --app-image=art/plus32.art
--image=art/oats/system@framework@boot.art --instruction-set=arm
TODO: Add to oatdump test.
Bug:
27408512
Bug:
22858531
Change-Id: I320db8b76c780c6eadabcb45ce88f45950741484
Andreas Gampe [Mon, 14 Mar 2016 21:29:01 +0000 (21:29 +0000)]
Merge "ART: Remember whether the cache was pruned" into nyc-dev
am:
e7361ca06d
* commit '
e7361ca06da3209c5687731ac118f38d22d93ce7':
ART: Remember whether the cache was pruned
Vladimir Marko [Mon, 14 Mar 2016 21:21:29 +0000 (21:21 +0000)]
Optimizing: Fix valgrind error in image_test64.
Bug:
27651442
Change-Id: Id9b80c6015dbc3b82966766ca4ad010be770f116
Andreas Gampe [Mon, 14 Mar 2016 21:03:47 +0000 (21:03 +0000)]
Merge "ART: Remember whether the cache was pruned" into nyc-dev
Mathieu Chartier [Mon, 14 Mar 2016 20:58:42 +0000 (20:58 +0000)]
Merge "Do not include image header in decompressed size"
am:
11ad252355
* commit '
11ad2523557c35acfbf829aa203d14914e61884e':
Do not include image header in decompressed size
Mathieu Chartier [Mon, 14 Mar 2016 20:50:00 +0000 (20:50 +0000)]
Merge "Do not include image header in decompressed size"
Mathieu Chartier [Mon, 14 Mar 2016 18:02:59 +0000 (11:02 -0700)]
Do not include image header in decompressed size
Could cause a buffer overflow since we told LZ4 to decompress more
bytes than necessary.
Bug:
27561308
(cherry picked from commit
324eb2c6b049f1677133f0b708730e904c5e73ab)
Change-Id: I524c03b8f0e8a84814dbd8678285184e9d4da9f1
Mathieu Chartier [Mon, 14 Mar 2016 20:31:58 +0000 (20:31 +0000)]
Merge "Do not include image header in decompressed size" into nyc-dev
am:
3a1b33df0d
* commit '
3a1b33df0df7db2b8685f8616b9240accd6a23c5':
Do not include image header in decompressed size
Mathieu Chartier [Mon, 14 Mar 2016 20:28:30 +0000 (20:28 +0000)]
Merge "Do not include image header in decompressed size" into nyc-dev
Mathieu Chartier [Mon, 14 Mar 2016 18:02:59 +0000 (11:02 -0700)]
Do not include image header in decompressed size
Could cause a buffer overflow since we told LZ4 to decompress more
bytes than necessary.
Bug:
27561308
Change-Id: Ic938f3e67f8c0627f203ad7261d4342ce43157cd
Mathieu Chartier [Mon, 14 Mar 2016 20:21:33 +0000 (20:21 +0000)]
Merge "Fix cases where we miss instrumentation changes"
am:
1b876790ec
* commit '
1b876790ec3e9801ef40fa26630ca925f319956c':
Fix cases where we miss instrumentation changes
Mathieu Chartier [Mon, 14 Mar 2016 20:14:30 +0000 (20:14 +0000)]
Merge "Fix cases where we miss instrumentation changes"
Mathieu Chartier [Sat, 12 Mar 2016 01:22:23 +0000 (17:22 -0800)]
Fix cases where we miss instrumentation changes
Moved allocation stack push to after we record the allocation since
it can cause thread suspension.
Added handling in entrypoint utils for thread suspension cases.
Keep the AllocRecordObjectMap around since we do not want to delete
it if there are any threads waiting on new_record_condition_. The
condition guards adding stack traces while the GC is running. If we
delete the map and there are still waiters that did not resume, it
caused a CHECK failure. This could happen in cases where one thread
disables allocation tracking while other threads are about to
resume from the condition.
Bug:
27506909
(cherry picked from commit
0f394021d6abfdf9ebea6c7f405ec936a812ea62)
Change-Id: I1dc51e9f000684b4032b57beab59d317ece26f06
Calin Juravle [Mon, 14 Mar 2016 19:39:26 +0000 (19:39 +0000)]
Merge "Don\'t be so agressive in quering the code cache for new methods" into nyc-dev
am:
04bca8a8c4
* commit '
04bca8a8c47600bf1f5f5eff1e347a72d118ab04':
Don't be so agressive in quering the code cache for new methods
Calin Juravle [Mon, 14 Mar 2016 19:30:07 +0000 (19:30 +0000)]
Merge "Don't be so agressive in quering the code cache for new methods" into nyc-dev
Calin Juravle [Mon, 14 Mar 2016 17:32:49 +0000 (17:32 +0000)]
Don't be so agressive in quering the code cache for new methods
Interim fix for apps which JIT a lot and trigger a lot of I/O because of
profile data (e.g. gmscore).
This reduces the amount of data re-written to disk by a few order of
magnitude. (e.g. 43k instead of 3.5MB)
Proper fix which will make the writing smarter is coming.
Bug:
27600652
Change-Id: I7582bfab9abee6efebfe99da6979f7e118f82915
Vladimir Marko [Mon, 14 Mar 2016 19:20:38 +0000 (19:20 +0000)]
Merge "Optimizing: Fix TypeConversion(And(x, const)) simplification."
am:
0b2c1922cc
* commit '
0b2c1922cc29a7939f747f60d80240a9fb22547c':
Optimizing: Fix TypeConversion(And(x, const)) simplification.
Vladimir Marko [Mon, 14 Mar 2016 19:13:14 +0000 (19:13 +0000)]
Merge "Optimizing: Fix TypeConversion(And(x, const)) simplification."
Vladimir Marko [Mon, 14 Mar 2016 18:00:05 +0000 (18:00 +0000)]
Optimizing: Fix TypeConversion(And(x, const)) simplification.
Avoid introducing implicit conversions when simplifying the
expression TypeConversion(And(x, const)). Previously, when
we dropped the And, we could end up with a TypeConversion to
the same type which should be eliminated on subsequent pass
of the block's instructions; however, a subsequent dependent
TypeConversion in the same block would be processed earlier
and we would unexpectedly see its input as the conversion to
the same type, failing a DCHECK().
Bug:
27626509
Change-Id: I5874a9ceafbf635cf3391beea807ede8468ab5c3
Hiroshi Yamauchi [Mon, 14 Mar 2016 18:59:29 +0000 (18:59 +0000)]
Merge "Clean up the valgrind test targets."
am:
de83659474
* commit '
de836594741c8547afb2a680e1d442dcc27cfbe5':
Clean up the valgrind test targets.
Hiroshi Yamauchi [Mon, 14 Mar 2016 18:47:50 +0000 (18:47 +0000)]
Merge "Clean up the valgrind test targets."
Mathieu Chartier [Mon, 14 Mar 2016 18:44:57 +0000 (18:44 +0000)]
Merge "Fix cases where we miss instrumentation changes" into nyc-dev
am:
dd6558da4b
* commit '
dd6558da4bbd11a430268bff7d886b7fcb071dc4':
Fix cases where we miss instrumentation changes
Mathieu Chartier [Mon, 14 Mar 2016 18:33:43 +0000 (18:33 +0000)]
Merge "Fix cases where we miss instrumentation changes" into nyc-dev
Hiroshi Yamauchi [Mon, 14 Mar 2016 18:18:36 +0000 (11:18 -0700)]
Clean up the valgrind test targets.
Allow the 32-bit or the 64-bit valgrind tests to run separately or both.
Bug:
27156726
Change-Id: Ib439eb2f57d3302be152cb5af1a8960a41725f31
Vladimir Marko [Mon, 14 Mar 2016 18:12:22 +0000 (18:12 +0000)]
Merge "Optimizing: Do not re-record standby checks for dynamic BCE."
am:
70bc6de7e2
* commit '
70bc6de7e27dd7d82a2bac6685e0f3096df07b83':
Optimizing: Do not re-record standby checks for dynamic BCE.
Andreas Gampe [Mon, 14 Mar 2016 18:10:14 +0000 (18:10 +0000)]
ART: Check alignment of section offsets
am:
3a52b22cf7
* commit '
3a52b22cf71446dd47cc1a2775dd0aabbf5e96f7':
ART: Check alignment of section offsets
Andreas Gampe [Sat, 12 Mar 2016 01:44:04 +0000 (17:44 -0800)]
ART: Remember whether the cache was pruned
Remember (and expose) whether the cache was pruned when initializing
the runtime.
Bug:
27618311
Change-Id: I178d18d731a9dce5cb11ed0874c9c9c9d36d7d8e
Vladimir Marko [Mon, 14 Mar 2016 17:42:19 +0000 (17:42 +0000)]
Merge "Optimizing: Do not re-record standby checks for dynamic BCE."
Mathieu Chartier [Sat, 12 Mar 2016 01:22:23 +0000 (17:22 -0800)]
Fix cases where we miss instrumentation changes
Moved allocation stack push to after we record the allocation since
it can cause thread suspension.
Added handling in entrypoint utils for thread suspension cases.
Keep the AllocRecordObjectMap around since we do not want to delete
it if there are any threads waiting on new_record_condition_. The
condition guards adding stack traces while the GC is running. If we
delete the map and there are still waiters that did not resume, it
caused a CHECK failure. This could happen in cases where one thread
disables allocation tracking while other threads are about to
resume from the condition.
Bug:
27506909
Change-Id: I097689ca35ad408121c6b8dabd28e75cce1a43a0
Nicolas Geoffray [Mon, 14 Mar 2016 16:03:06 +0000 (16:03 +0000)]
Merge "Revert "Enable compilation of secondary dex files""
am:
e70cda6147
* commit '
e70cda6147e2e49384a219b167a6c734a8db28f5':
Revert "Enable compilation of secondary dex files"
Nicolas Geoffray [Mon, 14 Mar 2016 15:54:54 +0000 (15:54 +0000)]
Merge "Revert "Enable compilation of secondary dex files""