OSDN Git Service
Roland Levillain [Mon, 7 Mar 2016 16:57:09 +0000 (16:57 +0000)]
Merge "Typo in comment in MIPS32 mterp." am:
03e31fc04a
am:
a6bacf2aaa
* commit '
a6bacf2aaa89800009de1e6be87aaaeb8660c595':
Typo in comment in MIPS32 mterp.
Alexey Frunze [Mon, 7 Mar 2016 16:56:51 +0000 (16:56 +0000)]
Merge "ART: Enable JitProfiling for MIPS64 Mterp" am:
6589d4523d
am:
0a0884a915
* commit '
0a0884a91559709c6b9edc4443b022cd19d991a0':
ART: Enable JitProfiling for MIPS64 Mterp
Nicolas Geoffray [Mon, 7 Mar 2016 16:56:31 +0000 (16:56 +0000)]
Merge "Add some debugging for zygote crash." am:
93e83d34fd
am:
1d6adcdc08
* commit '
1d6adcdc08aae157b36dfda8163e96055a00ba36':
Add some debugging for zygote crash.
Nicolas Geoffray [Mon, 7 Mar 2016 16:56:05 +0000 (16:56 +0000)]
Merge "Workaround for broken \'ps\' command on M." am:
b5d31327b2
am:
c7576ae0cb
* commit '
c7576ae0cb2ad044ebf911ad09188fd690785c93':
Workaround for broken 'ps' command on M.
Sebastien Hertz [Mon, 7 Mar 2016 16:55:56 +0000 (16:55 +0000)]
Merge "Support multidex run-test with Jack" am:
5521889254
am:
6b2239aca2
* commit '
6b2239aca2e57e1de6a9c9ca0a97925dcc336935':
Support multidex run-test with Jack
Jean-Philippe Halimi [Mon, 7 Mar 2016 16:55:43 +0000 (16:55 +0000)]
Merge "Remove useless map in SwapAllocator" am:
8a8c84114b
am:
9c3fb79b5a
* commit '
9c3fb79b5ac82d5d3d58ba77c410c4868739cfb6':
Remove useless map in SwapAllocator
Nicolas Geoffray [Mon, 7 Mar 2016 16:55:12 +0000 (16:55 +0000)]
Merge "Add some debugging for zygote crash." into nyc-dev
am:
0738bffaf6
* commit '
0738bffaf6983f998733e3211072b3ba792fd42b':
Add some debugging for zygote crash.
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:54:45 +0000 (15:54 +0000)]
Merge "Add some debugging for zygote crash." into nyc-dev
Nicolas Geoffray [Mon, 7 Mar 2016 15:44:08 +0000 (15:44 +0000)]
Add some debugging for zygote crash.
bug:
27340451
(cherry picked from commit
de166544d6539942d3507ce47910f601c97b7532)
Change-Id: Ie4400064d81e260b41bd1408a9ed54be8ca0479e
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 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:26:49 +0000 (03:26 +0000)]
Merge "MIPS64: Implement isInfinite intrinsics." am:
e61f01bdc5
am:
8e0f4b3657
* commit '
8e0f4b3657552a15c8208c52f7021bb91ce2d3b1':
MIPS64: Implement isInfinite intrinsics.
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:49:18 +0000 (02:49 +0000)]
Merge "Add more systracing everywhere" am:
dc97e3c4b4
am:
0a3a067d3a
* commit '
0a3a067d3a7ed0e395b5479a1c7288f43ec44bae':
Add more systracing everywhere
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:36:57 +0000 (02:36 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" into nyc-dev
am:
67480f2864
* commit '
67480f2864510ba92f282c69604e4b1759baf6b4':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
Mathieu Chartier [Sat, 5 Mar 2016 02:33:27 +0000 (02:33 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" into nyc-dev
Mathieu Chartier [Sat, 5 Mar 2016 02:18:17 +0000 (02:18 +0000)]
Merge "Remove no thread suspension assert in AddImageSpace" am:
c71dc3852e
am:
82bdbde3d1
* commit '
82bdbde3d1bbf3b59fd028a10ea86aa15de6c9c4':
Remove no thread suspension assert in AddImageSpace
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:13:59 +0000 (02:13 +0000)]
Merge "Add more systracing everywhere" into nyc-dev
am:
c5b94f821a -s ours
* commit '
c5b94f821a64bb285618e3dc92b43e7b552d55f6':
Add more systracing everywhere
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 02:06:07 +0000 (02:06 +0000)]
Merge "Add more systracing everywhere" into nyc-dev
Mathieu Chartier [Sat, 5 Mar 2016 01:07:12 +0000 (01:07 +0000)]
Merge "Use MarkIfNotInToSpace for SemiSpace::MarkObject" am:
cad8657a6c
am:
5ba93bd945
* commit '
5ba93bd94581c8af554735f7f5b28410db8a2837':
Use MarkIfNotInToSpace for SemiSpace::MarkObject
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 [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
(cherry picked from commit
9a9aee662ebde18bed2a8e263c921df4f529b27b)
Change-Id: I2387a6efaed79d37f2ee47725637af29e78e3548
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 [Sat, 5 Mar 2016 00:17:47 +0000 (00:17 +0000)]
Fix potential linear alloc memory leak
am:
f28a99a90b
* commit '
f28a99a90b68e45f39191258832e7a526c4742ba':
Fix potential linear alloc memory leak
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
Bug:
22858531
(cherry picked from commit
5b83050affa6a3b1d3863c0b903f9d48fe4aefb2)
Change-Id: I71b650eac4e33212a7f03c43141db99e635a19ad
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
Change-Id: Ifaeff8913d79eefc797380987d13cc00456266f8
Mathieu Chartier [Fri, 4 Mar 2016 21:58:30 +0000 (21:58 +0000)]
Only visit app image classes in class loader
am:
88027bd681
* commit '
88027bd6810b9a5b785dba5396eec5301e4540b2':
Only visit app image classes in class loader
Mathieu Chartier [Fri, 4 Mar 2016 21:40:10 +0000 (21:40 +0000)]
Merge "Only visit app image classes in class loader" am:
42e84e007e
am:
4923de4099
* commit '
4923de4099eb8c790166f60b8b59b196c73cb730':
Only visit app image classes in class loader
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 [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
(cherry picked from commit
6973100705716bffce3768a8a0908d7ca1d02ec1)
Change-Id: Ib05364c44f2b943e3341ef2b1dd43337833de143
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:28:26 +0000 (17:28 +0000)]
Merge "ART: Fix UTF test and monitor pool old chunks" am:
3040f4ae0b
am:
4d088c5c85
* commit '
4d088c5c85ff908b2dcaba75067d0d3dc2e89465':
ART: Fix UTF test and monitor pool old chunks
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:20:10 +0000 (17:20 +0000)]
Merge "Cache DexRegisterMaps when writing native debug info." am:
1c6f902c28
am:
8bd2af6f1f
* commit '
8bd2af6f1fadf7f116926ac0859d94e7b1233d0e':
Cache DexRegisterMaps when writing native debug info.
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:50:04 +0000 (16:50 +0000)]
Merge "Query declaring class before querying IsNative." am:
b4d1d7217c
am:
85b4c816b8
* commit '
85b4c816b8b53b0b1339dda7b20200ea88d42fbc':
Query declaring class before querying IsNative.
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:48:06 +0000 (16:48 +0000)]
Merge "ART: Update arm assembly to use current syntax" am:
fd409de54c
am:
68a4e763fa
* commit '
68a4e763fa92973d1222ae04a18d2cc9dbe5e632':
ART: Update arm assembly to use current syntax
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:35:44 +0000 (16:35 +0000)]
Merge "Fix very rare bug around JIT code cache collection." am:
03f9e6bbda
am:
2c747f0f4b
* commit '
2c747f0f4b2ecbf121c1b19bf0b713c1bbbddad5':
Fix very rare bug around JIT code cache collection.
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:19:35 +0000 (16:19 +0000)]
Merge "Ignore 145-alloc-tracking-stress failures in interpreter with CC." am:
dd6c73a3b5
am:
10d3e43dd0
* commit '
10d3e43dd0af5865d798be50441e3a5b6e6dbc1c':
Ignore 145-alloc-tracking-stress failures in interpreter with CC.
Scott Wakeling [Fri, 4 Mar 2016 16:19:17 +0000 (16:19 +0000)]
Merge "ARM64: Implement SystemArrayCopyChar intrinsic." am:
f51a235db3
am:
93c9e7dc56
* commit '
93c9e7dc5622886539bc79c571a6a2f7325771f4':
ARM64: Implement SystemArrayCopyChar intrinsic.
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:52:49 +0000 (15:52 +0000)]
Merge "Make sure we keep adb logs on buildbots." am:
867a7c7330
am:
10fa51baa7
* commit '
10fa51baa71a25333f402c18b708fd9a4281d0e7':
Make sure we keep adb logs on buildbots.
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:46:47 +0000 (15:46 +0000)]
Merge "Re-enable CFI test for compressed symbols." am:
04ca0a728d
am:
37c3c073e0
* commit '
37c3c073e0cc3f2902eb5e82f7bb832a7315d23b':
Re-enable CFI test for compressed symbols.
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:51:16 +0000 (14:51 +0000)]
Merge "Suppress ArrayDequeTest#testForEachRemaining temporarily." am:
e8e56f26fb
am:
2c8b369473
* commit '
2c8b369473ce0c4ce0acb0af5fa6d54db0edfcd7':
Suppress ArrayDequeTest#testForEachRemaining temporarily.
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."
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 12:03:22 +0000 (12:03 +0000)]
Merge "Refine statistics around the JIT." am:
a3ed89f687
am:
59be62a58a
* commit '
59be62a58a4aee192112c5c15c3671102ded6037':
Refine statistics around the JIT.
Nicolas Geoffray [Fri, 4 Mar 2016 12:01:21 +0000 (12:01 +0000)]
Merge "Refine statistics around the JIT."
am:
a3ed89f687
* commit '
a3ed89f687dbaa9b5321b2d38d41b487a4208b80':
Refine statistics around the JIT.
Nicolas Geoffray [Fri, 4 Mar 2016 12:01:21 +0000 (12:01 +0000)]
Merge "Move back the boot image to debuggable." am:
104f22ec88
am:
4a38346d10
* commit '
4a38346d10d77d29b2423648111a33f23bc88b61':
Move back the boot image to debuggable.
Nicolas Geoffray [Fri, 4 Mar 2016 11:59:23 +0000 (11:59 +0000)]
Merge "Move back the boot image to debuggable."
am:
104f22ec88
* commit '
104f22ec881a02b4df88d41e1b89e24151b66cc9':
Move back the boot image to debuggable.
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."