OSDN Git Service
Calin Juravle [Thu, 7 Aug 2014 10:54:36 +0000 (11:54 +0100)]
Fix GetDexCanonicalLocation test for relative paths.
If the reference file is created with a relative path the test will
fail.
(cherry picked from commit
61281dc0aaa22730fd4fee268cac40776b193042)
Change-Id: Ie82b9d381bd884111dfc91cc235b46ad9f3225be
Ian Rogers [Wed, 10 Sep 2014 14:31:36 +0000 (14:31 +0000)]
Merge "VisitClassesWithoutClassesLock isn't safe if classes move." into lmp-dev
Mathieu Chartier [Wed, 10 Sep 2014 00:26:58 +0000 (17:26 -0700)]
Increase dex2oat timeouts for debug builds
Should fix the 056-const-string-jumbo test.
Change-Id: I04d98dfd59003b964c1feee6eee31079f9f4a476
Mathieu Chartier [Tue, 9 Sep 2014 20:51:09 +0000 (13:51 -0700)]
Change Reference.get() intrinsic to Reference.getReferent().
The reference intrinsic was incorrectly inlining
PhantomReference.get(). We now get around this by adding a
layer of indirection. Reference.get() now calls getReferent()
which is intrinsified and inlined.
Requires:
https://android-review.googlesource.com/#/c/107100/
Bug:
17429865
(cherry picked from commit
cd48f2d86197d4fe87cc88077bc4af5ba66e5295)
Change-Id: Ie91e70abf43cedf3c707c7bb8a5059e19d2a2577
Jeff Hao [Tue, 9 Sep 2014 20:13:24 +0000 (20:13 +0000)]
Merge "Change 099-vmdebug test to use File.createTempFile." into lmp-dev
Jeff Hao [Tue, 9 Sep 2014 20:07:59 +0000 (13:07 -0700)]
Change 099-vmdebug test to use File.createTempFile.
Avoids issues with concurrency.
Bug:
17439227
Change-Id: I4a5956d9f26fad416a244216c2c77d5e6f072c62
Mathieu Chartier [Tue, 9 Sep 2014 17:39:37 +0000 (17:39 +0000)]
Merge "Temporarily disable LOS on 64 bit" into lmp-dev
Andreas Gampe [Tue, 9 Sep 2014 06:39:45 +0000 (23:39 -0700)]
ART: Better error reporting on broken oat file
Do not blow up when in GetHashBucket if GetHashBucketNum is zero.
Instead back-step to ElfFileOpen, which prints which symbol was
missing from which file.
Bug:
17422404
Change-Id: I3b890dd1c31c08b1ccc0f7f668afcceee95f8d00
Brian Carlstrom [Tue, 9 Sep 2014 06:02:19 +0000 (06:02 +0000)]
Merge "Workaround Darwin ContainedWithinExistingMap issue" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 05:41:35 +0000 (22:41 -0700)]
Workaround Darwin ContainedWithinExistingMap issue
Bug:
16861075
Change-Id: I577a0c7ede919e610c356e7c40dd60d87914dd3a
Sebastien Hertz [Tue, 9 Sep 2014 05:12:55 +0000 (05:12 +0000)]
Merge "Fix monitor visit for class initializer" into lmp-dev
Andreas Gampe [Tue, 9 Sep 2014 05:07:38 +0000 (05:07 +0000)]
Merge "ART: Fix unchecked register index validity" into lmp-dev
Brian Carlstrom [Tue, 9 Sep 2014 04:37:39 +0000 (21:37 -0700)]
Fix darwin run-test problems
Bug:
17428908
Change-Id: Id74a0383fdae6753558e27cd447c1ca349819c91
Mathieu Chartier [Tue, 9 Sep 2014 02:49:50 +0000 (19:49 -0700)]
Temporarily disable LOS on 64 bit
Problem is that MAP_32BIT simulation can take seconds on large object
allocations in the worst case.
Bug:
17414549
Change-Id: I463bb0b728eed14847a32a27a93640ec6080f6b3
Mathieu Chartier [Tue, 9 Sep 2014 01:14:22 +0000 (01:14 +0000)]
Merge "Add fast path for FindClass using the type dex file." into lmp-dev
Mathieu Chartier [Fri, 5 Sep 2014 01:33:17 +0000 (18:33 -0700)]
Add fast path for FindClass using the type dex file.
If we are using the PathClassLoader with a BootClassLoader
parent, we can handle the common case in the FindClass function
without needing to go back to java code.
Around 10% speedup measured of maps launch, could be noise due to
large variation of app launch times. Eliminates defineClassNative
from being anywhere near the top of sampling profiles.
Bug:
17397179
Bug:
16828525
Change-Id: Ide0db2b5f6cf5b96fc46e89178e0799de667cb88
Andreas Gampe [Tue, 9 Sep 2014 00:41:35 +0000 (00:41 +0000)]
Merge "ART: Change ART for new native bridge sequence" into lmp-dev
Mathieu Chartier [Mon, 8 Sep 2014 23:01:52 +0000 (23:01 +0000)]
Merge "Add test for hashCode and System.identityHashCode." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 22:32:39 +0000 (15:32 -0700)]
Disable tracing if enabled by default for new tracing test.
Bug:
17412385
Change-Id: If963a9ba2214c72efbef673a840bbeb6fdbb1795
Jeff Hao [Mon, 8 Sep 2014 22:22:08 +0000 (22:22 +0000)]
Merge "Change when sampling thread is reset during shutdown to prevent races." into lmp-dev
Jeff Hao [Mon, 8 Sep 2014 16:38:18 +0000 (09:38 -0700)]
Change when sampling thread is reset during shutdown to prevent races.
Also adds some extra argument checking and testing for tracing.
Bug:
17412385
Change-Id: I876378d5bd17d75ab346584713b04dc0656d2120
Mathieu Chartier [Mon, 8 Sep 2014 21:48:25 +0000 (14:48 -0700)]
Add test for hashCode and System.identityHashCode.
(cherry picked from commit
bda2836af470c45e30c567b14d6747a7450c4741)
Change-Id: Ieba8f8eb09441ec145a176df00c293695eae0f47
Mathieu Chartier [Mon, 8 Sep 2014 20:35:11 +0000 (13:35 -0700)]
Ignore heap trim requests if we are the zygote
Done to prevent app launching lag due to sleep in heap trimmer
daemon.
Bug:
17310019
Change-Id: Ia593e7eced1c1583771985ec9e7b60ee0c0e7912
Mathieu Chartier [Mon, 8 Sep 2014 20:08:41 +0000 (20:08 +0000)]
Revert "Fix heap trimmer daemon sleeping."
This reverts commit
698b44634396e8111e96e1116586fde89a838347.
Change-Id: Ifa8c2d554b82289cc31803ad6027735d2c3c9be8
Andreas Gampe [Sun, 7 Sep 2014 20:06:12 +0000 (13:06 -0700)]
ART: Fix unchecked register index validity
The static check of index validity is against the type given by
the instruction, e.g., boolean for SPUT_BOOLEAN, but the target_type
is the resolved field type and can differ. An additional check is
necessary to avoid a read out of bounds.
Bug:
17411109
Change-Id: Ie4ed8bbda79f3f6403a24e727450a943447aa71d
Andreas Gampe [Wed, 3 Sep 2014 04:22:18 +0000 (21:22 -0700)]
ART: Change ART for new native bridge sequence
Initialize or unload after a fork.
(cherry picked from commit
6be67eeedbe60afce42300ae3e7f0e7180a96efa)
Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
Ian Rogers [Fri, 29 Aug 2014 22:40:08 +0000 (15:40 -0700)]
VisitClassesWithoutClassesLock isn't safe if classes move.
Which they do, so avoid by doing an array allocation.
Also, tidy member variables to the end of ClassLinker.
Remove unnecessary mutable. Tidy and fix a locks required/excluded.
Change-Id: I2404a9e7a1ea997d68ab1206f97d2a20dffbda06
(cherry picked from commit
dbf3be0f133c0bdf454f637fee2452dbb5f7c027)
Sebastien Hertz [Mon, 8 Sep 2014 08:15:19 +0000 (10:15 +0200)]
Fix monitor visit for class initializer
We do not hold class object's lock when invoking class initializer. Therefore
it is wrong to visit it when looking for monitors owned by a thread.
Bug:
17377924
Change-Id: I7fddcdb9a554301e040c571971eec9be6cba5eda
Brian Carlstrom [Fri, 5 Sep 2014 18:54:44 +0000 (18:54 +0000)]
Merge "Fix numerous issues with DdmVmInternal allocation tracking" into lmp-dev
Brian Carlstrom [Fri, 5 Sep 2014 05:15:18 +0000 (22:15 -0700)]
Fix numerous issues with DdmVmInternal allocation tracking
Issues addressed:
- Using without JDWP attached caused native crash.
- When buffer is full (64k entries), number of entries reported was 0.
- Disabling tracking after disabling tracking caused native crash.
- Asking for allocations after disabled caused native crash.
- Lock ordering issues between mutator lock and alloc tracker lock.
Adding 098-ddmc test to cover these cases.
Bug:
17392248
Change-Id: I45c0abbfb3dd7a7421aea3bbba2ea8d05225e48b
Calin Juravle [Fri, 5 Sep 2014 15:33:21 +0000 (15:33 +0000)]
Merge "Avoid recomputing the dex checksum during class loading" into lmp-dev
Calin Juravle [Tue, 2 Sep 2014 14:53:55 +0000 (15:53 +0100)]
Avoid recomputing the dex checksum during class loading
Thread the already computed checksum to VerifyOatAndDexFileChecksums and
LoadMultiDexFilesFromOatFile to avoid recomputing it.
Bug:
17346103
Change-Id: Ifa0c1cad952853751e98cbb3c999631b9909a9f9
Ian Rogers [Wed, 13 Aug 2014 21:37:26 +0000 (14:37 -0700)]
Ensure alternate signal stack is minimum size.
On Mac a sigaltstack may need to be 32KB, setting it to 16KB causes
sigaltstack to fail.
(cherry picked from commit
c24a1e00b13a7ebf10dd896f6a18b1ad09617ec7)
Change-Id: Ic06d80f1acf5c4eb3d2dd1156bfa2805ab0df492
Mathieu Chartier [Thu, 4 Sep 2014 17:38:39 +0000 (17:38 +0000)]
Merge "Fix heap trimmer daemon sleeping." into lmp-dev
Mathieu Chartier [Thu, 4 Sep 2014 04:26:36 +0000 (21:26 -0700)]
Fix heap trimmer daemon sleeping.
Problem:
Heap trimmer daemon sleeping caused app launch occasionally to take a
while due stopping the heap trimming thread taking a long time.
The heap trimmer thread now never sleeps, we prevent issues caused
by frequent back and forth process state changes by only
transitioning to background if it has been kCollectorTransitionWait
time since the last transition to background. Similar logic for heap
trimming.
Bug:
17310019
Change-Id: I23980421cc388f36b66a4c03ed15dd11d43f59b5
Jean Christophe Beyler [Thu, 4 Sep 2014 15:34:28 +0000 (08:34 -0700)]
ART: Fix x86_64 GenSelect case when destination is Ref
Reference in x86_64 is a 64-bit solo register. As a result, the invocation
of OpRegImm results in an error when Select opcode of the kind:
ref = boolean ? null : null;
because opRegImm does not support 64-bit destination for OpMov.
The case above is only possible for ref because no one other constant except
null is possible.
Bug:
17327895
Change-Id: I7541e744ec1c8619711712fd17be72764efcf3a8
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
3f51e7d942c22edaab3a7e703a1e6a2dd6a26f77)
Ian Rogers [Thu, 4 Sep 2014 15:53:16 +0000 (15:53 +0000)]
Merge "ART: Fix computation of frame size for direct proxy methods" into lmp-dev
Serguei Katkov [Fri, 29 Aug 2014 11:20:15 +0000 (18:20 +0700)]
ART: Fix computation of frame size for direct proxy methods
Proxy method has only one direct method and it is a constructor which
is cloned from java.lang.reflect.Proxy class together with code.
As a result its body is a compiled quick code and frame size should be
computed accordingly in contrast with other virtual methods which are
invoked through stub.
Change-Id: I0ac99b2f567b281c9342152bad1149dd6cd39480
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
805bab1738549b2477b3ad4d9d57fd7c681451b9)
Mathieu Chartier [Thu, 4 Sep 2014 04:23:13 +0000 (04:23 +0000)]
Merge "Fix native allocation watermark clamping." into lmp-dev
Mathieu Chartier [Wed, 3 Sep 2014 17:30:11 +0000 (10:30 -0700)]
Fix native allocation watermark clamping.
The main issue causing the test to fail is that
native_footprint_gc_watermark_ becoming > growth_limit_ due to no
clamping.
Temporary runFinalization fix is calling runFinalization 2x.
Bug:
17371542
Change-Id: I188cb530a44dd109e066a22091f12f8d2d4350c3
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 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 [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 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 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:39:25 +0000 (21:39 +0000)]
Merge "Change intern table to unordered set." into lmp-dev
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:22:20 +0000 (10:22 -0700)]
ART: Fix typo
Bug:
17327877
Change-Id: I6132a8afb4b69c8d22a01b477f6f324c789ed666
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: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:18:53 +0000 (18:18 +0000)]
Merge "Fix mips build for nested signal handler" into lmp-dev
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 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 [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:17:13 +0000 (22:17 -0700)]
Fix Mac build
Bug:
17000769,
16875245
(cherry picked from commit
debdda0262bfbcb966a89e693d933cc74eb412ac)
Change-Id: I158f090c89587f176813a15e9edad917bd134cd0
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: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 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: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 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: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
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
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 [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: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:15:20 +0000 (17:15 +0000)]
Merge "Map heap maps at a lower address." into lmp-dev
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:43:17 +0000 (13:43 +0000)]
Merge "Reduce lock contention when debugging" into lmp-dev
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 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