OSDN Git Service
Hiroshi Yamauchi [Tue, 8 Mar 2016 23:59:49 +0000 (23:59 +0000)]
Merge "Fix valgrind errors with MemMap::Sync()."
Hiroshi Yamauchi [Tue, 8 Mar 2016 23:17:21 +0000 (15:17 -0800)]
Fix valgrind errors with MemMap::Sync().
This fixes valgrind-test-art-host-gtest-oat_test and one error in
valgrind-test-art-host-gtest-image_test32.
Valgrind doesn't like it if an address range that contains noaccess or
uninitialized memory is passed to msync(). Temporarily lift the noaccess
protection of the lower-end redzone because msync accepts a page-aligned
base address only and exclude the higher-end noaccess redzone from the
range.
Bug:
27552451
Bug:
27384445
Change-Id: I8ccbd04c62eb30f6c6d5c732f1eb254fa09a417a
Andreas Gampe [Tue, 8 Mar 2016 18:26:02 +0000 (18:26 +0000)]
Merge "ART: Use the right ElfBuilder for oatdump symbolizer"
am:
2f6ad55a3b
* commit '
2f6ad55a3bfa16867146233e1eb8b822b1daab4b':
ART: Use the right ElfBuilder for oatdump symbolizer
David Srbecky [Tue, 8 Mar 2016 18:15:20 +0000 (18:15 +0000)]
Merge "ART: Use the right ElfBuilder for oatdump symbolizer"
Andreas Gampe [Tue, 8 Mar 2016 00:31:34 +0000 (16:31 -0800)]
ART: Use the right ElfBuilder for oatdump symbolizer
We should not unconditionally output 32-bit ELF files.
Bug:
27293423
Change-Id: Ibbb74a7807b24c46cb23d7b5867936569424e8fe
David Srbecky [Tue, 8 Mar 2016 15:01:47 +0000 (15:01 +0000)]
Merge "Propagate InstructionSetFeatures to ElfBuilder."
am:
ce51701b06
* commit '
ce51701b0621754a81125df3ed62e07c0497cafd':
Propagate InstructionSetFeatures to ElfBuilder.
David Srbecky [Tue, 8 Mar 2016 14:58:40 +0000 (14:58 +0000)]
Merge "Propagate InstructionSetFeatures to ElfBuilder."
Narayan Kamath [Tue, 8 Mar 2016 13:54:15 +0000 (13:54 +0000)]
Merge "Revert "Suppress ArrayDequeTest#testForEachRemaining temporarily.""
am:
60a765f678
* commit '
60a765f6781a59d782ebcf99691aa614b6e610d3':
Revert "Suppress ArrayDequeTest#testForEachRemaining temporarily."
Narayan Kamath [Tue, 8 Mar 2016 13:50:37 +0000 (13:50 +0000)]
Merge "Revert "Suppress ArrayDequeTest#testForEachRemaining temporarily.""
Narayan Kamath [Mon, 7 Mar 2016 10:57:34 +0000 (10:57 +0000)]
Revert "Suppress ArrayDequeTest#testForEachRemaining temporarily."
This reverts commit
98c38e34357a73c46ad7a735dd23da0ba29a2963.
Fixed by commit
3de87b847fa94cce9beaf5b225404c1bc7ec475f.
Change-Id: If38f1e67dd8504055236bb8a9703d8c2eb61d16c
David Srbecky [Tue, 8 Mar 2016 13:21:22 +0000 (13:21 +0000)]
Propagate InstructionSetFeatures to ElfBuilder.
This is subset of CL171665 and it separates it into two.
It will be needed to generate .MIPS.abiflags ELF section.
Change-Id: I5557e7cb98d0fa1dc57c85cf6161e119c6d50a1a
Roland Levillain [Tue, 8 Mar 2016 11:46:47 +0000 (11:46 +0000)]
Merge "Re-enable test that was causing TimeoutExceptions on ARM64."
am:
dddb767f59
* commit '
dddb767f59bd67bb9c3d4c38916f64a71f060e40':
Re-enable test that was causing TimeoutExceptions on ARM64.
Roland Levillain [Tue, 8 Mar 2016 11:42:24 +0000 (11:42 +0000)]
Merge "Re-enable test that was causing TimeoutExceptions on ARM64."
Roland Levillain [Tue, 8 Mar 2016 11:22:02 +0000 (11:22 +0000)]
Re-enable test that was causing TimeoutExceptions on ARM64.
The libcore test libcore.java.lang.OldSystemTest#test_gc has
been failing with a java.util.concurrent.TimeoutException on
ART Builbot's ARM64 concurrent collector configuration. No
longer ignore this failure to see whether recent changes
(namely https://android-review.googlesource.com/#/c/204125)
fixed the issue.
Bug:
26155567
Change-Id: I5cd3c3956cfd510bab1cb9d3b9479560f9703e6d
Mathieu Chartier [Tue, 8 Mar 2016 02:52:01 +0000 (02:52 +0000)]
Merge "Fix lock order violation"
am:
943a70f416
* commit '
943a70f416ba19b0b05265ecca526311a6ae330c':
Fix lock order violation
Mathieu Chartier [Tue, 8 Mar 2016 02:47:28 +0000 (02:47 +0000)]
Merge "Fix lock order violation"
Mathieu Chartier [Tue, 8 Mar 2016 01:41:39 +0000 (17:41 -0800)]
Fix lock order violation
Release class linker lock before acquiring heap bitmap lock.
Bug:
27493510
(cherry picked from commit
064e9d401c49d3789b5deeeb6b423a4f551e4206)
Change-Id: I7809e0f591513b85d295d43e639152ce92984f9c
Hiroshi Yamauchi [Tue, 8 Mar 2016 01:04:04 +0000 (01:04 +0000)]
Merge "Try to reenable some libcore tests with CC."
am:
4015a34900
* commit '
4015a3490066c493424ff8c57d6b814cdc49f40c':
Try to reenable some libcore tests with CC.
Hiroshi Yamauchi [Tue, 8 Mar 2016 00:52:55 +0000 (00:52 +0000)]
Merge "Try to reenable some libcore tests with CC."
Hiroshi Yamauchi [Tue, 8 Mar 2016 00:46:23 +0000 (16:46 -0800)]
Try to reenable some libcore tests with CC.
CL 204125 may have fixed them.
Bug:
26711853
Change-Id: I8c8052520982f80d8466922f3de6d3805073ae26
Aart Bik [Tue, 8 Mar 2016 00:05:02 +0000 (00:05 +0000)]
Merge "Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test."
am:
0310fb0279
* commit '
0310fb0279d283439633b7c32801f2bb9443dbe1':
Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test.
Aart Bik [Mon, 7 Mar 2016 23:51:12 +0000 (23:51 +0000)]
Merge "Unsafe: Recognize intrinsics for 1.8 java.util.concurrent With unit test."
Mathieu Chartier [Mon, 7 Mar 2016 22:47:21 +0000 (22:47 +0000)]
Merge "Add systrace logging to ScopedCodeCacheWrite"
am:
9dd26b2e68
* commit '
9dd26b2e68ce2b153fc7c5c6b0ad6458a60ea6f5':
Add systrace logging to ScopedCodeCacheWrite
Igor Murashkin [Mon, 7 Mar 2016 22:45:32 +0000 (22:45 +0000)]
Merge "runtime: Add CAS and fences to sun.misc.Unsafe"
am:
83537c6e2f
* commit '
83537c6e2fe6518e0581a8466ef41e90ea7b5516':
runtime: Add CAS and fences to sun.misc.Unsafe
Mathieu Chartier [Mon, 7 Mar 2016 22:45:04 +0000 (22:45 +0000)]
Merge "Add systrace logging to ScopedCodeCacheWrite"
Mathieu Chartier [Mon, 7 Mar 2016 21:48:08 +0000 (13:48 -0800)]
Add systrace logging to ScopedCodeCacheWrite
Shows if we are taking a long time to mprotect.
Bug:
27502458
(cherry picked from commit
462cd2cfa8c5fbb6548419eb8f27b448a12aca11)
Change-Id: Ic0f24641f5856b13f3b949dcd53dc01ec952d171
Igor Murashkin [Mon, 7 Mar 2016 22:37:43 +0000 (22:37 +0000)]
Merge "runtime: Add CAS and fences to sun.misc.Unsafe"
Hiroshi Yamauchi [Mon, 7 Mar 2016 22:29:42 +0000 (22:29 +0000)]
Merge changes I70f61fe3,I00376b02
am:
f81f596c58
* commit '
f81f596c586dd0de32d336468e22e6fef8257f9b':
Revert "ProfilingInfo roots should be visited by the declaring class."
Revert "Query declaring class before querying IsNative."
Aart Bik [Fri, 4 Mar 2016 20:08:31 +0000 (12:08 -0800)]
Unsafe: Recognize intrinsics for 1.8 java.util.concurrent
With unit test.
Rationale:
Recognizing the 1.8 methods as intrinsics is the first step
towards providing efficient implementation on all architectures.
Where not implemented (everywhere for now), the methods fall back
to the JNI native or reference implementation.
NOTE: needs iam's CL first!
bug=
26264765
Change-Id: Ife65e81689821a16cbcdd2bb2d35641c6de6aeb6
Hiroshi Yamauchi [Mon, 7 Mar 2016 22:25:09 +0000 (22:25 +0000)]
Merge changes I70f61fe3,I00376b02
* changes:
Revert "ProfilingInfo roots should be visited by the declaring class."
Revert "Query declaring class before querying IsNative."
Hiroshi Yamauchi [Mon, 7 Mar 2016 21:56:33 +0000 (13:56 -0800)]
Revert "ProfilingInfo roots should be visited by the declaring class."
This reverts commit
9a3be989d0aee1a6998e33813c7f70906d27f89a.
Superceded by CL 206308.
Bug:
27435111
Hiroshi Yamauchi [Mon, 7 Mar 2016 21:55:31 +0000 (13:55 -0800)]
Revert "Query declaring class before querying IsNative."
This reverts commit
26329cd578efe9cd7e60c46fef1bfb549062a283.
Superceded by CL 206308.
Bug:
27435111
Mathieu Chartier [Mon, 7 Mar 2016 21:32:36 +0000 (21:32 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds"
am:
35e0cbce51
* commit '
35e0cbce516db91aaa77bfc39f797d9848a091c0':
Increase kDumpWaitTimeout 10x for target builds
Mathieu Chartier [Mon, 7 Mar 2016 21:32:26 +0000 (21:32 +0000)]
Merge "Don\'t use ScopedObjectAccess in Heap::DumpSpaces"
am:
e88430786e
* commit '
e88430786ebad58be2eda97905849c1b8ffd8ed4':
Don't use ScopedObjectAccess in Heap::DumpSpaces
Mathieu Chartier [Mon, 7 Mar 2016 21:29:32 +0000 (21:29 +0000)]
Merge "Increase kDumpWaitTimeout 10x for target builds"
Mathieu Chartier [Mon, 7 Mar 2016 21:29:15 +0000 (21:29 +0000)]
Merge "Don't use ScopedObjectAccess in Heap::DumpSpaces"
Mathieu Chartier [Mon, 7 Mar 2016 19:59:01 +0000 (11:59 -0800)]
Increase kDumpWaitTimeout 10x for target builds
New timeout is 100s, the old one was occasionally hit by overloaded
device. This caused a confusing crash in the barrier destructor
since not all the threads had went through the barrier yet.
Bug:
27334917
(cherry picked from commit
74bdab0b14c592053ff71654ab51a0f116114a42)
Change-Id: I24cf6eb6858ad93a47446aa6bbc18942a71b191e
Mathieu Chartier [Mon, 7 Mar 2016 18:25:04 +0000 (10:25 -0800)]
Don't use ScopedObjectAccess in Heap::DumpSpaces
ScopedObjectAccess does not work well if the mutator lock is
excusively held while in a suspend thread state. This caused
deadlocks and DCHECK failures.
Bug:
27493316
(cherry picked from commit
03d21bc5bed887243ff6ce3531179185ffd3532c)
Change-Id: I5d67f74fc7082761e45dc1d7778b0ea7fceaaf8f
Igor Murashkin [Fri, 19 Feb 2016 22:56:43 +0000 (14:56 -0800)]
runtime: Add CAS and fences to sun.misc.Unsafe
Bug:
26264765
Change-Id: I68b482e5f9a0a26419af5e58a8d67c8c8a8e01a9
Vladimir Marko [Mon, 7 Mar 2016 18:38:59 +0000 (18:38 +0000)]
Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
am:
810ef37680
* commit '
810ef3768021b5fc7b47e663e037e49c46f8c916':
ART: Fix RegTypeCache::FromUnresolvedMerge().
Vladimir Marko [Mon, 7 Mar 2016 17:50:17 +0000 (17:50 +0000)]
Merge "ART: Fix RegTypeCache::FromUnresolvedMerge()."
Roland Levillain [Mon, 7 Mar 2016 16:54:56 +0000 (16:54 +0000)]
Merge "Typo in comment in MIPS32 mterp."
am:
03e31fc04a
* commit '
03e31fc04a5cf642963ec16311f62071c7d99f21':
Typo in comment in MIPS32 mterp.
Alexey Frunze [Mon, 7 Mar 2016 16:54:38 +0000 (16:54 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp"
am:
6589d4523d
* commit '
6589d4523d7a6f408eec36b02bac04437bf56f39':
ART: Enable JitProfiling for MIPS64 Mterp
Nicolas Geoffray [Mon, 7 Mar 2016 16:54:28 +0000 (16:54 +0000)]
Merge "Add some debugging for zygote crash."
am:
93e83d34fd
* commit '
93e83d34fd5dad284d561c4180c366b325980f57':
Add some debugging for zygote crash.
Nicolas Geoffray [Mon, 7 Mar 2016 16:54:17 +0000 (16:54 +0000)]
Merge "Workaround for broken \'ps\' command on M."
am:
b5d31327b2
* commit '
b5d31327b2fa96918a255f78a930f64759fa3130':
Workaround for broken 'ps' command on M.
Sebastien Hertz [Mon, 7 Mar 2016 16:54:06 +0000 (16:54 +0000)]
Merge "Support multidex run-test with Jack"
am:
5521889254
* commit '
5521889254742401128d3eaa5057d2127a1debe7':
Support multidex run-test with Jack
Jean-Philippe Halimi [Mon, 7 Mar 2016 16:53:52 +0000 (16:53 +0000)]
Merge "Remove useless map in SwapAllocator"
am:
8a8c84114b
* commit '
8a8c84114b16b8971bc2d3c5c7e0e31470d1a68b':
Remove useless map in SwapAllocator
Roland Levillain [Mon, 7 Mar 2016 16:50:27 +0000 (16:50 +0000)]
Merge "Typo in comment in MIPS32 mterp."
Bill Buzbee [Mon, 7 Mar 2016 15:59:30 +0000 (15:59 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp"
Nicolas Geoffray [Mon, 7 Mar 2016 15:52:48 +0000 (15:52 +0000)]
Merge "Add some debugging for zygote crash."
Nicolas Geoffray [Mon, 7 Mar 2016 15:44:08 +0000 (15:44 +0000)]
Add some debugging for zygote crash.
bug:
27340451
Change-Id: I212567b18959ab4dc7f1dbde2e6d4ff60fe7bed2
Nicolas Geoffray [Mon, 7 Mar 2016 14:09:04 +0000 (14:09 +0000)]
Merge "Workaround for broken 'ps' command on M."
Sebastien Hertz [Mon, 7 Mar 2016 13:57:09 +0000 (13:57 +0000)]
Merge "Support multidex run-test with Jack"
Nicolas Geoffray [Mon, 7 Mar 2016 13:33:37 +0000 (13:33 +0000)]
Workaround for broken 'ps' command on M.
Change-Id: Ifabc6bb2b0e3780306e8a3ad45531c50c7627ed1
Vladimir Marko [Mon, 7 Mar 2016 12:32:05 +0000 (12:32 +0000)]
ART: Fix RegTypeCache::FromUnresolvedMerge().
Do not assume that the BitVector memory is zero-initialized.
Also fix reg_type_test memory leaks reported by valgrind by
constructing ArenaStack and ScopedArenaAllocator in each
individual test.
Bug:
27500678
Change-Id: Ic6b2b6ebeab2c5c6e993a0232c5d4a0159aabea3
Vladimir Marko [Mon, 7 Mar 2016 11:32:53 +0000 (11:32 +0000)]
Merge "Remove useless map in SwapAllocator"
Sebastien Hertz [Thu, 3 Mar 2016 17:08:17 +0000 (18:08 +0100)]
Support multidex run-test with Jack
Updates default-build script to compile multidex run-tests with
Jack. Such test needs a 'multidex.jpp' file specifying how to
partition classes in the output dex files (mainly how to stick some
classes in the classes.dex file and others in a classes2.dex file).
Bug:
19467889
Change-Id: I2500967ba951218c5b03166b3586a576d6dc8749
Chris Larsen [Sat, 5 Mar 2016 03:24:49 +0000 (03:24 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics."
am:
e61f01bdc5
* commit '
e61f01bdc5a25cf37d0e43689dd4ed43932556dc':
MIPS64: Implement isInfinite intrinsics.
Andreas Gampe [Sat, 5 Mar 2016 03:19:46 +0000 (03:19 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics."
Chris Larsen [Tue, 16 Feb 2016 20:35:04 +0000 (12:35 -0800)]
MIPS64: Implement isInfinite intrinsics.
- boolean java.lang.Float.isInfinite(float)
- boolean java.lang.Double.isInfinite(double)
Change-Id: I8e94a9cc462e6b1cf99bb14b17c1ff009c9c29a4
Mathieu Chartier [Sat, 5 Mar 2016 02:47:17 +0000 (02:47 +0000)]
Merge "Add more systracing everywhere"
am:
dc97e3c4b4
* commit '
dc97e3c4b4524467908b4d71e10084a5077586ee':
Add more systracing everywhere
Mathieu Chartier [Sat, 5 Mar 2016 02:43:06 +0000 (02:43 +0000)]
Merge "Add more systracing everywhere"
Mathieu Chartier [Fri, 4 Mar 2016 22:58:03 +0000 (14:58 -0800)]
Add more systracing everywhere
Added to:
JIT
DexFile functions
Oat file manager
Added helper ScopedTrace to prevent errors and reduce excess code.
Bug:
27502458
(cherry picked from commit
dabdc0fe183d4684f3cf4d70cb09d318cff81b42)
Change-Id: Ifaeff8913d79eefc797380987d13cc00456266f8
Mathieu Chartier [Sat, 5 Mar 2016 02:16:00 +0000 (02:16 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace"
am:
c71dc3852e
* commit '
c71dc3852edfa8e0cd2083d12845ff8607e189ff':
Remove no thread suspension assert in AddImageSpace
Mathieu Chartier [Sat, 5 Mar 2016 02:12:37 +0000 (02:12 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace"
Mathieu Chartier [Sat, 5 Mar 2016 00:39:33 +0000 (16:39 -0800)]
Remove no thread suspension assert in AddImageSpace
Heap::VisitObjects may cause thread suspension for the CC case.
Change-Id: Ibd495690b87dc8731919e1b1164be834c9da02b2
Mathieu Chartier [Sat, 5 Mar 2016 01:05:13 +0000 (01:05 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject"
am:
cad8657a6c
* commit '
cad8657a6c30ec615df5bf8a59a4222f4849d0a2':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
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:38:16 +0000 (21:38 +0000)]
Merge "Only visit app image classes in class loader"
am:
42e84e007e
* commit '
42e84e007ea69eefd871646a863cdae796ae3428':
Only visit app image classes in class loader
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:26:26 +0000 (17:26 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks"
am:
3040f4ae0b
* commit '
3040f4ae0bf9d8ebe0e7e43f4843929f7a4da4d9':
ART: Fix UTF test and monitor pool old chunks
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:18:10 +0000 (17:18 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info."
am:
1c6f902c28
* commit '
1c6f902c28f7090cbc88be79119e2151edfea883':
Cache DexRegisterMaps when writing native debug info.
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:48:06 +0000 (16:48 +0000)]
Merge "Query declaring class before querying IsNative."
am:
b4d1d7217c
* commit '
b4d1d7217cf13e199650f1d8d18b3176714f6500':
Query declaring class before querying IsNative.
buzbee [Fri, 4 Mar 2016 16:46:06 +0000 (16:46 +0000)]
Merge "ART: Update arm assembly to use current syntax"
am:
fd409de54c
* commit '
fd409de54c59fda03453f4b1558aa82679b891af':
ART: Update arm assembly to use current syntax
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:33:48 +0000 (16:33 +0000)]
Merge "Fix very rare bug around JIT code cache collection."
am:
03f9e6bbda
* commit '
03f9e6bbdaf3cd6367176afe373ec6aab27b7c46':
Fix very rare bug around JIT code cache collection.
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:17:29 +0000 (16:17 +0000)]
Merge "Ignore 145-alloc-tracking-stress failures in interpreter with CC."
am:
dd6c73a3b5
* commit '
dd6c73a3b5a7eda84ede063832a5a12dff6f7ccd':
Ignore 145-alloc-tracking-stress failures in interpreter with CC.
Scott Wakeling [Fri, 4 Mar 2016 16:17:18 +0000 (16:17 +0000)]
Merge "ARM64: Implement SystemArrayCopyChar intrinsic."
am:
f51a235db3
* commit '
f51a235db3cc167db27a7c447a28655e7e37c320':
ARM64: Implement SystemArrayCopyChar intrinsic.
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
Roland Levillain [Fri, 4 Mar 2016 15:55:51 +0000 (15:55 +0000)]
Typo in comment in MIPS32 mterp.
Change-Id: I2a54b94a5a4451e085ecc575db1742a4478839a6
Nicolas Geoffray [Fri, 4 Mar 2016 15:50:48 +0000 (15:50 +0000)]
Merge "Make sure we keep adb logs on buildbots."
am:
867a7c7330
* commit '
867a7c7330b74d258878894364c9493bf803aace':
Make sure we keep adb logs on buildbots.
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:44:18 +0000 (15:44 +0000)]
Merge "Re-enable CFI test for compressed symbols."
am:
04ca0a728d
* commit '
04ca0a728db465311f1bcf43e87df39dcc104fcd':
Re-enable CFI test for compressed symbols.
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
Narayan Kamath [Fri, 4 Mar 2016 14:49:14 +0000 (14:49 +0000)]
Merge "Suppress ArrayDequeTest#testForEachRemaining temporarily."
am:
e8e56f26fb
* commit '
e8e56f26fbaf8c3cd5ab046f8e13d24de494ffda':
Suppress ArrayDequeTest#testForEachRemaining temporarily.
Nicolas Geoffray [Fri, 4 Mar 2016 14:45:28 +0000 (14:45 +0000)]
Merge "Suppress ArrayDequeTest#testForEachRemaining temporarily."