OSDN Git Service
Roland Levillain [Fri, 10 Jul 2015 11:13:29 +0000 (11:13 +0000)]
am
9e58a50d: am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
9e58a50d64c83527eeb3278669900e7e3e18d1c4':
Fuse long and FP compare & condition on ARM in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 11:01:37 +0000 (11:01 +0000)]
am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
f40002163fed58215df569e89f0a0b9661e16273':
Fuse long and FP compare & condition on ARM in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 10:51:14 +0000 (10:51 +0000)]
Merge "Fuse long and FP compare & condition on ARM in Optimizing."
Roland Levillain [Fri, 10 Jul 2015 10:35:10 +0000 (10:35 +0000)]
am
4821d42c: am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
4821d42ca747a4118bd6750ceaad3a51502569ad':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Fri, 10 Jul 2015 10:20:41 +0000 (10:20 +0000)]
am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
f16b820fc18ff86e765a14176f05417305d689a0':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Fri, 10 Jul 2015 10:08:06 +0000 (10:08 +0000)]
Merge "Initialize pDeoptimize quick entry pointer for Mips."
Andreas Gampe [Fri, 10 Jul 2015 01:53:40 +0000 (01:53 +0000)]
am
b0423784: am
f470eb88: Merge "ART: Change merges with Undefined to Undefined"
* commit '
b0423784ca9251c055ac063956e4c7623d773649':
ART: Change merges with Undefined to Undefined
Andreas Gampe [Fri, 10 Jul 2015 01:43:45 +0000 (01:43 +0000)]
Andreas Gampe [Fri, 10 Jul 2015 01:43:23 +0000 (01:43 +0000)]
am
ed8fea78: Merge "ART: Improve the symbolize script" into mnc-dev
* commit '
ed8fea782454f3273685b377479cf30e49bce522':
ART: Improve the symbolize script
Andreas Gampe [Fri, 10 Jul 2015 01:39:15 +0000 (01:39 +0000)]
am
f470eb88: Merge "ART: Change merges with Undefined to Undefined"
* commit '
f470eb88cc3d3654f0fb1ca38622fa3a35fbd8a3':
ART: Change merges with Undefined to Undefined
Andreas Gampe [Fri, 10 Jul 2015 01:27:00 +0000 (01:27 +0000)]
Merge "ART: Change merges with Undefined to Undefined"
Mathieu Chartier [Fri, 10 Jul 2015 01:03:40 +0000 (01:03 +0000)]
am
a52d36bc: am
d65ddd18: Merge "Remove unused WorkStealing thread pool"
* commit '
a52d36bc8e0e8293fd11d926496f5e124e3cd084':
Remove unused WorkStealing thread pool
Mathieu Chartier [Fri, 10 Jul 2015 00:49:46 +0000 (00:49 +0000)]
am
d65ddd18: Merge "Remove unused WorkStealing thread pool"
* commit '
d65ddd188a94cccabf723c860f0750e33f30cdb3':
Remove unused WorkStealing thread pool
Mathieu Chartier [Fri, 10 Jul 2015 00:37:31 +0000 (00:37 +0000)]
Merge "Remove unused WorkStealing thread pool"
Mathieu Chartier [Fri, 10 Jul 2015 00:08:01 +0000 (00:08 +0000)]
am
9c920307: am
07c65d2b: Merge "Clean up some includes"
* commit '
9c92030701dca1e6d8ba79cf7a38f5e9d1734984':
Clean up some includes
Mathieu Chartier [Thu, 9 Jul 2015 23:58:42 +0000 (16:58 -0700)]
Remove unused WorkStealing thread pool
Bug:
10141986
Change-Id: Id2042320afc91b34b6203e82fb56424281c8d64b
Mathieu Chartier [Thu, 9 Jul 2015 23:54:47 +0000 (23:54 +0000)]
am
07c65d2b: Merge "Clean up some includes"
* commit '
07c65d2b0c7faa6ffc288f538181177809aa5bdb':
Clean up some includes
Mathieu Chartier [Thu, 9 Jul 2015 23:43:48 +0000 (23:43 +0000)]
Merge "Clean up some includes"
Mathieu Chartier [Thu, 9 Jul 2015 22:15:09 +0000 (15:15 -0700)]
Clean up some includes
Change-Id: Ia03a3b54b235df38d5cfe096fef1aebe2b80eb29
Andreas Gampe [Thu, 9 Jul 2015 22:17:45 +0000 (22:17 +0000)]
am
fb41b769: am
c89216b5: Merge "ART: Improve the symbolize script"
* commit '
fb41b7696f6b8a016875a24393ffcecc6cd4f97e':
ART: Improve the symbolize script
Andreas Gampe [Thu, 9 Jul 2015 22:03:01 +0000 (22:03 +0000)]
am
c89216b5: Merge "ART: Improve the symbolize script"
* commit '
c89216b5485fba9a604e3c6dd5101fa4035918eb':
ART: Improve the symbolize script
Andreas Gampe [Thu, 9 Jul 2015 18:01:07 +0000 (11:01 -0700)]
ART: Fix test
Fixes a breakage from
38536287f61c9c0fc3bab8c1950cf8c74881482a. Ensure
that v4 is not undefined when an exception may be thrown (at the
new-instance).
Bug:
22331663
Bug:
22371999
(cherry picked from commit
7135ff0fdfd02796d40e7ef3c7527ff127512bd3)
Change-Id: Ice36ddda5ca92ea32fa88523dd616d4f2a61027e
Andreas Gampe [Thu, 9 Jul 2015 21:50:13 +0000 (21:50 +0000)]
Merge "ART: Improve the symbolize script"
Andreas Gampe [Thu, 9 Jul 2015 21:39:56 +0000 (14:39 -0700)]
ART: Improve the symbolize script
Allow a list of files to pull. This improves turnaround time when
tracking down perf hotspots.
Bug:
21760614
(cherry picked from commit
6f0a9c305b3e51b852fa9f188590076d6612864e)
Change-Id: I824e875053940d59eb00f9d796ef402632905c39
Andreas Gampe [Thu, 9 Jul 2015 21:44:01 +0000 (21:44 +0000)]
Merge "ART: Improve the symbolize script" into mnc-dev
Andreas Gampe [Thu, 9 Jul 2015 21:39:56 +0000 (14:39 -0700)]
ART: Improve the symbolize script
Allow a list of files to pull. This improves turnaround time when
tracking down perf hotspots.
Bug:
21760614
Change-Id: I824e875053940d59eb00f9d796ef402632905c39
Andreas Gampe [Thu, 9 Jul 2015 18:30:14 +0000 (11:30 -0700)]
ART: Change merges with Undefined to Undefined
The result of a merge with an Undefined type should be Undefined.
Conflicts are allowed to be copied around, but Undefined registers
should not be touched at all, except to be written into.
Add a success test case (the register isn't used) and a fail test
case (the register is tried to be copied).
Bug:
22331663
Bug:
22371999
Change-Id: I9697ce31c1d2ab5aee0433dcf1253bcca79c2983
Andreas Gampe [Thu, 9 Jul 2015 19:00:23 +0000 (19:00 +0000)]
am
376024b4: am
f99628f7: Merge "ART: Fix test"
* commit '
376024b4643489388e1e4916386d8dbce46bafd0':
ART: Fix test
Andreas Gampe [Thu, 9 Jul 2015 18:49:16 +0000 (18:49 +0000)]
am
f99628f7: Merge "ART: Fix test"
* commit '
f99628f7673c21c42be34f95bef6bbb50cd99f20':
ART: Fix test
Andreas Gampe [Thu, 9 Jul 2015 18:29:36 +0000 (18:29 +0000)]
Merge "ART: Fix test"
Andreas Gampe [Thu, 9 Jul 2015 18:01:07 +0000 (11:01 -0700)]
ART: Fix test
Fixes a breakage from
38536287f61c9c0fc3bab8c1950cf8c74881482a. Ensure
that v4 is not undefined when an exception may be thrown (at the
new-instance).
Bug:
22331663
Bug:
22371999
Change-Id: Ice36ddda5ca92ea32fa88523dd616d4f2a61027e
Calin Juravle [Thu, 9 Jul 2015 15:07:39 +0000 (15:07 +0000)]
am
a4003558: am
a51df8a5: Merge "Fix makefile test against host os."
* commit '
a4003558dc36f36c9c73bf83626da7e4ec383398':
Fix makefile test against host os.
David Brazdil [Thu, 9 Jul 2015 15:07:38 +0000 (15:07 +0000)]
am
3f4df5e9: am
9781bb05: Merge "ART: Fix bug in GraphBuilder"
* commit '
3f4df5e938a7fb3a69297da55588863ef1e291a0':
ART: Fix bug in GraphBuilder
Calin Juravle [Thu, 9 Jul 2015 14:58:58 +0000 (14:58 +0000)]
am
a51df8a5: Merge "Fix makefile test against host os."
* commit '
a51df8a59f2be2c797a98fb60c6eca9b049412bf':
Fix makefile test against host os.
David Brazdil [Thu, 9 Jul 2015 14:55:26 +0000 (14:55 +0000)]
am
9781bb05: Merge "ART: Fix bug in GraphBuilder"
* commit '
9781bb056ddfaa3a29b4e199357293859b816bb6':
ART: Fix bug in GraphBuilder
Calin Juravle [Thu, 9 Jul 2015 14:52:13 +0000 (14:52 +0000)]
Merge "Fix makefile test against host os."
Calin Juravle [Thu, 9 Jul 2015 14:48:03 +0000 (15:48 +0100)]
Fix makefile test against host os.
Change-Id: I7637845277012a189bf5f3598f9f0b1f599fbf75
David Brazdil [Thu, 9 Jul 2015 14:42:05 +0000 (14:42 +0000)]
Merge "ART: Fix bug in GraphBuilder"
David Brazdil [Thu, 9 Jul 2015 13:36:05 +0000 (14:36 +0100)]
ART: Fix bug in GraphBuilder
This fixes a bug where the GraphBuilder would split a throwing catch
block but would not update info about which blocks throw.
Change-Id: If5415f0c320aa488e06eb042e8fea6f03e30246a
Sebastien Hertz [Thu, 9 Jul 2015 12:56:27 +0000 (14:56 +0200)]
resolved conflicts for merge of
5ee9454d to mnc-dev-plus-aosp
Change-Id: I631e6ebdbc5e7abc571de133b337309ed08282e3
David Brazdil [Thu, 9 Jul 2015 11:43:54 +0000 (11:43 +0000)]
am
b4a4f56f: am
7b3d3bc1: Merge "ART: Add regression test"
* commit '
b4a4f56f2db60bfcf8b106a80392a45c4e55d54c':
ART: Add regression test
Sebastien Hertz [Thu, 9 Jul 2015 11:43:37 +0000 (11:43 +0000)]
am
23e97f5d: am
0f40fbc8: Merge "Support compiling run-tests with jack"
* commit '
23e97f5da43f6b8d53b79fe4014a6078dfc7c510':
Support compiling run-tests with jack
David Brazdil [Thu, 9 Jul 2015 10:48:39 +0000 (10:48 +0000)]
am
7b3d3bc1: Merge "ART: Add regression test"
* commit '
7b3d3bc1a4ea7546e4743e90e695f4fc7ecadf3a':
ART: Add regression test
David Brazdil [Thu, 9 Jul 2015 10:37:09 +0000 (10:37 +0000)]
Merge "ART: Add regression test"
David Brazdil [Wed, 8 Jul 2015 18:13:19 +0000 (19:13 +0100)]
ART: Add regression test
This adds a test for CL I624c0f91676d9baaada6f33be9d7091f68d57535.
Change-Id: Ib9ea1400082ad03c4355983d95268e084c0b6a6e
Sebastien Hertz [Thu, 9 Jul 2015 09:53:06 +0000 (09:53 +0000)]
am
0f40fbc8: Merge "Support compiling run-tests with jack"
* commit '
0f40fbc82722bd75ee04cd7e04580a13a6f79443':
Support compiling run-tests with jack
Sebastien Hertz [Tue, 24 Feb 2015 16:39:50 +0000 (17:39 +0100)]
Support compiling run-tests with jack
This CL adds support to compile run-test source files with jack. When
a test needs to rely on class files, we use jill to convert them to a
jack library.
We need to pass the full classpath to jack containing at least core
classes (like java.lang.Object). This means the Android tree must
have been compiled with jack first so we find all the necessary
classes.jack files.
Some tests still rely on dex files generated with the old toolchain.
We keep building them this way for the moment and will update them
later, when they get ready for Jack.
Also updates a few tests dealing with garbage collection to avoid a
situation where a reference can be retained by a local DEX register.
Bug:
19467889
(cherry picked from commit
19ac0276208f0afef6ba8a4ab34b74a59b8d11d7)
Change-Id: Ia5a989b83430ffe8298a869a1da970b756721bb0
Sebastien Hertz [Thu, 9 Jul 2015 09:11:35 +0000 (09:11 +0000)]
Merge "Support compiling run-tests with jack"
Andreas Gampe [Thu, 9 Jul 2015 03:41:45 +0000 (03:41 +0000)]
am
46f5dcbd: am
224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"
* commit '
46f5dcbd8d4172d5f3acc10e68eaf8e3b7a855b8':
ART: Allow to set and copy conflicts in the verifier
Andreas Gampe [Thu, 9 Jul 2015 03:34:23 +0000 (03:34 +0000)]
am
c2bf1255: ART: Allow to set and copy conflicts in the verifier
* commit '
c2bf1255ebf360d009dd0763dcea8d2c9b9c676e':
ART: Allow to set and copy conflicts in the verifier
Andreas Gampe [Thu, 9 Jul 2015 03:33:37 +0000 (03:33 +0000)]
am
224a848b: Merge "ART: Allow to set and copy conflicts in the verifier"
* commit '
224a848b0f55b8a39ec8bfd73786ccd409def0a2':
ART: Allow to set and copy conflicts in the verifier
Andreas Gampe [Thu, 9 Jul 2015 03:02:05 +0000 (03:02 +0000)]
Merge "ART: Allow to set and copy conflicts in the verifier"
Andreas Gampe [Thu, 9 Jul 2015 00:22:57 +0000 (17:22 -0700)]
ART: Allow to set and copy conflicts in the verifier
As long as conflicts are not actively being used, it is OK to set
them in a register line or copy them around.
Bug:
22331663
(cherry picked from commit
38536287f61c9c0fc3bab8c1950cf8c74881482a)
Change-Id: I61999e2d9c92f9bdedcb0a5dea54df3c5bb130ca
Andreas Gampe [Thu, 9 Jul 2015 00:22:57 +0000 (17:22 -0700)]
ART: Allow to set and copy conflicts in the verifier
As long as conflicts are not actively being used, it is OK to set
them in a register line or copy them around.
Bug:
22331663
Change-Id: I61999e2d9c92f9bdedcb0a5dea54df3c5bb130ca
Mathieu Chartier [Wed, 8 Jul 2015 22:15:09 +0000 (22:15 +0000)]
am
ff92b000: am
0e87d180: Merge "Fix potential bugs in allocation tracker"
* commit '
ff92b00089a5250952a1200d055708d01c5d2be6':
Fix potential bugs in allocation tracker
Ying Wang [Wed, 8 Jul 2015 22:15:08 +0000 (22:15 +0000)]
am
54d804f8: am
e1f3a6ed: Merge "Have test-art-host-dexdump specifically depend on the host binaries."
* commit '
54d804f8ec081e26a8548a82d6eafff14b423faa':
Have test-art-host-dexdump specifically depend on the host binaries.
Mathieu Chartier [Wed, 8 Jul 2015 22:00:43 +0000 (22:00 +0000)]
am
0e87d180: Merge "Fix potential bugs in allocation tracker"
* commit '
0e87d1809443d41b431ce3a686b4e074df2d7b8b':
Fix potential bugs in allocation tracker
Ying Wang [Wed, 8 Jul 2015 22:00:42 +0000 (22:00 +0000)]
am
e1f3a6ed: Merge "Have test-art-host-dexdump specifically depend on the host binaries."
* commit '
e1f3a6edc5bb241a11043c8be6b12b856b6cfe89':
Have test-art-host-dexdump specifically depend on the host binaries.
Aart Bik [Wed, 8 Jul 2015 21:54:51 +0000 (21:54 +0000)]
am
d8618e13: am
784c6aee: Merge "Revert "Make Art dexdump/list the real utilities.""
* commit '
d8618e1315485ed326fdada8ff00687dcb8d8ae0':
Revert "Make Art dexdump/list the real utilities."
Mathieu Chartier [Wed, 8 Jul 2015 21:54:49 +0000 (21:54 +0000)]
am
b560d884: am
2e3fc781: Merge "Use trap + async timeout for tests"
* commit '
b560d884c76ba83dbdeea814770c9aa71255e279':
Use trap + async timeout for tests
Mathieu Chartier [Wed, 8 Jul 2015 21:46:48 +0000 (21:46 +0000)]
Merge "Fix potential bugs in allocation tracker"
Ying Wang [Wed, 8 Jul 2015 21:46:14 +0000 (21:46 +0000)]
Merge "Have test-art-host-dexdump specifically depend on the host binaries."
Andreas Gampe [Wed, 8 Jul 2015 21:46:02 +0000 (21:46 +0000)]
am
a3cd834a: ART: Avoid soft- after hard-fail in verifier
* commit '
a3cd834a9e63c4c2259f0ef87d79ddf2c4dd3afb':
ART: Avoid soft- after hard-fail in verifier
Aart Bik [Wed, 8 Jul 2015 21:39:57 +0000 (21:39 +0000)]
am
784c6aee: Merge "Revert "Make Art dexdump/list the real utilities.""
* commit '
784c6aee9cde7fc0e39a9f0c8b93d120e5f6dc3b':
Revert "Make Art dexdump/list the real utilities."
Mathieu Chartier [Wed, 8 Jul 2015 21:39:53 +0000 (21:39 +0000)]
am
2e3fc781: Merge "Use trap + async timeout for tests"
* commit '
2e3fc78177c73569627654b9f90938de8d3b316e':
Use trap + async timeout for tests
Ying Wang [Wed, 8 Jul 2015 21:09:10 +0000 (14:09 -0700)]
Have test-art-host-dexdump specifically depend on the host binaries.
dexdump2 and dexlist2 are phony targets representing both the host and
target binaries.
Also set environmental variable ANDROID_HOST_OUT=$(realpath $(HOST_OUT))
before calling art/test/dexdump/run-all-tests.
art/test/dexdump/run-all-tests references ANDROID_HOST_OUT, which may be
not set up by the user if he didn't run build/envsetup.sh.
Bug:
22343844
Change-Id: I38b5f3efccd5817d7d9ff0e91b5c6d070b546d77
Aart Bik [Wed, 8 Jul 2015 21:21:15 +0000 (21:21 +0000)]
Merge "Revert "Make Art dexdump/list the real utilities.""
Mathieu Chartier [Wed, 8 Jul 2015 21:21:55 +0000 (21:21 +0000)]
Merge "Use trap + async timeout for tests"
Andreas Gampe [Wed, 8 Jul 2015 21:21:47 +0000 (21:21 +0000)]
am
0d8b449e: am
dffdfb9e: Merge "ART: Avoid soft- after hard-fail in verifier"
* commit '
0d8b449e9628f06d17df2e117ed2fdb09e3c9dc6':
ART: Avoid soft- after hard-fail in verifier
Aart Bik [Wed, 8 Jul 2015 21:20:13 +0000 (21:20 +0000)]
Revert "Make Art dexdump/list the real utilities."
This reverts commit
d10ee1ce1ccd92c003ec49c15edf339e74c13894.
REASON:
win_sdk is not happy with my migration :-(
Change-Id: I2ed196da3f5883112883525f883d25b36e48352a
Andreas Gampe [Wed, 8 Jul 2015 21:08:48 +0000 (21:08 +0000)]
am
dffdfb9e: Merge "ART: Avoid soft- after hard-fail in verifier"
* commit '
dffdfb9ecb8c3b0b3faaf0ca204b963410a3a47d':
ART: Avoid soft- after hard-fail in verifier
Andreas Gampe [Tue, 7 Jul 2015 00:20:18 +0000 (17:20 -0700)]
ART: Avoid soft- after hard-fail in verifier
Follow-up to
414000ec4d728b5c85f8c6dee4f867fecde59b01.
Bug:
21886894
Bug:
22245124
(cherry picked from commit
890da29d279c44923f9271450b8a4423b1267655)
Change-Id: I3728187bd8526cdf84f95b123e6fad5d6c5a8b3c
Mathieu Chartier [Wed, 8 Jul 2015 21:03:02 +0000 (14:03 -0700)]
Use trap + async timeout for tests
Allows tests to be killed with ctrl-c.
Bug:
19414810
Change-Id: I09fbee370e71386ed48b814407868c2fe7a0b058
Andreas Gampe [Wed, 8 Jul 2015 20:56:40 +0000 (20:56 +0000)]
Merge "ART: Avoid soft- after hard-fail in verifier"
Aart Bik [Wed, 8 Jul 2015 20:37:26 +0000 (20:37 +0000)]
am
82f479f9: am
8e76556c: Merge "Make Art dexdump/list the real utilities."
* commit '
82f479f95643af29a91013ca00fb12b63737a6f9':
Make Art dexdump/list the real utilities.
Aart Bik [Wed, 8 Jul 2015 20:27:30 +0000 (20:27 +0000)]
am
8e76556c: Merge "Make Art dexdump/list the real utilities."
* commit '
8e76556c38de90095c45599a81254ded448cc1aa':
Make Art dexdump/list the real utilities.
Andreas Gampe [Wed, 8 Jul 2015 20:23:56 +0000 (20:23 +0000)]
am
fd6fe84c: Merge "ART: Release inputs in Long.reverse intrinsic in x86" into mnc-dev
* commit '
fd6fe84c68fdc2ae5f9a1a1bbde80ece4ca557d5':
ART: Release inputs in Long.reverse intrinsic in x86
Andreas Gampe [Wed, 8 Jul 2015 20:12:25 +0000 (20:12 +0000)]
Merge "ART: Release inputs in Long.reverse intrinsic in x86" into mnc-dev
Aart Bik [Wed, 8 Jul 2015 20:10:39 +0000 (20:10 +0000)]
Merge "Make Art dexdump/list the real utilities."
Man Cao [Tue, 7 Jul 2015 01:53:15 +0000 (18:53 -0700)]
Fix potential bugs in allocation tracker
Add a missing visit allocation records call in concurrent copying collecter.
Handle null class objects if we support class unloading, and issues
with disallow and allow new allocation records.
Bug:
20037135
Change-Id: I59b7321c281e0d79a620501b2f43e36d2a576203
Andreas Gampe [Tue, 7 Jul 2015 20:25:58 +0000 (13:25 -0700)]
ART: Release inputs in Long.reverse intrinsic in x86
In the worst case we are using two temps each for input and output.
Then we do not have a temp left over for the swap operations. The
input is dead, however, after the first swap. So try to release it
(a no-op if it isn't actually a temp).
Bug:
22324327
(cherry picked from commit
575422fa5be7389bdaff5e2d25dd87b1d2d4de85)
Change-Id: I1fc50159afdad14160e34abeaf4670958171d6b2
Aart Bik [Wed, 8 Jul 2015 18:30:04 +0000 (11:30 -0700)]
Make Art dexdump/list the real utilities.
Note: depends on pending CL that removes
old dexdump/list and libdex.
Bug:
22322814
Change-Id: I99259553f0f4655a633989feb8d67aa11de8b29d
David Brazdil [Wed, 8 Jul 2015 18:28:21 +0000 (18:28 +0000)]
am
90b8d4f1: am
486728d8: Merge "Address small comments in HGraphBuilder"
* commit '
90b8d4f1164a62cab783ff08c094ebb7892259ea':
Address small comments in HGraphBuilder
David Brazdil [Wed, 8 Jul 2015 18:28:20 +0000 (18:28 +0000)]
am
ad7eb809: am
4880fd56: Merge "Revert "Revert "ART: Ignore try blocks with no throwing instructions"""
* commit '
ad7eb8096c0f934d7237f93631ba6fdb38886e30':
Revert "Revert "ART: Ignore try blocks with no throwing instructions""
David Brazdil [Wed, 8 Jul 2015 18:13:52 +0000 (18:13 +0000)]
am
486728d8: Merge "Address small comments in HGraphBuilder"
* commit '
486728d82e5b36a5ff3d40d282d9c32f7305bc3a':
Address small comments in HGraphBuilder
David Brazdil [Wed, 8 Jul 2015 18:13:51 +0000 (18:13 +0000)]
am
4880fd56: Merge "Revert "Revert "ART: Ignore try blocks with no throwing instructions"""
* commit '
4880fd5695ea1726dde27bb448dae1338d0a0973':
Revert "Revert "ART: Ignore try blocks with no throwing instructions""
Aart Bik [Wed, 8 Jul 2015 18:12:30 +0000 (18:12 +0000)]
am
6bfafebd: am
d9acfe21: Merge "Migrated dexlist from Dalvik (libdex) into Art (libart)"
* commit '
6bfafebda7b8198ade4b6710b9b37467c855ea90':
Migrated dexlist from Dalvik (libdex) into Art (libart)
David Brazdil [Wed, 8 Jul 2015 18:02:56 +0000 (18:02 +0000)]
Merge "Address small comments in HGraphBuilder"
David Brazdil [Wed, 8 Jul 2015 15:44:00 +0000 (16:44 +0100)]
Address small comments in HGraphBuilder
Change-Id: Ife0a19f6e07146c8e03922f1330527d092f5e236
David Brazdil [Wed, 8 Jul 2015 18:00:22 +0000 (18:00 +0000)]
Merge "Revert "Revert "ART: Ignore try blocks with no throwing instructions"""
Aart Bik [Wed, 8 Jul 2015 17:59:36 +0000 (17:59 +0000)]
am
d9acfe21: Merge "Migrated dexlist from Dalvik (libdex) into Art (libart)"
* commit '
d9acfe21f6eb09a22db69958dfb05c1f48f779bd':
Migrated dexlist from Dalvik (libdex) into Art (libart)
Aart Bik [Wed, 8 Jul 2015 17:47:23 +0000 (17:47 +0000)]
Merge "Migrated dexlist from Dalvik (libdex) into Art (libart)"
David Brazdil [Wed, 8 Jul 2015 17:38:06 +0000 (17:38 +0000)]
am
4f228ec5: am
98bea9fd: Merge "Revert "ART: Ignore try blocks with no throwing instructions""
* commit '
4f228ec5050bf1f3f087df5d1a1c06442f41589e':
Revert "ART: Ignore try blocks with no throwing instructions"
David Brazdil [Wed, 8 Jul 2015 17:26:51 +0000 (17:26 +0000)]
Revert "Revert "ART: Ignore try blocks with no throwing instructions""
The original CL broke libcore tests because monitor-exit instructions
did not have any side-effects and got removed by DCE once not labelled
throwing any more.
This reverts commit
efe374d7c25c1d48945a9198d96469de99e0c1bd.
Change-Id: I624c0f91676d9baaada6f33be9d7091f68d57535
David Brazdil [Wed, 8 Jul 2015 17:07:21 +0000 (17:07 +0000)]
am
98bea9fd: Merge "Revert "ART: Ignore try blocks with no throwing instructions""
* commit '
98bea9fdab2c5f964a95f9e76620b0b35c050a8a':
Revert "ART: Ignore try blocks with no throwing instructions"
David Brazdil [Wed, 8 Jul 2015 16:58:19 +0000 (16:58 +0000)]
Merge "Revert "ART: Ignore try blocks with no throwing instructions""
David Brazdil [Wed, 8 Jul 2015 16:58:07 +0000 (16:58 +0000)]
Revert "ART: Ignore try blocks with no throwing instructions"
Turns out monitor-exit *can* throw... Need to investigate
This reverts commit
8f8ee680bec71a28d9d7b7538e8c7ca100a18184.
Change-Id: I8b42690918833c917b6a7fc3ceea932b7c1a6f15
Calin Juravle [Wed, 8 Jul 2015 16:14:19 +0000 (16:14 +0000)]
am
586333a6: am
761f281e: Merge "Revert "Use the object class as top in reference type propagation""
* commit '
586333a694c9a23be11102041c7b7273c39edcdd':
Revert "Use the object class as top in reference type propagation"
Andreas Gampe [Wed, 8 Jul 2015 16:14:15 +0000 (16:14 +0000)]
am
ee1755a4: am
c7d5ae36: Merge "ART: Release inputs in Long.reverse intrinsic in x86"
* commit '
ee1755a41611776b7281ef16fce77fb7cb1b3130':
ART: Release inputs in Long.reverse intrinsic in x86
Calin Juravle [Wed, 8 Jul 2015 16:05:52 +0000 (16:05 +0000)]
am
761f281e: Merge "Revert "Use the object class as top in reference type propagation""
* commit '
761f281e6f78b1c48103cbd45385a5c410e2be07':
Revert "Use the object class as top in reference type propagation"