OSDN Git Service
Mathieu Chartier [Sat, 5 Mar 2016 01:01:35 +0000 (01:01 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject"
Mathieu Chartier [Fri, 4 Mar 2016 18:30:39 +0000 (10:30 -0800)]
Use MarkIfNotInToSpace for SemiSpace::MarkObject
SemiSpace::MarkObject is called from ModUnionScanImageRootVisitor
which. These roots may be visited multiple times by the GC. One
example is the allocation stack traces and a class visiting the same
ArtMethod twice.
Bug:
27435111
Change-Id: I721b8bcf7fe43f4c351d902c2f3422d3bb585295
Mathieu Chartier [Fri, 4 Mar 2016 21:32:10 +0000 (21:32 +0000)]
Merge "Only visit app image classes in class loader"
Mathieu Chartier [Thu, 3 Mar 2016 00:08:31 +0000 (16:08 -0800)]
Only visit app image classes in class loader
Only update dex cache arrays of added classes since the declaring
class is in image DCHECK fails for other classes in the class loader.
Also some cleanup to prevent app images leaving invalid state if
they get rejected.
Bug:
22858531
Bug:
27431418
Change-Id: Ib2a5692a1ad78b014a1bfc6b27fb1c12bc8565e6
Andreas Gampe [Fri, 4 Mar 2016 17:23:44 +0000 (17:23 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks"
David Srbecky [Fri, 4 Mar 2016 17:13:51 +0000 (17:13 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info."
Nicolas Geoffray [Fri, 4 Mar 2016 16:45:03 +0000 (16:45 +0000)]
Merge "Query declaring class before querying IsNative."
Nicolas Geoffray [Fri, 4 Mar 2016 16:43:27 +0000 (16:43 +0000)]
Query declaring class before querying IsNative.
IsNative checks that the declaring class is not null.
Change-Id: I9b775858cdb685eb633b3d8a8a271a3d451bb8a9
Bill Buzbee [Fri, 4 Mar 2016 16:41:59 +0000 (16:41 +0000)]
Merge "ART: Update arm assembly to use current syntax"
Nicolas Geoffray [Fri, 4 Mar 2016 16:30:31 +0000 (16:30 +0000)]
Merge "Fix very rare bug around JIT code cache collection."
Roland Levillain [Fri, 4 Mar 2016 16:14:18 +0000 (16:14 +0000)]
Merge "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
Nicolas Geoffray [Fri, 4 Mar 2016 16:13:10 +0000 (16:13 +0000)]
Merge "ARM64: Implement SystemArrayCopyChar intrinsic."
buzbee [Fri, 4 Mar 2016 16:03:51 +0000 (08:03 -0800)]
ART: Update arm assembly to use current syntax
Some of the ancient mterp code uses old-style arm opcode names
which are supported by gas, but not by clang's integrated
assembler.
Partial fix for internal b/
27473367
Change-Id: Ic6128b98dfbf30f252e7487f802e9dfbe0a42b6a
Roland Levillain [Fri, 4 Mar 2016 16:01:22 +0000 (16:01 +0000)]
Ignore 145-alloc-tracking-stress failures in interpreter with CC.
This run-test fails also with the interpreter on the
concurrent collector configuration; disable it for now.
Bug:
27467554
Change-Id: I54f76536b498ea2dedfd76d1bd77e1e26b415eb2
David Srbecky [Fri, 4 Mar 2016 11:34:46 +0000 (11:34 +0000)]
Cache DexRegisterMaps when writing native debug info.
I might make the function more expensive in the future so I want
to make sure it gets called only the minimum number of times.
Change-Id: I1d09ecf1db7b54d28aaa11a152226d469f514fe7
Nicolas Geoffray [Fri, 4 Mar 2016 15:47:41 +0000 (15:47 +0000)]
Merge "Make sure we keep adb logs on buildbots."
David Srbecky [Fri, 4 Mar 2016 15:38:30 +0000 (15:38 +0000)]
Merge "Re-enable CFI test for compressed symbols."
David Srbecky [Fri, 4 Mar 2016 14:42:05 +0000 (14:42 +0000)]
Re-enable CFI test for compressed symbols.
This enables the test for remote unwinding (modelling debuggerd),
but it does not test local unwinding since it is disabled for
performance reasons in libunwind.
Bug:
27391690
Change-Id: I28451576c421bbd70259d757332a178f29bf3646
Nicolas Geoffray [Fri, 4 Mar 2016 15:28:35 +0000 (15:28 +0000)]
Make sure we keep adb logs on buildbots.
Change-Id: I79239967a74eaef6d10b546407b223422741d157
Nicolas Geoffray [Fri, 4 Mar 2016 14:32:59 +0000 (14:32 +0000)]
Fix very rare bug around JIT code cache collection.
The bug is the following:
1) JIT thread: We start a code cache collection.
2) JIT thread: We mark all code that is in the call stack of all
threads.
3) Mutator thread: after marking its stack, resumes and does call
that pushes JIT compiled code to the call stack.
4) Mutator thread: deoptimizes compiled code of ArtMethod Foo,
and therefore updates the entry point of Foo through
JitCodeCache::InvalidateCompiledCodeFor.
(Note that updating the entrypoint could also be done through
instrumentation).
5) JIT thread: Call JitCodeCache::RemoveUnusedAndUnmarkedCode.
The method used to remove entries that were not entrypoints.
It sees the compiled code for Foo but that is not an entrypoint
anymore, so deletes it.
6) Mutator thread problem: it now has compiled code in its call
stack that is deleted.
If it's only one mutator thread, we only hit a DCHECK when walking
the stack, as we are now seeing an invalid pc. The deoptimization
will longjmp to the caller of that invalid entry anyway.
However, if multiple mutator threads are involved, one thread
might invalidate the compiled code while the other is still
running it. And we end up deleting code that is in the call
stack of a thread, and we will crash.
The fix is to mark entrypoints before marking call stacks,
so that anything a thread might jump to is marked and kept.
bug:
27424509
bug:
23128949
bug:
26846185
Change-Id: I07cd08cedd96b9900629f7535e95404f622104ea
Nicolas Geoffray [Fri, 4 Mar 2016 14:45:28 +0000 (14:45 +0000)]
Merge "Suppress ArrayDequeTest#testForEachRemaining temporarily."
Narayan Kamath [Fri, 4 Mar 2016 14:40:32 +0000 (14:40 +0000)]
Suppress ArrayDequeTest#testForEachRemaining temporarily.
Change-Id: I297a392d694b8143010084469c401f15a887f2f1
Scott Wakeling [Mon, 29 Feb 2016 15:17:20 +0000 (15:17 +0000)]
ARM64: Implement SystemArrayCopyChar intrinsic.
Change-Id: I33f559139a38ddf20cacb8c997e38fa7663a4066
Nicolas Geoffray [Fri, 4 Mar 2016 11:58:43 +0000 (11:58 +0000)]
Merge "Refine statistics around the JIT."
Nicolas Geoffray [Fri, 4 Mar 2016 11:55:41 +0000 (11:55 +0000)]
Merge "Move back the boot image to debuggable."
Nicolas Geoffray [Fri, 4 Mar 2016 11:38:14 +0000 (11:38 +0000)]
Move back the boot image to debuggable.
Full frame deoptimization is broken with it.
Partial revert of https://android-review.googlesource.com/#/c/201383/
Change-Id: I7a402d79b0882f81987e56869551840da7d553e0
Nicolas Geoffray [Fri, 4 Mar 2016 11:23:26 +0000 (11:23 +0000)]
Merge "Fix lint issue."
Nicolas Geoffray [Fri, 4 Mar 2016 11:10:17 +0000 (11:10 +0000)]
Fix lint issue.
Change-Id: I549cc641510a7f941d85f3a5f38127bc6701a0a3
Nicolas Geoffray [Fri, 4 Mar 2016 10:11:09 +0000 (10:11 +0000)]
Merge "Integer.bitCount and Long.bitCount intrinsics for ARM64"
Nicolas Geoffray [Fri, 4 Mar 2016 09:59:20 +0000 (09:59 +0000)]
Merge "ProfilingInfo roots should be visited by the declaring class."
Andreas Gampe [Fri, 4 Mar 2016 04:49:03 +0000 (04:49 +0000)]
Merge "MIPS32: Highest/Lowest One Bit Set:"
Chris Larsen [Wed, 17 Feb 2016 01:10:40 +0000 (17:10 -0800)]
MIPS32: Highest/Lowest One Bit Set:
- int java.lang.Integer.highestOneBit(int)
- int java.lang.Integer.lowestOneBit(int)
- long java.lang.Long.highestOneBit(long)
- long java.lang.Long.lowestOneBit(long)
Change-Id: I575ec6f70cf5cac620cc5d9e49ec3f7b554b4622
Andreas Gampe [Fri, 4 Mar 2016 04:15:47 +0000 (20:15 -0800)]
ART: Fix UTF test and monitor pool old chunks
Zero-initialize buffers in utf_test. UTF conversion does not
append a zero terminator, but the test uses strlen to check the
byte count.
Move to unique_ptr for storing old monitor-pool chunk data to
fix a leak.
Bug:
27156726
Change-Id: I14424c6f98cf47beab6243f83a335bd6a682c638
Hiroshi Yamauchi [Fri, 4 Mar 2016 02:07:41 +0000 (02:07 +0000)]
Merge "Add ScopedGCCriticalSection to Trace::StopTracing."
Andreas Gampe [Fri, 4 Mar 2016 01:59:03 +0000 (01:59 +0000)]
Merge "MIPS32: Improve TrailingZeros"
Chris Larsen [Thu, 18 Feb 2016 01:44:58 +0000 (17:44 -0800)]
MIPS32: Improve TrailingZeros
Change-Id: I1269ad5c58e1e3f39f3c2a04a3ed6dc1e44ff2fc
Andreas Gampe [Fri, 4 Mar 2016 00:38:44 +0000 (00:38 +0000)]
Merge "MIPS32: Implement bitCount intrinsics."
Chris Larsen [Sat, 13 Feb 2016 01:59:00 +0000 (17:59 -0800)]
MIPS32: Implement bitCount intrinsics.
- int java.lang.Integer.bitCount(int)
- int java.lang.Long.bitCount(long)
Change-Id: Ibde089675064aa052cfcd9f53aa36c25a4cbfca9
Andreas Gampe [Fri, 4 Mar 2016 00:02:15 +0000 (00:02 +0000)]
Merge "MIPS32: Implement isInfinite intrinsics."
Hiroshi Yamauchi [Thu, 3 Mar 2016 23:09:27 +0000 (15:09 -0800)]
Add ScopedGCCriticalSection to Trace::StopTracing.
This attempts to fix a deadlock in 545-tracing-and-jit with the read
barrier config. I think the cause is the same as what CL 174096
describes and it missed this one in Trace::StopTracing.
Bug:
26429931
Bug:
12687968
Change-Id: I02ca45e2667c9f6afc27d73919d6c31d204cc621
Nicolas Geoffray [Thu, 3 Mar 2016 23:14:49 +0000 (23:14 +0000)]
ProfilingInfo roots should be visited by the declaring class.
There seems to be an implicit assumption that only classes can
visit native roots (ie kVisitNativeRoots in Class::VisitReferences).
However, some places like Dbg::VisitRoots and
AllocRecordObjectMap::VisitRoots visit ArtMethod::VisitRoot
directly, and that breaks the assumptions.
bug:
27435111
Change-Id: I5b476e614ba820394635d946cb562bf872a50e7e
Mathieu Chartier [Thu, 3 Mar 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Add systrace to VerifyClass"
Mathieu Chartier [Thu, 3 Mar 2016 03:23:17 +0000 (19:23 -0800)]
Add systrace to VerifyClass
Useful to see if verifier is preempting anything.
(cherry picked from commit
7f459f5859e5f01c92c3711e7d63c062f510b416)
Change-Id: I594cbdc5c2f8934fc6c4fc7ee47fc4ccfc3c627d
Chris Larsen [Thu, 11 Feb 2016 22:23:53 +0000 (14:23 -0800)]
MIPS32: Implement isInfinite intrinsics.
- boolean java.lang.Float.isInfinite(float)
- boolean java.lang.Double.isInfinite(double)
Change-Id: I17dc2380ec864fd7612025ed400e29dd115ccab4
Alex Light [Thu, 3 Mar 2016 20:35:36 +0000 (20:35 +0000)]
Merge "Move some default-methods tests to Java from Smali."
Alex Light [Tue, 1 Mar 2016 22:33:51 +0000 (14:33 -0800)]
Move some default-methods tests to Java from Smali.
Move all smali tests for default method behavior in
non-source-incompatible contexts to java. Also move some of the
simpler tests for source and binary incompatibilities into java as
well when possible.
Bug:
27310767
Change-Id: I753196f19849494825953c1bf06f15b7132f459b
Mingyao Yang [Thu, 3 Mar 2016 18:19:46 +0000 (18:19 +0000)]
Merge "change image in run-jdwp-tests.sh"
Mingyao Yang [Thu, 3 Mar 2016 18:19:13 +0000 (18:19 +0000)]
Merge "Add a PassScope for PrepareForRegisterAllocation"
Dimitry Ivanov [Thu, 3 Mar 2016 17:05:15 +0000 (17:05 +0000)]
Merge "Simplify LoadNativeLibrary()"
Nicolas Geoffray [Thu, 3 Mar 2016 13:23:33 +0000 (13:23 +0000)]
Refine statistics around the JIT.
- Better namings.
- Now also time the code cache collection time.
- Random cleanups.
bug:
23128949
bug:
27445008
bug:
27442890
Change-Id: I1dd52544bea678af868e7c47907f7a0fc9a146c3
David Brazdil [Thu, 3 Mar 2016 11:40:15 +0000 (11:40 +0000)]
Merge "ART: cleanup exit_block_ in graph if exit block is removed"
xueliang.zhong [Thu, 3 Mar 2016 10:52:51 +0000 (10:52 +0000)]
Integer.bitCount and Long.bitCount intrinsics for ARM64
Change-Id: If6180acc90239e52e5d33901b65e194d1ca7e248
Roland Levillain [Thu, 3 Mar 2016 11:28:41 +0000 (11:28 +0000)]
Merge "Ignore 145-alloc-tracking-stress run-test failures with CC."
Serguei Katkov [Wed, 2 Mar 2016 10:25:36 +0000 (16:25 +0600)]
ART: cleanup exit_block_ in graph if exit block is removed
If we remove the exit block from the graph (for example method
contains infinite loop) we should also clean the field exit_block_
in graph. At least inliner expects it.
Change-Id: Icda668da2233cdd6cd673635a1949f5ed34cf270
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Roland Levillain [Thu, 3 Mar 2016 10:43:21 +0000 (10:43 +0000)]
Ignore 145-alloc-tracking-stress run-test failures with CC.
This run-test sometimes fails with a timeout on ART
Builbot's x86-64 concurrent collector configuration. Disable
it to make the build turn green again, while we investigate
the failure.
Bug:
27467554
Change-Id: I0bac307ec85f197afb8763ca41a6ee50567c4d5f
Nicolas Geoffray [Thu, 3 Mar 2016 09:26:46 +0000 (09:26 +0000)]
Merge "Do a TryLock when allocating a ProfilingInfo from the interpreter."
Mingyao Yang [Wed, 2 Mar 2016 22:59:32 +0000 (14:59 -0800)]
Add a PassScope for PrepareForRegisterAllocation
This pass does transform the graph so make it part of cfg-dumping.
Change-Id: I42e361382c85c97b974faad8bb0fcf2cb0750355
Mathieu Chartier [Wed, 2 Mar 2016 22:01:28 +0000 (22:01 +0000)]
Merge "Delete alloc tracking map outside of critical section"
Mathieu Chartier [Wed, 2 Mar 2016 20:52:37 +0000 (12:52 -0800)]
Delete alloc tracking map outside of critical section
There can be lock order violations otherwise due to runtime shutdown
lock that may get acquired in the condition variable destructor.
Change-Id: I23cb2dfe241f5cc6c42bf6766e89042cf06069b6
Mingyao Yang [Tue, 1 Mar 2016 22:51:52 +0000 (14:51 -0800)]
change image in run-jdwp-tests.sh
Change-Id: I305fdd5b8b33c446529fe99f872af4fb8685bd7c
Andreas Gampe [Wed, 2 Mar 2016 20:57:25 +0000 (20:57 +0000)]
Merge "Revert "Disable test after libunwind change.""
Andreas Gampe [Wed, 2 Mar 2016 16:51:21 +0000 (08:51 -0800)]
Revert "Disable test after libunwind change."
This reverts commit
18047e4cd06387958d315d4de6d9c1753a08ee9e.
Moving the in-process lzma disable to libunwind allows to unwind not-zipped debug-info, again.
Bug:
27391690
Change-Id: I8c24dd0e73bc9d57ce83c6f5a8272d8252e5b809
Hiroshi Yamauchi [Wed, 2 Mar 2016 20:53:18 +0000 (20:53 +0000)]
Merge "Disable 577-profile-foreign-dex temporarily."
Bill Buzbee [Wed, 2 Mar 2016 20:17:51 +0000 (20:17 +0000)]
Merge "Fast ART MIPS64 interpreter"
Hiroshi Yamauchi [Wed, 2 Mar 2016 20:12:54 +0000 (12:12 -0800)]
Disable 577-profile-foreign-dex temporarily.
Until a fix arrives.
Bug:
27454772
Change-Id: Ieec219792c507ad85561a4188ec873d2f18e4604
Nicolas Geoffray [Wed, 2 Mar 2016 19:47:54 +0000 (19:47 +0000)]
Merge "Clear inline caches if a ProfilingInfo gets revived."
Mathieu Chartier [Wed, 2 Mar 2016 19:44:29 +0000 (19:44 +0000)]
Merge "Fix potential linear alloc memory leak"
Aart Bik [Wed, 2 Mar 2016 18:53:45 +0000 (18:53 +0000)]
Merge "Simplified intrinsic macro mechanism."
Mathieu Chartier [Wed, 2 Mar 2016 18:30:23 +0000 (10:30 -0800)]
Fix potential linear alloc memory leak
Previously, if we created a linear alloc for a class loader but
never created the class table, the linear alloc would never get
freed since it would have no corresponding ClassLoaderData.
Fixes valgrind-test-art-host-gtest-oat_test
Bug:
27384882
Change-Id: Ic8f35b58c3117127a39521b6b9d25ef12c72040c
Dan Willemsen [Wed, 2 Mar 2016 18:12:06 +0000 (18:12 +0000)]
Merge "Remove references to $(ACP)"
Nicolas Geoffray [Wed, 2 Mar 2016 17:09:35 +0000 (17:09 +0000)]
Clear inline caches if a ProfilingInfo gets revived.
This avoids stalled class references.
Bug:
27398183
Bug:
23128949
Bug:
26846185
Change-Id: I9539215241708e26fef887e02201ce1feabc2d1a
Aart Bik [Tue, 1 Mar 2016 23:16:54 +0000 (15:16 -0800)]
Simplified intrinsic macro mechanism.
Rationale:
Reduces boiler-plate code in all intrinsics code generators.
Also, the newly introduced "unreachable" macro provides a
static verifier that we do not have unreachable and thus
redundant code in the generators. In fact, this change
exposes that the MIPS32 and MIPS64 rotation intrinsics
(IntegerRotateRight, LongRotateRight, IntegerRotateLeft,
LongRotateLeft) are unreachable, since they are handled
as HIR constructs for all architectures. Thus the code
can be removed.
Change-Id: I0309799a0db580232137ded72bb8a7bbd45440a8
David Brazdil [Wed, 2 Mar 2016 16:41:33 +0000 (16:41 +0000)]
Merge "Improve Checker error messages"
Nicolas Geoffray [Wed, 2 Mar 2016 16:39:08 +0000 (16:39 +0000)]
Merge "Revert "Revert "Use the interpreter as a heartbeat for the JIT."""
Nicolas Geoffray [Wed, 2 Mar 2016 12:05:30 +0000 (12:05 +0000)]
Revert "Revert "Use the interpreter as a heartbeat for the JIT.""
Bug:
27398183
Bug:
23128949
Bug:
26846185
This reverts commit
a96917a6983a5abbe973255a3846fda549fb1657.
Change-Id: I5c4f0d87d3293a6a7ab56a33396670704b66a347
David Brazdil [Wed, 2 Mar 2016 16:09:46 +0000 (16:09 +0000)]
Improve Checker error messages
Now prints the offending Checker line and variable values.
Change-Id: Id4395083de6ddddbd69f66cb7ba38c943146799a
Alexey Frunze [Wed, 3 Feb 2016 04:25:45 +0000 (20:25 -0800)]
Fast ART MIPS64 interpreter
Change-Id: I5dda522df0acf9f9df626fe4f5ecfe6c4df600d3
Bill Buzbee [Wed, 2 Mar 2016 15:53:46 +0000 (15:53 +0000)]
Merge "ART: Enable JitProfiling for x86_64 Mterp"
David Brazdil [Wed, 2 Mar 2016 15:44:34 +0000 (15:44 +0000)]
Merge "oatdump: Add option to print just the header"
David Brazdil [Wed, 2 Mar 2016 12:18:03 +0000 (12:18 +0000)]
oatdump: Add option to print just the header
Sometimes that's all one needs.
Change-Id: I0c442ed32f1662ad0b37dc2fccedd964ed1b1466
David Brazdil [Wed, 2 Mar 2016 13:27:06 +0000 (13:27 +0000)]
Merge "Fix one more Checker test after switch to Jack"
David Brazdil [Wed, 2 Mar 2016 13:25:57 +0000 (13:25 +0000)]
Fix one more Checker test after switch to Jack
Bug:
25635944
Change-Id: I61780b3505104f2b8a62bc2dee889b8cd444c696
David Brazdil [Wed, 2 Mar 2016 11:41:54 +0000 (11:41 +0000)]
Merge "ART: Switch Checker run-tests to Jack"
David Brazdil [Mon, 29 Feb 2016 09:14:51 +0000 (09:14 +0000)]
ART: Switch Checker run-tests to Jack
Bug:
25635944
Change-Id: Ic6774028025b51f54589e9625003e8f69cf39dea
Nicolas Geoffray [Wed, 2 Mar 2016 10:27:22 +0000 (10:27 +0000)]
Merge "Revert "ART: Allow unwinding unattached threads""
Nicolas Geoffray [Wed, 2 Mar 2016 10:27:01 +0000 (10:27 +0000)]
Revert "ART: Allow unwinding unattached threads"
This reverts commit
f7286721a51c772b2abb42fef5bc0d2548df2372.
Change-Id: I6c96ece063041e94d40a96bdd054f89cd7875ade
Nicolas Geoffray [Wed, 2 Mar 2016 09:39:06 +0000 (09:39 +0000)]
Merge "Give the JIT its own arena pool to avoid lock contentions."
Sebastien Hertz [Wed, 2 Mar 2016 09:19:03 +0000 (09:19 +0000)]
Merge "More run-test with Jack"
Nicolas Geoffray [Wed, 2 Mar 2016 08:33:33 +0000 (08:33 +0000)]
Merge "Disable test after libunwind change."
Nicolas Geoffray [Wed, 2 Mar 2016 08:30:44 +0000 (08:30 +0000)]
Disable test after libunwind change.
Change that broke it:
https://android-review.googlesource.com/205606
bug:
27391690
Change-Id: I73c545619a6a1bb03e49120466ac91686363230f
Serguei Katkov [Fri, 26 Feb 2016 07:00:40 +0000 (13:00 +0600)]
ART: Enable JitProfiling for x86_64 Mterp
Adds branch profiling and enables for x86_64.
Support interpreter switching in x86_64 mterp.
Change-Id: I0cb9fcf3e2a01e411d84efc78449e86c10e6bcac
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Dan Willemsen [Tue, 1 Mar 2016 05:09:08 +0000 (21:09 -0800)]
Remove references to $(ACP)
We're changing the implementation of these macros to not use acp.
Instead of having to keep this in sync, move to using a standard
prebuilt module. The build system has been updated to explicitly add the
executable bit to prebuilt modules in the EXECUTABLES class.
Change-Id: I29cf4d48619e022b7da65ef2df05a92bed08a456
Andreas Gampe [Wed, 2 Mar 2016 05:00:05 +0000 (05:00 +0000)]
Merge "ART: Allow unwinding unattached threads"
Mathieu Chartier [Wed, 2 Mar 2016 02:39:49 +0000 (02:39 +0000)]
Merge "Revert "Disable flaky 130-hprof test.""
Mathieu Chartier [Wed, 2 Mar 2016 01:40:55 +0000 (17:40 -0800)]
Revert "Disable flaky 130-hprof test."
Bug:
27337759
This reverts commit
2f0d3bc12f9ade80f4d3c21b7c4aad2cfe10f19e.
Mathieu Chartier [Wed, 2 Mar 2016 01:40:52 +0000 (01:40 +0000)]
Merge "Fix allocation tracking race"
Mathieu Chartier [Tue, 1 Mar 2016 02:13:38 +0000 (18:13 -0800)]
Fix allocation tracking race
Check if changed from uninstrumented to instrumented during GC for
alloc. If we changed, retry the allocation with kInstrumented = true.
Added stress test.
Bug:
27337759
Change-Id: Iaad7977693c9ed927f779a66b29cd58341a837da
Andreas Gampe [Tue, 1 Mar 2016 23:30:10 +0000 (23:30 +0000)]
Merge "Lower JIT thread priority"
David Brazdil [Tue, 1 Mar 2016 22:55:18 +0000 (22:55 +0000)]
Merge "ART: Fix overlapping instruction IDs in inliner"
David Brazdil [Mon, 29 Feb 2016 16:53:33 +0000 (16:53 +0000)]
ART: Fix overlapping instruction IDs in inliner
Inliner creates the inner graph so that it generates instruction IDs
higher than the outer graph. This was broken because the inliner
would create instructions in the outer graph before the inner graph
is inlined.
The bug cannot be triggered because the offending instruction would
share the same ID as the first inner HLocal, which is removed before
the inner graph is inlined. The added DCHECKs reveal the hidden problem
and make it safe for HLocals to be removed in the future.
Change-Id: I486eb0f3987e20c50cbec0fb06332229e07fbae9