OSDN Git Service
Nicolas Geoffray [Mon, 18 May 2015 11:22:48 +0000 (11:22 +0000)]
am
682876a1: Merge "Don\'t emit bkpt, takes extra space for nothing."
* commit '
682876a1fc3f215e60766952968dd4dc1f66397d':
Don't emit bkpt, takes extra space for nothing.
David Brazdil [Mon, 18 May 2015 11:22:45 +0000 (11:22 +0000)]
am
81b2591f: Merge "ART: Removed redundant Phis as part of DCE"
* commit '
81b2591f7be6005b553d12a7cfa7ce2cdc08f22d':
ART: Removed redundant Phis as part of DCE
Nicolas Geoffray [Mon, 18 May 2015 11:20:07 +0000 (11:20 +0000)]
Merge "Don't emit bkpt, takes extra space for nothing."
David Brazdil [Mon, 18 May 2015 11:14:35 +0000 (11:14 +0000)]
Merge "ART: Removed redundant Phis as part of DCE"
David Brazdil [Mon, 18 May 2015 11:06:52 +0000 (12:06 +0100)]
ART: Removed redundant Phis as part of DCE
Removing dead blocks can render some phis redundant but they do not
get removed. This patch adds running SsaRedundantPhiElimination to
adress that.
Change-Id: Iec9a16f3c20b2d5b5607cd5aaf802917c155a0f1
Nicolas Geoffray [Mon, 18 May 2015 09:49:57 +0000 (09:49 +0000)]
am
d30ad93c: Merge "Callee/caller save logic in register allocator."
* commit '
d30ad93c9bd31dc03c1e08b92c4733db2dfad849':
Callee/caller save logic in register allocator.
Nicolas Geoffray [Mon, 18 May 2015 09:42:57 +0000 (09:42 +0000)]
Merge "Callee/caller save logic in register allocator."
David Brazdil [Mon, 18 May 2015 09:32:45 +0000 (09:32 +0000)]
am
c88b09fc: Merge "ART: Print C1vis lists as [v1,...,vN]"
* commit '
c88b09fc1d67413e814a10d20752e46aa28bc0e4':
ART: Print C1vis lists as [v1,...,vN]
Nicolas Geoffray [Fri, 17 Apr 2015 08:15:11 +0000 (09:15 +0100)]
Callee/caller save logic in register allocator.
Prevent intervals that do not span a 'will-call' safepoint
to allocate a callee-save register when caller-saves
are available.
Change-Id: I6e613ab54b087f433bbc433aa62847fbca423377
David Brazdil [Mon, 18 May 2015 09:19:23 +0000 (09:19 +0000)]
Merge "ART: Print C1vis lists as [v1,...,vN]"
Nicolas Geoffray [Mon, 18 May 2015 08:49:16 +0000 (09:49 +0100)]
Don't emit bkpt, takes extra space for nothing.
Change-Id: Id091dcdc950b590e5be55c4fa31d7779308e1a2c
Sebastien Hertz [Mon, 18 May 2015 08:38:45 +0000 (08:38 +0000)]
am
aae4334a: Merge "JDWP: more GC safety"
* commit '
aae4334a3f5215edbfe90ab00f8e1e9ade542007':
JDWP: more GC safety
Sebastien Hertz [Mon, 18 May 2015 08:02:28 +0000 (08:02 +0000)]
Merge "JDWP: more GC safety"
Kenny Root [Fri, 15 May 2015 22:21:12 +0000 (22:21 +0000)]
am
03e4351d: Merge "Add new style String operations during compilation init, part 2"
* commit '
03e4351df62ade9fa0e9139ece28f23ba85c49c2':
Add new style String operations during compilation init, part 2
Kenny Root [Fri, 15 May 2015 22:10:16 +0000 (22:10 +0000)]
Merge "Add new style String operations during compilation init, part 2"
Kenny Root [Thu, 14 May 2015 22:58:17 +0000 (15:58 -0700)]
Add new style String operations during compilation init, part 2
This allows some class initializers that deal with Strings to run during
compilation. However, java.lang.Character.toUpperCase() is blocking
initialization for some parts.
Bug:
21036900
Change-Id: Ia969c6a643f510bc798f94fb10bca1a68fe2ae67
Elliott Hughes [Fri, 15 May 2015 17:12:44 +0000 (17:12 +0000)]
am
74ef4424: Merge "Stop wrapping close(2) with TEMP_FAILURE_RETRY in art."
* commit '
74ef4424040ce38945825ac7b75e74de96093145':
Stop wrapping close(2) with TEMP_FAILURE_RETRY in art.
Elliott Hughes [Fri, 15 May 2015 16:58:44 +0000 (16:58 +0000)]
Merge "Stop wrapping close(2) with TEMP_FAILURE_RETRY in art."
David Brazdil [Fri, 15 May 2015 15:01:59 +0000 (16:01 +0100)]
ART: Print C1vis lists as [v1,...,vN]
Checker interprets whitespace as a don't-care placeholder, making it
easier to write assertions which test only parts of the output (e.g.
"//CHECK: Add liveness:44" does not test the inputs or any other
attributes apart from "liveness").
However, since the GraphVisualizer prints lists with elements
separated by spaces ("[ v1 ... vN ]"), this allows for false positives
caused by an occurrence elsewhere in the output. For example, the
assertion: "//CHECK: [ x y ]" will match "[ x y ]" but also
"[ x a y b ]" or even "[ x ] abc [ y ]".
Switching to comma-separated lists works around this issue.
This patch updates all test files, fixes one false positive that this
change revealed (test 442, line 337) and two occurrences of a wrong
match (test 462, lines 121, 149).
Bug:
21189305
Change-Id: I3b22503be3d92529dac0b13f66bccbcfabea6721
Nicolas Geoffray [Fri, 15 May 2015 15:32:39 +0000 (15:32 +0000)]
am
99df2b15: Merge "Opt compiler: Speedup div/rem by constants on arm32 and arm64."
* commit '
99df2b150039fa2a3e1132a8cd5e35201ae97aee':
Opt compiler: Speedup div/rem by constants on arm32 and arm64.
Elliott Hughes [Fri, 15 May 2015 15:25:58 +0000 (08:25 -0700)]
Stop wrapping close(2) with TEMP_FAILURE_RETRY in art.
Note that all the TEMP_FAILURE_RETRY([A-Z] calls in this file are
wrong. The member functions return -errno, so only an EPERM failure
will return -1 (but errno should be EPERM, so you won't loop).
Bug: http://b/
20501816
Change-Id: Ibde6a2c7bf92469d008d6d510f9391669ae37a84
Nicolas Geoffray [Fri, 15 May 2015 15:24:00 +0000 (15:24 +0000)]
Merge "Opt compiler: Speedup div/rem by constants on arm32 and arm64."
Zheng Xu [Fri, 15 May 2015 08:08:45 +0000 (16:08 +0800)]
Opt compiler: Speedup div/rem by constants on arm32 and arm64.
This patch also includes:
1. Add java test for div/rem negative constants.
2. Fix a thumb2 encoding issue where the last operand is
"reg, shift #amount" in some instructions.
3. Support a simple filter in arm32 assembler test to filter out
unsupported cases, such as "smull r0, r0, r1, r2".
4. Add smull arm32 assembler test.
5. Add smull/umull thumb2 test.
6. Add test for the thumb2 encoding issue which is fixed in this
patch.
Change-Id: I1601bc9c38f70f11909f2816fe3ec105a158951e
David Brazdil [Fri, 15 May 2015 14:29:53 +0000 (14:29 +0000)]
am
06675720: Merge "ART: Fix a minor lint error"
* commit '
06675720cc274eb9d91a4ecd3fb1eef94a2d88f0':
ART: Fix a minor lint error
David Brazdil [Fri, 15 May 2015 14:21:26 +0000 (14:21 +0000)]
Merge "ART: Fix a minor lint error"
David Brazdil [Fri, 15 May 2015 14:15:09 +0000 (15:15 +0100)]
ART: Fix a minor lint error
Change-Id: I956656fa4c36f20d80ef885c03487970f707be8e
David Brazdil [Fri, 15 May 2015 14:07:16 +0000 (14:07 +0000)]
am
590d5767: Merge "ART: Change Checker syntax for variables"
* commit '
590d5767104757399c956400df9c5edc3a2c379e':
ART: Change Checker syntax for variables
David Brazdil [Fri, 15 May 2015 13:59:20 +0000 (13:59 +0000)]
Merge "ART: Change Checker syntax for variables"
David Brazdil [Fri, 15 May 2015 13:24:31 +0000 (14:24 +0100)]
ART: Change Checker syntax for variables
This patch changes the syntax for defining and referencing variables
from square brackets '[[VAR]]' to angle brackets '<<VAR>>'. This is
done in order to avoid clashes when matching against lists enclosed
in square brackets.
Change-Id: Ib9560b07bdc7bd641fd1eb6143c0063e0783f1eb
David Brazdil [Fri, 15 May 2015 13:32:41 +0000 (13:32 +0000)]
am
1cad536d: Merge "ART: Refactor GraphVisualizer attribute printing"
* commit '
1cad536d675846ac9c110b5b3a412dfc55ace3ed':
ART: Refactor GraphVisualizer attribute printing
David Brazdil [Fri, 15 May 2015 13:21:51 +0000 (13:21 +0000)]
Merge "ART: Refactor GraphVisualizer attribute printing"
David Brazdil [Wed, 13 May 2015 16:50:09 +0000 (17:50 +0100)]
ART: Refactor GraphVisualizer attribute printing
This patch unifies the way GraphVisualizer prints instruction
attributes in preparation of changes to the Checker syntax.
Change-Id: I44e91e36c660985ddfe039a9f410fedc48b496ec
Calin Juravle [Fri, 15 May 2015 11:39:45 +0000 (11:39 +0000)]
am
38b06de7: Merge "Fix minor checker bug"
* commit '
38b06de7de49400d83bfe3221649a0e1a1a96dec':
Fix minor checker bug
Calin Juravle [Fri, 15 May 2015 11:28:21 +0000 (11:28 +0000)]
Merge "Fix minor checker bug"
Jeff Hao [Fri, 15 May 2015 01:11:30 +0000 (01:11 +0000)]
am
ef4366a1: Merge "In hprof, use an address within string for char array of empty string."
* commit '
ef4366a159ecdd357c98e577583bbe224d065128':
In hprof, use an address within string for char array of empty string.
Jeff Hao [Fri, 15 May 2015 01:02:56 +0000 (01:02 +0000)]
Merge "In hprof, use an address within string for char array of empty string."
Kenny Root [Fri, 15 May 2015 01:00:36 +0000 (01:00 +0000)]
am
96144558: Merge changes I2ea008b7,Ibd7a643d
* commit '
961445587ade0ba26f9bbd4d66853e75d446c057':
Add new style String operations during compilation init
Fix non-range String init calls
Jeff Hao [Fri, 15 May 2015 00:19:15 +0000 (17:19 -0700)]
In hprof, use an address within string for char array of empty string.
Bug:
21089461
(cherry picked from commit I203345caf74fba2e9bf0549256147d84d1bb829e)
Change-Id: I38d1bc0d303558ab535ec4c3aa17a046fcb055a1
Kenny Root [Fri, 15 May 2015 00:48:10 +0000 (00:48 +0000)]
Merge changes I2ea008b7,Ibd7a643d
* changes:
Add new style String operations during compilation init
Fix non-range String init calls
Kenny Root [Thu, 14 May 2015 22:58:17 +0000 (15:58 -0700)]
Add new style String operations during compilation init
This allows some class initializers that deal with Strings to run during
compilation. This includes the current implementation of
java.security.Security because it reads the "java.security" resource.
(cherry picked from commit
a298e6daf8a11a780f061f2177ac3e75b8dd5e55)
Bug:
21036900
Change-Id: I2ea008b774d4ed359e155318e0d06c1566186c34
Kenny Root [Thu, 14 May 2015 23:48:22 +0000 (16:48 -0700)]
Fix non-range String init calls
When the String constructor was called via invoke-direct, it is changed
to the new StringFactory which is static. That means that the args need
to be shifted by one to deal with the change from non-static to static.
However, the non-range version of the invoke-direct was not shifted
correctly causing unstarted runtime initialization to get the wrong
first_dest_reg argument.
(cherry picked from commit
788a0a157cb138c33882511ff09afacde99443b7)
Bug:
21036900
Change-Id: Ibd7a643d877514ea396d7e4ab0dea327207cb78f
Jeff Hao [Thu, 14 May 2015 23:16:46 +0000 (23:16 +0000)]
am
7fdbcb8a: Merge "In hprof, set string class instance size to that of an empty string."
* commit '
7fdbcb8ad3f9afd56c072236a3dfbbce254c61ca':
In hprof, set string class instance size to that of an empty string.
Jeff Hao [Thu, 14 May 2015 23:09:02 +0000 (23:09 +0000)]
Merge "In hprof, set string class instance size to that of an empty string."
Hiroshi Yamauchi [Thu, 14 May 2015 22:09:34 +0000 (22:09 +0000)]
am
934aac71: Merge "Remove doublequoted command to adb sh -c."
* commit '
934aac71d27585f3fa8bbb41a29396c84fc88d94':
Remove doublequoted command to adb sh -c.
Hiroshi Yamauchi [Thu, 14 May 2015 21:55:43 +0000 (21:55 +0000)]
Merge "Remove doublequoted command to adb sh -c."
Jeff Hao [Wed, 13 May 2015 01:58:32 +0000 (18:58 -0700)]
In hprof, set string class instance size to that of an empty string.
Bug:
21066704
(cherry-picked from commit
c99b900283296663a37bffe06ae5ca6453748e16)
Change-Id: I91fc397f8ea6bdec654eae51b82528ba5843532c
Hiroshi Yamauchi [Thu, 14 May 2015 20:42:06 +0000 (13:42 -0700)]
Remove doublequoted command to adb sh -c.
Change-Id: I0e0fceedf927df25b8d6b0cf235f43f928cb3534
Hiroshi Yamauchi [Thu, 14 May 2015 19:00:14 +0000 (19:00 +0000)]
am
ca7db4af: Merge "Print field info on mark sweep invalid ref crash."
* commit '
ca7db4af96cd834bfe322fb14c1476186f1278e5':
Print field info on mark sweep invalid ref crash.
Vladimir Marko [Thu, 14 May 2015 19:00:10 +0000 (19:00 +0000)]
am
d9a27b6a: Merge "Quick: Fix marking high words in DCE."
* commit '
d9a27b6a6533366da074eb7ab82278032ea209a1':
Quick: Fix marking high words in DCE.
Hiroshi Yamauchi [Thu, 14 May 2015 18:54:48 +0000 (18:54 +0000)]
Merge "Print field info on mark sweep invalid ref crash."
Vladimir Marko [Thu, 14 May 2015 18:48:24 +0000 (18:48 +0000)]
Merge "Quick: Fix marking high words in DCE."
Hiroshi Yamauchi [Thu, 14 May 2015 04:14:22 +0000 (21:14 -0700)]
Print field info on mark sweep invalid ref crash.
Bug:
20557050
Change-Id: I3abb7a44e3b7ed3256653824fd1705aac5f7d72c
Vladimir Marko [Thu, 14 May 2015 10:47:39 +0000 (11:47 +0100)]
Quick: Fix marking high words in DCE.
This CL properly fixes the high word marking and reverts
https://android-review.googlesource.com/150352
which was just covering up the underlying issue. A unit test
for the encountered issue is provided, though it does not
expose the deficiency in the cover-up CL.
Bug:
20640451
Change-Id: Ia19a1134610e271ebbab5679ac0bd0cb0223d462
Calin Juravle [Thu, 14 May 2015 16:30:21 +0000 (17:30 +0100)]
Fix minor checker bug
Change-Id: I8fd4cf4ae61c1175cba834479dd69cbde326a08a
Nicolas Geoffray [Thu, 14 May 2015 14:15:41 +0000 (14:15 +0000)]
am
1484dad6: Merge "Revert "Revert "Remove junit from our core image."""
* commit '
1484dad68c99c782bdbcaf38e4e364a4995d820d':
Revert "Revert "Remove junit from our core image.""
Nicolas Geoffray [Thu, 14 May 2015 14:15:40 +0000 (14:15 +0000)]
am
df09893c: Merge "Revert "Revert "Do not pass junit.jar to vogar."""
* commit '
df09893c159f9314b832ddc1a6f0dfd374ef8a84':
Revert "Revert "Do not pass junit.jar to vogar.""
Nicolas Geoffray [Thu, 14 May 2015 14:06:15 +0000 (14:06 +0000)]
Merge "Revert "Revert "Remove junit from our core image."""
Nicolas Geoffray [Thu, 14 May 2015 14:05:34 +0000 (14:05 +0000)]
Revert "Revert "Remove junit from our core image.""
This reverts commit
7028d59fa70c7c8482975c4f9b42308c6959483b.
Change-Id: Ia005921af58595999b5b76001fbd16dfb484ab35
Nicolas Geoffray [Thu, 14 May 2015 14:05:10 +0000 (14:05 +0000)]
Merge "Revert "Revert "Do not pass junit.jar to vogar."""
Nicolas Geoffray [Thu, 14 May 2015 14:03:51 +0000 (14:03 +0000)]
Revert "Revert "Do not pass junit.jar to vogar.""
This reverts commit
5bf24f3d8633efda0b20126be411c2cfa4e75097.
Change-Id: I5512c57e7b725991468e9d08d8110df5809dc854
Vladimir Marko [Thu, 14 May 2015 13:41:13 +0000 (13:41 +0000)]
am
c8c6aa96: Merge "ART: Do not relocate app program headers in patchoat."
* commit '
c8c6aa96bb9d484903391baa1a95bce86c057ae3':
ART: Do not relocate app program headers in patchoat.
Vladimir Marko [Thu, 14 May 2015 13:31:52 +0000 (13:31 +0000)]
Merge "ART: Do not relocate app program headers in patchoat."
Roland Levillain [Thu, 14 May 2015 12:50:45 +0000 (12:50 +0000)]
am
2a6c5ee4: Merge "[optimizing] Fold HTypeConversion of constants"
* commit '
2a6c5ee47da3807066454ab3cd1417b44cc9d037':
[optimizing] Fold HTypeConversion of constants
Roland Levillain [Thu, 14 May 2015 12:42:43 +0000 (12:42 +0000)]
Merge "[optimizing] Fold HTypeConversion of constants"
Vladimir Marko [Wed, 13 May 2015 18:06:30 +0000 (19:06 +0100)]
ART: Do not relocate app program headers in patchoat.
Change the check whether to relocate program headers in
patchoat to simply look whether there is a PT_LOAD section
with p_vaddr == 0. If there is, don't relocate the headers,
it should be an app. Otherwise, it's a boot image and needs
to be relocated.
Add overflow checking to ElfFileImpl<>::GetLoadedSize().
Bug:
21047854
Change-Id: Ie6737f338687296b6dbf4bb3b36358501dfb1587
Nicolas Geoffray [Thu, 14 May 2015 06:30:31 +0000 (06:30 +0000)]
am
bf27b07a: Merge "Revert "Do not pass junit.jar to vogar.""
* commit '
bf27b07a50c39e95748f90607570903bef6c0f30':
Revert "Do not pass junit.jar to vogar."
Nicolas Geoffray [Thu, 14 May 2015 06:18:39 +0000 (06:18 +0000)]
Merge "Revert "Do not pass junit.jar to vogar.""
Nicolas Geoffray [Thu, 14 May 2015 06:18:25 +0000 (06:18 +0000)]
Revert "Do not pass junit.jar to vogar."
Will re-land after fiing vogar.
This reverts commit
3185c8da1dc2c2497168817c083b3c9587ba0883.
Change-Id: I6f5ed14aa3f7deb768195c0797125a34c6255d85
Andreas Gampe [Thu, 14 May 2015 01:18:48 +0000 (01:18 +0000)]
am
96ca18cd: Merge "ART: Fix unused return-value in test"
* commit '
96ca18cd105e4c4cddce53a40c0e41886155bf01':
ART: Fix unused return-value in test
Andreas Gampe [Thu, 14 May 2015 01:10:32 +0000 (01:10 +0000)]
Merge "ART: Fix unused return-value in test"
Chih-Hung Hsieh [Thu, 14 May 2015 00:36:47 +0000 (00:36 +0000)]
am
a58ee001: Merge "Undo arm64 workaround."
* commit '
a58ee00148ba1d1f592c0d7127883de4c8fb25f2':
Undo arm64 workaround.
Andreas Gampe [Thu, 14 May 2015 00:00:41 +0000 (17:00 -0700)]
ART: Fix unused return-value in test
Check the return value of system() call.
Change-Id: I1f5f9621f6a39029b9df5b0d4ab0e230ba6c79a3
Chih-Hung Hsieh [Thu, 14 May 2015 00:22:02 +0000 (00:22 +0000)]
Merge "Undo arm64 workaround."
Nicolas Geoffray [Wed, 13 May 2015 22:12:45 +0000 (22:12 +0000)]
am
c9c42321: Merge "Revert "Remove junit from our core image.""
* commit '
c9c4232118a7aa517f33d3e26ca80f2e443f1e71':
Revert "Remove junit from our core image."
Nicolas Geoffray [Wed, 13 May 2015 22:05:52 +0000 (22:05 +0000)]
Merge "Revert "Remove junit from our core image.""
Nicolas Geoffray [Wed, 13 May 2015 22:05:40 +0000 (22:05 +0000)]
Revert "Remove junit from our core image."
To put us back green. Will re-land when vogar is cleaned up.
This reverts commit
0ad65a3c794b18101def5096d8ed151382c9d5aa.
Change-Id: I24a58bd87f133132d7774104eb8f77d6bbd6292b
Nicolas Geoffray [Wed, 13 May 2015 21:51:29 +0000 (21:51 +0000)]
am
0ad07e46: Merge "Revert "New failure due to a junit/vogar difference.""
* commit '
0ad07e46ab061dc26f1d9ab03ea6305f7084a3f9':
Revert "New failure due to a junit/vogar difference."
Nicolas Geoffray [Wed, 13 May 2015 21:38:15 +0000 (21:38 +0000)]
Merge "Revert "New failure due to a junit/vogar difference.""
Nicolas Geoffray [Wed, 13 May 2015 21:37:44 +0000 (21:37 +0000)]
Revert "New failure due to a junit/vogar difference."
This reverts commit
203a5555957f4c56c4a5cc7ffcb99600c8ab557e.
Change-Id: I51c3aa7275ab43b4adaf8728245612b8416c8284
Mathieu Chartier [Wed, 13 May 2015 21:31:40 +0000 (21:31 +0000)]
am
e977494d: Merge "Also print class for NoSuchFieldException"
* commit '
e977494d25f0362170a327b890306dd7503fd563':
Also print class for NoSuchFieldException
Nicolas Geoffray [Wed, 13 May 2015 21:31:36 +0000 (21:31 +0000)]
am
4a0aa9c7: Merge "New failure due to a junit/vogar difference."
* commit '
4a0aa9c7928dcb1895ce6e5e6c1dacd9bd461dd2':
New failure due to a junit/vogar difference.
Mathieu Chartier [Wed, 13 May 2015 21:27:01 +0000 (21:27 +0000)]
Merge "Also print class for NoSuchFieldException"
Nicolas Geoffray [Wed, 13 May 2015 21:20:03 +0000 (21:20 +0000)]
Merge "New failure due to a junit/vogar difference."
Nicolas Geoffray [Wed, 13 May 2015 21:18:12 +0000 (22:18 +0100)]
New failure due to a junit/vogar difference.
Change-Id: I2148c56dd67406d719778ac41b6691fbad2614d3
Mathieu Chartier [Wed, 13 May 2015 20:13:24 +0000 (13:13 -0700)]
Also print class for NoSuchFieldException
Example message:
Caused by: java.lang.NoSuchFieldException: No field value in class Ljava/lang/String;
Added test.
(cherry picked from commit
3beb245da9392818e3154d47593f82cf0ef69aac)
Bug:
20881251
Bug:
21027454
Change-Id: I4043cbf26c3077952b6c151da0d0edd980da26b1
Mark Mendell [Wed, 6 May 2015 14:55:34 +0000 (10:55 -0400)]
[optimizing] Fold HTypeConversion of constants
While looking into optimizing long shifts on x86, I found that the
compiler wasn't folding HTypeConversion of constants. Add simple
conversions of constants, taking care of float/double values
with NaNs and small/large values, ensuring Java conversion semantics.
Add checker cases to see that constant folding of HTypeConversion is
done.
Ensure 422-type-conversion type conversion routiness don't get
inlined to avoid compile time folding.
Change-Id: I5a4eb376b64bc4e41bf908af5875bed312efb228
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Wed, 13 May 2015 17:00:46 +0000 (17:00 +0000)]
am
c3912c8a: Merge "Remove junit from our core image."
* commit '
c3912c8a2db109a15603554fd456f56cd0a69ad0':
Remove junit from our core image.
Elliott Hughes [Wed, 13 May 2015 17:00:44 +0000 (17:00 +0000)]
am
baaf2879: Merge "Silence unused result warnings in art."
* commit '
baaf28796dda318bd9c88bd0c1140a7ece3149d6':
Silence unused result warnings in art.
Nicolas Geoffray [Wed, 13 May 2015 16:49:46 +0000 (16:49 +0000)]
Merge "Remove junit from our core image."
Elliott Hughes [Wed, 13 May 2015 16:27:07 +0000 (16:27 +0000)]
Merge "Silence unused result warnings in art."
Nicolas Geoffray [Wed, 13 May 2015 14:02:55 +0000 (15:02 +0100)]
Remove junit from our core image.
It's not used, and when we run art with vogar, we get
incompatibilities. For example vogar's TestSuite class
is very different than junit's TestSuite.
Change-Id: I45c78d86c09c28b6136a6e50f6a08a746103794a
Nicolas Geoffray [Wed, 13 May 2015 10:23:40 +0000 (10:23 +0000)]
am
7bd8f9e0: Merge "Do not pass junit.jar to vogar."
* commit '
7bd8f9e0261f141fc64cf5a37e1e6f220eb4df8a':
Do not pass junit.jar to vogar.
Nicolas Geoffray [Wed, 13 May 2015 10:16:44 +0000 (10:16 +0000)]
Merge "Do not pass junit.jar to vogar."
Nicolas Geoffray [Wed, 13 May 2015 10:03:19 +0000 (11:03 +0100)]
Do not pass junit.jar to vogar.
Not needed after https://android-review.googlesource.com/#/c/150563.
Also dex2oat now complains about duplicated classes, and fallbacks
to the interpreter if it sees any. Since vogar has its own junit,
dex2oat was complaining.
Change-Id: I579feb0b1a049af3fba664fd2d86c67c66c8eae1
Sebastien Hertz [Wed, 8 Apr 2015 07:36:07 +0000 (09:36 +0200)]
JDWP: more GC safety
Ensures GC safety when keeping references that may be moved by GC:
- SingleStepControl: stores ArtMethod* in a GcRoot
- ModBasket: stores references in a StackHandleScope
Bug:
18166750
Change-Id: If2b6f9ecff4cf469b50487fd863319fdfa9b9f37
Elliott Hughes [Wed, 13 May 2015 04:25:36 +0000 (21:25 -0700)]
Silence unused result warnings in art.
This lets us turn on _FORTIFY_SOURCE=2 for the host.
The logging change is basically a trick (since we're still ignoring the
result unless it's an EINTR failure).
The profiler change is in a function whose error checking is a mess; the
fd is leaked, and it's not clear what's supposed to happen about the flock
on failure. I didn't exit if the ftruncate fails because the rest of the
function just blunders on, and error handling here needs a deeper rethink.
Bug: http://b/
20558757
Change-Id: I7a2873fce08e37f4af826a04b4701d7ac6a8e3fa
Chih-Hung Hsieh [Tue, 12 May 2015 19:06:57 +0000 (12:06 -0700)]
Undo arm64 workaround.
Now we have new llvm to compile art for arm64 without -fno-vectorize.
BUG:
21080674
Change-Id: Id1b3a88ab9d4cf78b7f0dfd8cb435ed6e7ab7cb2
Mathieu Chartier [Tue, 12 May 2015 22:29:25 +0000 (22:29 +0000)]
am
70d3d143: Merge "Hold heap bitmap lock in Heap::GetObjectsAllocated"
* commit '
70d3d1433ee3d33dfdc9f687c94383d527871455':
Hold heap bitmap lock in Heap::GetObjectsAllocated
Mathieu Chartier [Tue, 12 May 2015 22:17:47 +0000 (22:17 +0000)]
Merge "Hold heap bitmap lock in Heap::GetObjectsAllocated"
Mathieu Chartier [Tue, 12 May 2015 17:47:11 +0000 (10:47 -0700)]
Hold heap bitmap lock in Heap::GetObjectsAllocated
Fixes a race condition where add and remove space could cause a crash
when we iterated over the spaces.
TODO: Add a spaces lock or something to guard against this.
(cherry picked from commit
a395c0a492079d86b312c9edc796d63001576954)
Bug:
21031927
Change-Id: I7f0d558316f8e9d9f22ffd182e8666355bf50d47