OSDN Git Service
Mathieu Chartier [Thu, 4 Sep 2014 02:35:34 +0000 (02:35 +0000)]
am
c4978258: Merge "Add exception check to AllocateInternalWithGc" into lmp-dev
* commit '
c4978258172beb35c3c8f0c31a5f7eb06b9a1de2':
Add exception check to AllocateInternalWithGc
Mathieu Chartier [Thu, 4 Sep 2014 02:29:14 +0000 (02:29 +0000)]
Merge "Add exception check to AllocateInternalWithGc" into lmp-dev
Jeff Hao [Wed, 3 Sep 2014 23:27:41 +0000 (23:27 +0000)]
am
6b28a456: Fix stack overflow and duplicate methods while tracing.
* commit '
6b28a456b075fe53dfb7e924a44dbf35d0d41eb3':
Fix stack overflow and duplicate methods while tracing.
Jeff Hao [Wed, 3 Sep 2014 20:48:16 +0000 (13:48 -0700)]
Fix stack overflow and duplicate methods while tracing.
Bug:
16386215
Change-Id: I0d0ae0113a3a00013ce84a1f5a110e2c52f19b86
Mathieu Chartier [Wed, 3 Sep 2014 18:21:08 +0000 (11:21 -0700)]
Add exception check to AllocateInternalWithGc
Trying to figure out if the pending exception comes before or during
AllocateInternalWithGc.
Bug:
17164348
Change-Id: Id46d82bfc0f84d16e5ffdafe41658aee4cc2c702
Junmo Park [Wed, 3 Sep 2014 16:18:47 +0000 (16:18 +0000)]
am
ff4cfe07: Fix SetupResourceMasks to pass correct parameters
* commit '
ff4cfe07009ac0b0f07475ef2aa91d9aaf9ab291':
Fix SetupResourceMasks to pass correct parameters
Junmo Park [Sat, 30 Aug 2014 11:13:02 +0000 (20:13 +0900)]
Fix SetupResourceMasks to pass correct parameters
Calling SetupTargetResourceMasks function with correct parameter.
SetupTargetResourceMasks(lir, flags, use_mask, def_mask) is correct order.
b/
17369806
(cherry-picked from commit sha
2a09504334a3a3b4c47100197df0827cc6740433)
Change-Id: I49118c3f2d3d06fac83fa3d5014b7fdaff6a2b00
buzbee [Wed, 3 Sep 2014 13:02:13 +0000 (13:02 +0000)]
am
f72fd02c: Merge "Quick compiler: disable GVN DO NOT MERGE" into lmp-dev
* commit '
f72fd02c4ea0f1aa610b8a4f9f51ef86c285b1cf':
Quick compiler: disable GVN DO NOT MERGE
buzbee [Wed, 3 Sep 2014 12:50:49 +0000 (12:50 +0000)]
Merge "Quick compiler: disable GVN DO NOT MERGE" into lmp-dev
buzbee [Wed, 3 Sep 2014 01:36:37 +0000 (18:36 -0700)]
Quick compiler: disable GVN DO NOT MERGE
Disable global value numbering optimization for lmp (but
keep on for master).
b/
16398693
Change-Id: I125c588c987a81db54a15da1eec9dee2b009956f
Mathieu Chartier [Wed, 3 Sep 2014 01:08:48 +0000 (01:08 +0000)]
am
c60bdf66: Fix native allocation test.
* commit '
c60bdf667b5c6fa767548942f0115547523593b4':
Fix native allocation test.
Andreas Gampe [Wed, 3 Sep 2014 00:54:33 +0000 (00:54 +0000)]
am
4d05d931: Merge "ART: Fix read-out-of-bounds in the compiler" into lmp-dev
* commit '
4d05d931d3d608f5047e0d9dfb422df018ace716':
ART: Fix read-out-of-bounds in the compiler
Mathieu Chartier [Wed, 3 Sep 2014 00:54:32 +0000 (00:54 +0000)]
am
635531a2: Merge "Change native allocations to use growth limit." into lmp-dev
* commit '
635531a2d99f413339187ce39b08affdf1b31d9f':
Change native allocations to use growth limit.
Ian Rogers [Wed, 3 Sep 2014 00:54:32 +0000 (00:54 +0000)]
am
37bb8184: Merge "Pre-allocate the NoClassDefFoundError to be thrown for boot classes." into lmp-dev
* commit '
37bb8184e091e8d9199cfc2fc888dfb40a5c0f20':
Pre-allocate the NoClassDefFoundError to be thrown for boot classes.
Ian Rogers [Wed, 3 Sep 2014 00:54:31 +0000 (00:54 +0000)]
am
9db18e16: Merge "Reduce and speed-up class def searches." into lmp-dev
* commit '
9db18e1679800bc57c1e30f7c5ff786949ffe5cf':
Reduce and speed-up class def searches.
Andreas Gampe [Wed, 3 Sep 2014 00:54:30 +0000 (00:54 +0000)]
am
e610faf9: Merge "ART: Tighten verifier list reading and offsets" into lmp-dev
* commit '
e610faf917fd280fa0d9e02d5c2d0dbacbb037b7':
ART: Tighten verifier list reading and offsets
Mathieu Chartier [Wed, 3 Sep 2014 00:36:08 +0000 (17:36 -0700)]
Fix native allocation test.
Forgot to update with last CL.
Change-Id: Id2f57870b8d4f848cd93012d9da69beee5184be4
Andreas Gampe [Wed, 3 Sep 2014 00:24:14 +0000 (00:24 +0000)]
Merge "ART: Fix read-out-of-bounds in the compiler" into lmp-dev
Mathieu Chartier [Wed, 3 Sep 2014 00:07:28 +0000 (00:07 +0000)]
Merge "Change native allocations to use growth limit." into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 23:21:01 +0000 (16:21 -0700)]
Change native allocations to use growth limit.
Previously native allocation tracking used a GC footprint limit
which would cause GC in the allocating thread. This prevented
excessive growth of the heap but could cause jank due to GC in
the allocating thread. The new behavior is using the growth_limit
instead of the native footprint limit.
Bug:
17006948
Change-Id: I40f30af09bb25596a9f57fa50e2a155fb947b5fe
Ian Rogers [Tue, 2 Sep 2014 23:56:37 +0000 (23:56 +0000)]
Merge "Pre-allocate the NoClassDefFoundError to be thrown for boot classes." into lmp-dev
Ian Rogers [Tue, 2 Sep 2014 23:56:14 +0000 (23:56 +0000)]
Merge "Reduce and speed-up class def searches." into lmp-dev
Andreas Gampe [Tue, 2 Sep 2014 23:51:42 +0000 (23:51 +0000)]
Merge "ART: Tighten verifier list reading and offsets" into lmp-dev
Ian Rogers [Wed, 4 Jun 2014 23:57:15 +0000 (16:57 -0700)]
Pre-allocate the NoClassDefFoundError to be thrown for boot classes.
Bring over a Dalvik "optimization".
Bug:
12804658
Bug:
16853450
Change-Id: I6419de7bd2ba18d91479cb52489104954f5c4524
(cherry picked from commit
63557459a4098294a9ff44d035241de2966047c0)
Ian Rogers [Sat, 30 Aug 2014 03:19:11 +0000 (20:19 -0700)]
Reduce and speed-up class def searches.
Use the class linker for descriptor lookups from the compile driver so that
dex caches are populated.
Reduce the scope of functions for scanning class paths to just the class
linker where they are performed.
If we see more than a threshold number of find class def misses on a dex file
lazily compute an index, so that future lookups are constant time (part of the
collection code is taken from
https://android-review.googlesource.com/#/c/103865/3). Note that we take a lazy
approach so that we don't serialize on loading dex files, this avoids the
reason the index was removed in
8b2c0b9abc3f520495f4387ea040132ba85cae69.
Remove an implicit and unnecessary std::string creation for PrintableString.
Single threaded interpret-only dex2oat performance is improved by roughly 10%.
Bug:
16853450
Change-Id: Icf72df76b0a4328f2a24075e81f4ff267b9401f4
(cherry picked from commit
68b56858367e29461ae290fd797443a1ef6d8005)
Mathieu Chartier [Tue, 2 Sep 2014 21:54:07 +0000 (21:54 +0000)]
am
23590fd0: Merge "Change intern table to unordered set." into lmp-dev
* commit '
23590fd094df6a4a2360b722763249adf1689f15':
Change intern table to unordered set.
Mathieu Chartier [Tue, 2 Sep 2014 21:39:25 +0000 (21:39 +0000)]
Merge "Change intern table to unordered set." into lmp-dev
Mathieu Chartier [Tue, 2 Sep 2014 19:54:39 +0000 (19:54 +0000)]
am
8bd2961b: Change heap transitions + hspace compation to use VLOG(heap)
* commit '
8bd2961b385c870953e650c253a04ee24b76809b':
Change heap transitions + hspace compation to use VLOG(heap)
Mathieu Chartier [Tue, 2 Sep 2014 19:33:25 +0000 (12:33 -0700)]
Change heap transitions + hspace compation to use VLOG(heap)
VLOG(gc) is spammy since it is enabled.
Change-Id: I07d1d40e2f19134f885d6777b60533a9010ae164
Andreas Gampe [Tue, 2 Sep 2014 18:17:34 +0000 (11:17 -0700)]
ART: Tighten verifier list reading and offsets
Check offsets and sizes for header entries of a dex file.
Bug:
17347459
Change-Id: Ia1727c33dea51f7a8e345f3799f1ba414708239c
Andreas Gampe [Tue, 2 Sep 2014 17:41:57 +0000 (17:41 +0000)]
Andreas Gampe [Tue, 2 Sep 2014 17:22:20 +0000 (10:22 -0700)]
ART: Fix typo
Bug:
17327877
Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666
Andreas Gampe [Tue, 2 Sep 2014 16:31:44 +0000 (16:31 +0000)]
am
277a7c7b: ART: Fix dex file verifier type-list handling
* commit '
277a7c7b4bb9c421380592fd3998d2e79e4035b3':
ART: Fix dex file verifier type-list handling
Andreas Gampe [Fri, 29 Aug 2014 23:07:49 +0000 (16:07 -0700)]
ART: Fix dex file verifier type-list handling
It is rare, but valid, to have an empty type list.
Bug:
17327877
Change-Id: Ib3a8ff3e5ccd8fe7c04b1e97485bf3e6de72aa4d
Mathieu Chartier [Sat, 30 Aug 2014 01:16:58 +0000 (18:16 -0700)]
Change intern table to unordered set.
Intern table active used bytes goes from 430k to 317k on system
server. Similar %wise savings on other apps.
Bug:
16238192
Change-Id: I92de72de3eae0b76629e9da83db2c2d0fa613052
Mathieu Chartier [Sat, 30 Aug 2014 01:49:42 +0000 (01:49 +0000)]
am
20632daa: Merge "Add native memory accounting through custom allocator." into lmp-dev
* commit '
20632daac36995947d2d1943f89f07ac277e61f0':
Add native memory accounting through custom allocator.
Mathieu Chartier [Sat, 30 Aug 2014 01:17:19 +0000 (01:17 +0000)]
Merge "Add native memory accounting through custom allocator." into lmp-dev
Mathieu Chartier [Mon, 25 Aug 2014 20:08:22 +0000 (13:08 -0700)]
Add native memory accounting through custom allocator.
Added a custom allocator that lets you pass in a special tag which
specifices where the allocation came from. This is used when
dumping. The performance overhead is low since each allocation only
does a atomic add/sub for each allocation/free.
The measurements are dumped to traces.txt during SIGQUIT.
Example output:
I/art (27274): AllocatorTagHeap active=120 max=120 total=168
I/art (27274): AllocatorTagMonitorList active=1572 max=6240 total=11724
I/art (27274): AllocatorTagClassTable active=185208 max=185208 total=268608
I/art (27274): AllocatorTagInternTable active=430368 max=430368 total=436080
I/art (27274): AllocatorTagMaps active=5616 max=6168 total=34392
I/art (27274): AllocatorTagLOS active=1024 max=1536 total=2044
I/art (27274): AllocatorTagSafeMap active=0 max=51936 total=533688
I/art (27274): AllocatorTagLOSMaps active=144 max=1248 total=5760
I/art (27274): AllocatorTagReferenceTable active=10944 max=11840 total=19136
I/art (27274): AllocatorTagHeapBitmap active=32 max=40 total=56
I/art (27274): AllocatorTagHeapBitmapLOS active=8 max=8 total=8
I/art (27274): AllocatorTagVerifier active=0 max=18844 total=
1073156
I/art (27274): AllocatorTagModUnionCardSet active=5300 max=5920 total=56020
I/art (27274): AllocatorTagModUnionReferenceArray active=24864 max=24864 total=24864
I/art (27274): AllocatorTagJNILibrarires active=320 max=320 total=320
I/art (27274): AllocatorTagOatFile active=1400 max=1400 total=5852
Bug:
16238192
Change-Id: Ibb470ef2e9c9a24563bb46422d46a55799704d82
Dave Allison [Fri, 29 Aug 2014 18:31:09 +0000 (18:31 +0000)]
am
9bf1b088: Merge "Fix mips build for nested signal handler" into lmp-dev
* commit '
9bf1b088e4e12121037090dd9c92393fbe805cb6':
Fix mips build for nested signal handler
Dave Allison [Fri, 29 Aug 2014 18:18:53 +0000 (18:18 +0000)]
Merge "Fix mips build for nested signal handler" into lmp-dev
Alex Light [Fri, 29 Aug 2014 18:18:23 +0000 (18:18 +0000)]
am
496cd337: Fix segfault if running without image.
* commit '
496cd337c19ca8386fec24633160f82c01993bbd':
Fix segfault if running without image.
Dave Allison [Fri, 29 Aug 2014 18:05:17 +0000 (11:05 -0700)]
Fix mips build for nested signal handler
Bug:
17006816
Change-Id: If41c6d7a2f12f1822ca36d9e2f0f22b3ca854098
Alex Light [Fri, 29 Aug 2014 17:28:25 +0000 (10:28 -0700)]
Fix segfault if running without image.
Bug:
17325091
(cherry picked from commit
7adb7ac3913364de8cc57b8934024dd12e1d3bea)
Change-Id: I343099543ce0abf02219da84d61d9ce2dfc47980
buzbee [Fri, 29 Aug 2014 17:07:52 +0000 (17:07 +0000)]
am
2cc42e30: Merge "Quick compiler: Fix MIPS build" into lmp-dev
* commit '
2cc42e3029182ad6c6443376c1a4cbf9c1e6a784':
Quick compiler: Fix MIPS build
buzbee [Fri, 29 Aug 2014 16:59:46 +0000 (16:59 +0000)]
Merge "Quick compiler: Fix MIPS build" into lmp-dev
buzbee [Thu, 28 Aug 2014 20:48:56 +0000 (13:48 -0700)]
Quick compiler: Fix MIPS build
b/
16484538
In debug builds, the Quick compiler frequently runs a sanity checker
over the register pool. Among other things, it attempts to verify
consistent representation of register pairs. However, a register's
"wide" flag is meaningful only when the register pair is associated
with a Dalvik wide value (sreg != INVALID_SREG) rather than a temp
wide value.
The MIPS build was tripping over this bad assertion. Fixed here.
Note related cl/105461
(cherry-picked from commit sha
3a658077af2a931e5d7f6cd22b777c57112c19df)
Change-Id: Id726ff1ea0f5cbcc8dba6fa3aacb3fd4fc043a63
Sebastien Hertz [Fri, 29 Aug 2014 12:27:00 +0000 (12:27 +0000)]
am
8ac3356d: Avoid null pointer dereference when sending JDWP packets
* commit '
8ac3356db74f5e38c70406cc5f5e65a49ff41fd7':
Avoid null pointer dereference when sending JDWP packets
Sebastien Hertz [Thu, 28 Aug 2014 16:50:36 +0000 (18:50 +0200)]
Avoid null pointer dereference when sending JDWP packets
Bug:
16218394
(cherry picked from commit
60ed7da4d193e0f90b05c4236af77d3b276c0ea4)
Change-Id: I4882b3b6bb97facb8fca4c7ece65f4c7c96c57fe
Brian Carlstrom [Fri, 29 Aug 2014 05:46:55 +0000 (05:46 +0000)]
Brian Carlstrom [Fri, 29 Aug 2014 05:17:13 +0000 (22:17 -0700)]
Fix Mac build
Bug:
17000769,
16875245
(cherry picked from commit
debdda0262bfbcb966a89e693d933cc74eb412ac)
Change-Id: I158f090c89587f176813a15e9edad917bd134cd0
Alex Light [Fri, 29 Aug 2014 03:34:25 +0000 (03:34 +0000)]
am
6c050b5f: Fix incorect variable name.
* commit '
6c050b5f782b61a16083ae35c98931a2d51d0a33':
Fix incorect variable name.
Alex Light [Fri, 29 Aug 2014 03:34:19 +0000 (03:34 +0000)]
am
1f019816: Change /dalvik-cache to be owned by root.
* commit '
1f0198162044d015072cbb7824f4a6688d0300ee':
Change /dalvik-cache to be owned by root.
Alex Light [Thu, 28 Aug 2014 23:23:48 +0000 (16:23 -0700)]
Fix incorect variable name.
Bug:
16875245
(cherry picked from commit
1291e9bc87edc8fde56434bc66bef0c62d44a8e6)
Change-Id: Idd0f7ac677568a53569308a67f1ad613584949a5
Alex Light [Wed, 27 Aug 2014 22:37:23 +0000 (15:37 -0700)]
Change /dalvik-cache to be owned by root.
Also prune the dalvik-cache during startup if we need to generate or
relocate an image.
Bug:
17000769,
16875245
(cherry picked from commit
2539613be94f599c1713627f80c7398028d1a6aa)
Change-Id: I29a70215a2207bc4e0db02ab751d32a68edf4b66
Brian Carlstrom [Thu, 28 Aug 2014 22:48:35 +0000 (22:48 +0000)]
am
e6caf046: Merge "Fix issue with Thread.setName hanging after Thread.start" into lmp-dev
* commit '
e6caf04639aec134f7b668bf71cd6797a4759dd9':
Fix issue with Thread.setName hanging after Thread.start
Brian Carlstrom [Thu, 28 Aug 2014 22:23:09 +0000 (22:23 +0000)]
Merge "Fix issue with Thread.setName hanging after Thread.start" into lmp-dev
Brian Carlstrom [Thu, 28 Aug 2014 19:01:48 +0000 (19:01 +0000)]
am
7654123b: Merge "Ensure proxy constructor is in dex cache" into lmp-dev
* commit '
7654123b2fd7abeb40522dac791fa26a1364d030':
Ensure proxy constructor is in dex cache
Brian Carlstrom [Thu, 28 Aug 2014 18:54:15 +0000 (18:54 +0000)]
Merge "Ensure proxy constructor is in dex cache" into lmp-dev
Mathieu Chartier [Thu, 28 Aug 2014 18:48:33 +0000 (18:48 +0000)]
am
679c3ced: Merge "Prevent exception bugs in class linker" into lmp-dev
* commit '
679c3cedaf1550113104f5113b23f0fdec6175c0':
Prevent exception bugs in class linker
Mathieu Chartier [Thu, 28 Aug 2014 18:37:29 +0000 (18:37 +0000)]
Merge "Prevent exception bugs in class linker" into lmp-dev
Sebastien Hertz [Wed, 27 Aug 2014 13:32:56 +0000 (15:32 +0200)]
Ensure proxy constructor is in dex cache
Bug:
17262039
(cherry picked from commit
ae94e350f100207359b8345d8d21e78e7cfb44c4)
Change-Id: I1cfc8dac1f63b9012fa098804135be8847b1daee
Brian Carlstrom [Thu, 28 Aug 2014 06:43:46 +0000 (23:43 -0700)]
Fix issue with Thread.setName hanging after Thread.start
When suspending a thread by peer the invariant that only attached threads are
suspended must be maintained. Add a ThreadList::Contains check which requires
making this method non-static.
Add some extra thread logging.
Bug:
17302037
Change-Id: I89af9840e398c2ceadeb736c431dfe3be8f3ba06
Mathieu Chartier [Wed, 27 Aug 2014 22:28:28 +0000 (15:28 -0700)]
Prevent exception bugs in class linker
There were some places that could throw exceptions but still succeed.
This caused the allocation entrypoints to occasionally allocate a
heap object with a pending exception.
Also added some additional AssertNoExceptionPending.
Bug:
17164348
Change-Id: Ic6dd3b0cce9955349176503dd7f6c3da7ab0a6f1
Elliott Hughes [Thu, 28 Aug 2014 17:00:01 +0000 (17:00 +0000)]
am
5b41c2a8: Merge "Actually ask the pthread implementation for the stack guard size." into lmp-dev
* commit '
5b41c2a8f8e4a745b18685413b51c883cd993403':
Actually ask the pthread implementation for the stack guard size.
Ian Rogers [Thu, 28 Aug 2014 17:00:00 +0000 (17:00 +0000)]
am
d1e4e735: Merge "Revert "Avoid using NanoTime for compiler and verifier"" into lmp-dev
* commit '
d1e4e735cdf98e2ece7fa9a5dfeaad98d0c37cd1':
Revert "Avoid using NanoTime for compiler and verifier"
Elliott Hughes [Thu, 28 Aug 2014 16:50:40 +0000 (16:50 +0000)]
Merge "Actually ask the pthread implementation for the stack guard size." into lmp-dev
Ian Rogers [Thu, 28 Aug 2014 16:50:38 +0000 (16:50 +0000)]
Merge "Revert "Avoid using NanoTime for compiler and verifier"" into lmp-dev
Brian Carlstrom [Wed, 27 Aug 2014 23:47:50 +0000 (23:47 +0000)]
am
cd7a048c: Merge "Support booting without functioning boot.oat/art patchoat." into lmp-dev
* commit '
cd7a048cfac23e6ec3e1ba3ab4c1dddb322eaadf':
Support booting without functioning boot.oat/art patchoat.
Brian Carlstrom [Wed, 27 Aug 2014 23:40:53 +0000 (23:40 +0000)]
Merge "Support booting without functioning boot.oat/art patchoat." into lmp-dev
Elliott Hughes [Wed, 27 Aug 2014 18:47:01 +0000 (11:47 -0700)]
Actually ask the pthread implementation for the stack guard size.
Bug:
17111575
Change-Id: I23919b1e8aeff627a65daf57f1109bec60b196cc
Mathieu Chartier [Wed, 27 Aug 2014 21:52:49 +0000 (21:52 +0000)]
am
074c8c6a: Merge "Avoid using NanoTime for compiler and verifier" into lmp-dev
* commit '
074c8c6aac3bd42a173befd1a4eafd479ef12dc9':
Avoid using NanoTime for compiler and verifier
Ian Rogers [Wed, 27 Aug 2014 21:46:57 +0000 (21:46 +0000)]
Revert "Avoid using NanoTime for compiler and verifier"
This reverts commit
c89e6edbdce97c7d199b54bf63aed7ea01ebf1ff.
Change-Id: Id3b89121a19e64bf3c457c39b375f3d3c0fcc579
Mathieu Chartier [Wed, 27 Aug 2014 21:46:42 +0000 (21:46 +0000)]
Merge "Avoid using NanoTime for compiler and verifier" into lmp-dev
Mathieu Chartier [Wed, 27 Aug 2014 21:10:58 +0000 (14:10 -0700)]
Avoid using NanoTime for compiler and verifier
Target timings before with -j2 --compiler-filter=interpret-only:
Approximate speedup 3%.
Before:
real 0m36.852s
real 0m36.050s
real 0m36.246s
After:
real 0m35.667s
real 0m35.779s
real 0m35.458s
Bug:
16853450
Change-Id: Id996172d8283639fe293ddfc26d01fc1a0beed0b
Andreas Gampe [Wed, 27 Aug 2014 21:24:42 +0000 (14:24 -0700)]
ART: Fix read-out-of-bounds in the compiler
In case of a wide dalvik register, asking for the constant value
can lead to a read out of bounds.
Bug:
17302671
Change-Id: Ie1849cd67cc418c97cbd7a8524f027f9b66e4c96
Dave Allison [Wed, 27 Aug 2014 19:54:05 +0000 (19:54 +0000)]
am
52fb2a63: Merge "Handle nested signals" into lmp-dev
* commit '
52fb2a636a082cf5dc4c669a4b34085135709645':
Handle nested signals
Alex Light [Sat, 23 Aug 2014 00:49:35 +0000 (17:49 -0700)]
Support booting without functioning boot.oat/art patchoat.
Bug:
17000769
(cherry picked from commit
84d7605f93f1e6e86a16e02017e305c90e93117a)
Change-Id: I89c26a905af12ea288742368c2c038afd57a879a
Dave Allison [Wed, 27 Aug 2014 19:42:39 +0000 (19:42 +0000)]
Merge "Handle nested signals" into lmp-dev
Mathieu Chartier [Wed, 27 Aug 2014 18:58:37 +0000 (18:58 +0000)]
am
b68c6e57: Reduce interpret-only compile time.
* commit '
b68c6e578a28a9717d78dfd522d9d9b8befaedf2':
Reduce interpret-only compile time.
Mathieu Chartier [Tue, 19 Aug 2014 21:29:46 +0000 (14:29 -0700)]
Reduce interpret-only compile time.
Before:
39.04user 5.18system 0:29.24elapsed 151%CPU (0avgtext+0avgdata 164176maxresident)k
38.87user 5.16system 0:29.14elapsed 151%CPU (0avgtext+0avgdata 164144maxresident)k
After:
36.26user 3.25system 0:27.00elapsed 146%CPU (0avgtext+0avgdata 162592maxresident)k
36.25user 3.28system 0:26.28elapsed 150%CPU (0avgtext+0avgdata 162688maxresident)k
Disabled implicit stack protection for the compiler, this reduces page faults.
Added support for not timing every method compilation and verification. NanoTime is
slow and adds ~2 seconds of real time. This is currently enabled since people want
to know which methods are slow to compile.
Bug:
16853450
(cherry picked from commit
8e219ae27624116b6d23e858fb21e93342f81d66)
Change-Id: I349ffb3f36db8c437137387aa6914dc17d743f09
Dave Allison [Tue, 26 Aug 2014 18:07:58 +0000 (11:07 -0700)]
Handle nested signals
This allows for signals to be raised inside the ART signal handler.
This can occur when the JavaStackTraceHandler attempts to generate
a stack trace and something goes wrong.
It also fixes an issue where the fault manager was not being
correctly shut down inside the signal chaining code. In this
case the signal handler was not restored to the original.
Bug:
17006816
Bug:
17133266
Change-Id: I9c25bf4f6921e6a107aefbdf47d2c0db9f41508f
Mathieu Chartier [Tue, 26 Aug 2014 18:12:29 +0000 (18:12 +0000)]
am
f59b605f: Merge "Fix race condition in TransitionCollector." into lmp-dev
* commit '
f59b605f82c0e2b7bfc6019ee7bd650628f50d3a':
Fix race condition in TransitionCollector.
Stephen Kyle [Tue, 26 Aug 2014 18:12:28 +0000 (18:12 +0000)]
am
ccb1a5d4: ART: Reject field accesses to non-reference vregs.
* commit '
ccb1a5d46bc1b4ee888e74775f5c1291d600ff54':
ART: Reject field accesses to non-reference vregs.
Mathieu Chartier [Tue, 26 Aug 2014 18:01:37 +0000 (18:01 +0000)]
Merge "Fix race condition in TransitionCollector." into lmp-dev
Mathieu Chartier [Sat, 23 Aug 2014 20:56:03 +0000 (13:56 -0700)]
Fix race condition in TransitionCollector.
There was a minor race condition that could happen if multiple
threads called TransitionCollector at the same time. Starting out
in CMS:
Thread 1: TransitionCollector(SS).
Thread 2: TransitionCollector(CMS) sees that it is already CMS so
has copying_transition == false. But then thread 2 changes to SS.
Thread 1 resumes but incorrectly doesn't check the
disable_moving_gc_count_ possibly resulting in errors if
disable_moving_gc_count_ != 0 due to JNI since we are going from
SS -> CMS and are goign to move objects.
Bug:
17189964
Change-Id: I4f0d002717516b81355d66f26e0e8ebe3958348d
Stephen Kyle [Fri, 22 Aug 2014 14:03:07 +0000 (15:03 +0100)]
ART: Reject field accesses to non-reference vregs.
The verifier will now reject any iget/iput insts
that do not have a reference object in vB.
Bug:
17207857
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
(cherry picked from commit
695c5982eeddee18c643cc2f94c9d78fa75599ab)
Change-Id: I3790b8687673643bb142549d74f36a3e2978bf13
Mathieu Chartier [Tue, 26 Aug 2014 17:23:17 +0000 (17:23 +0000)]
am
506bcfc6: Merge "Map heap maps at a lower address." into lmp-dev
* commit '
506bcfc66454555f792fbc7893ff3b2877c9b288':
Map heap maps at a lower address.
Mathieu Chartier [Tue, 26 Aug 2014 17:15:20 +0000 (17:15 +0000)]
Merge "Map heap maps at a lower address." into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:14:50 +0000 (17:14 +0000)]
am
b2634e97: Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
* commit '
b2634e9790a7099cf84d3509afe7af18f4349f11':
ART: kSuper also has IncompatibleClassChangeError
Andreas Gampe [Tue, 26 Aug 2014 17:14:49 +0000 (17:14 +0000)]
am
7f28597b: Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
* commit '
7f28597bfa4b5e11911e4d4caa13fe2ab234a53e':
ART: Fix IncompatibleClassChange check for ArtMethod
Andreas Gampe [Tue, 26 Aug 2014 17:10:28 +0000 (17:10 +0000)]
Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev
Andreas Gampe [Tue, 26 Aug 2014 17:04:14 +0000 (17:04 +0000)]
Merge "ART: Fix IncompatibleClassChange check for ArtMethod" into lmp-dev
Sebastien Hertz [Tue, 26 Aug 2014 13:50:57 +0000 (13:50 +0000)]
am
83182ed4: Merge "Reduce lock contention when debugging" into lmp-dev
* commit '
83182ed48c55729cd34780fc598f269cc98af739':
Reduce lock contention when debugging
Sebastien Hertz [Tue, 26 Aug 2014 13:43:17 +0000 (13:43 +0000)]
Merge "Reduce lock contention when debugging" into lmp-dev
buzbee [Tue, 26 Aug 2014 13:09:04 +0000 (13:09 +0000)]
am
cb50ed40: Merge "Quick compiler: fix DCHECK" into lmp-dev
* commit '
cb50ed40fc39a1c1786e57f5c839a3cd230e1744':
Quick compiler: fix DCHECK
buzbee [Tue, 26 Aug 2014 12:58:44 +0000 (12:58 +0000)]
Merge "Quick compiler: fix DCHECK" into lmp-dev
Brian Carlstrom [Tue, 26 Aug 2014 11:18:28 +0000 (11:18 +0000)]
am
118785c6: CheckAndClearResolveException should allow LinkageError
* commit '
118785c6f82ac1ec7074b5efe367b3dafd904940':
CheckAndClearResolveException should allow LinkageError
Brian Carlstrom [Tue, 26 Aug 2014 06:07:30 +0000 (23:07 -0700)]
CheckAndClearResolveException should allow LinkageError
Bug:
16565964
Change-Id: Ibf236c627519a5cdef9479b7bc21e931d5474abf
Andreas Gampe [Tue, 26 Aug 2014 03:55:01 +0000 (20:55 -0700)]
ART: kSuper also has IncompatibleClassChangeError
When resolving methods, kSuper can also have
IncompatibleClassChangeError.
Bug:
17266767
Change-Id: I5fafe03ad578f605825a3d0c89f1254a4a385b76
Andreas Gampe [Tue, 26 Aug 2014 03:46:31 +0000 (20:46 -0700)]
ART: Fix IncompatibleClassChange check for ArtMethod
In case of kSuper we should complain sometimes.
Bug:
17265201
Change-Id: Ifad903a750495963c7128296713fbd7c4add71cd