OSDN Git Service
Goran Jakovljevic [Tue, 28 Jun 2016 10:36:19 +0000 (10:36 +0000)]
Merge \"MIPS64: Remove the workaround in VisitInvokeStaticOrDirect\"
am:
d5d0c7b6ab
Change-Id: I6c720caaeee80704339c7022836707c65a4b9180
Treehugger Robot [Tue, 28 Jun 2016 10:29:56 +0000 (10:29 +0000)]
Merge "MIPS64: Remove the workaround in VisitInvokeStaticOrDirect"
Vladimir Marko [Tue, 28 Jun 2016 10:13:25 +0000 (10:13 +0000)]
Merge \"Fix 004-ThreadStress.\"
am:
99376148af
Change-Id: Ifc329644f6039a2563a8d49292f0d51faa12e2af
Goran Jakovljevic [Tue, 28 Jun 2016 10:10:30 +0000 (10:10 +0000)]
Merge \"Optimizing: Do not depend on sharpening in test 450\"
am:
3ce4f88d3c
Change-Id: I511d3219d66d45afd80e3ae5da15a1b631964cda
Vladimir Marko [Tue, 28 Jun 2016 10:07:38 +0000 (10:07 +0000)]
Merge "Fix 004-ThreadStress."
Treehugger Robot [Tue, 28 Jun 2016 10:05:42 +0000 (10:05 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 450"
Alexey Frunze [Tue, 28 Jun 2016 09:56:12 +0000 (09:56 +0000)]
Merge \"MIPS32: Drop redundant moves in integer conversions\"
am:
47fe36d8de
Change-Id: I35818e12007d2e651c23154e9dd8229e9013a1e2
Treehugger Robot [Tue, 28 Jun 2016 09:49:33 +0000 (09:49 +0000)]
Merge "MIPS32: Drop redundant moves in integer conversions"
Vladimir Marko [Tue, 28 Jun 2016 09:05:49 +0000 (09:05 +0000)]
Merge \"Clean up StringReferenceValueComparator and DexFile.\"
am:
05f0167cdd
Change-Id: I58076c6c5df6c5765d565505909f17499281950a
Vladimir Marko [Tue, 28 Jun 2016 08:57:50 +0000 (08:57 +0000)]
Merge "Clean up StringReferenceValueComparator and DexFile."
Nicolas Geoffray [Tue, 28 Jun 2016 08:32:13 +0000 (08:32 +0000)]
Merge \"Revert \"Gray only immune objects mutators access.\"\"
am:
105683791e
Change-Id: I4e8861233e18706fc6a5cf4dfeb7c04288d73d16
Nicolas Geoffray [Tue, 28 Jun 2016 08:26:16 +0000 (08:26 +0000)]
Merge "Revert "Gray only immune objects mutators access.""
Nicolas Geoffray [Tue, 28 Jun 2016 08:25:59 +0000 (08:25 +0000)]
Revert "Gray only immune objects mutators access."
Fails with:
art F 11338 11338 art/runtime/gc/collector/concurrent_copying-inl.h:83] Check failed: !kGrayImmuneObject || updated_all_immune_objects_.LoadRelaxed() || gc_grays_immune_objects_
Bug:
29516465
Bug:
12687968
This reverts commit
16292fcc98f03690576d0739b2e5fb04b375933c.
Change-Id: I1d2d988b7707e03cc94f019cf8bef5b9a9099060
Hiroshi Yamauchi [Tue, 28 Jun 2016 01:27:47 +0000 (01:27 +0000)]
Merge \"Gray only immune objects mutators access.\"
am:
450ee8fe76
Change-Id: I366757c58818264ce10f30cb6d6b7aacdd9e6be4
Treehugger Robot [Tue, 28 Jun 2016 01:20:50 +0000 (01:20 +0000)]
Merge "Gray only immune objects mutators access."
Hiroshi Yamauchi [Tue, 21 Jun 2016 03:23:34 +0000 (20:23 -0700)]
Gray only immune objects mutators access.
To reduce image/zygote dirty pages.
GC doesn't gray immune space objects except when visiting the thread
GC roots of suspended threads during the thread flip. GC updates the
fields of immune space objects without pushing/popping them through
the mark stack. GC sets a bool flag after updating the fields of
immune space objects. After this point, mutators don't need gray to
immune space objects. Removed the mark bitmaps for immune spaces.
Bug:
29516465
Bug:
12687968
Test: art tests, libartd device boot, ritzperf.
Change-Id: Idfcffbdb94dfc8bfc89c30d6aff8888f04990a56
Andreas Gampe [Mon, 27 Jun 2016 22:58:49 +0000 (22:58 +0000)]
Merge \"ART: Disable no-prebuild test for run-test 608\"
am:
6023704356
Change-Id: I4bea5c202a2dbe53f2f8409876da6eff03e0c066
Andreas Gampe [Mon, 27 Jun 2016 22:52:38 +0000 (22:52 +0000)]
Merge "ART: Disable no-prebuild test for run-test 608"
Alexey Frunze [Mon, 27 Jun 2016 22:20:11 +0000 (15:20 -0700)]
MIPS32: Drop redundant moves in integer conversions
Change-Id: I0e3f393d87538eb9e35b3012ea36e81c8b7a225e
Andreas Gampe [Mon, 27 Jun 2016 21:55:02 +0000 (14:55 -0700)]
ART: Disable no-prebuild test for run-test 608
This test relies on unresolved types, which is not the case in a
no-prebuild setting (as all parts will be on the classpath).
Bug:
29433999
Change-Id: I11b1c6b446905aacd7a520796d0b2217319cefc7
Test: m ART_TEST_RUN_TEST_NO_PREBUILD=true test-art-host-run-test
Nicolas Geoffray [Mon, 27 Jun 2016 18:46:46 +0000 (18:46 +0000)]
Merge \"Do not remove loads/store with unresolved accesses.\"
am:
779743a90d
Change-Id: I4e0048ef5043e86cb5cced5c2af5db4a1c78eb58
Treehugger Robot [Mon, 27 Jun 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Do not remove loads/store with unresolved accesses."
Nicolas Geoffray [Mon, 27 Jun 2016 09:03:29 +0000 (10:03 +0100)]
Do not remove loads/store with unresolved accesses.
Due to AOT and compiling classes that are not ready yet
(eg missing a super class), we need to be conservative when
accessing fields and can end up in a situation where the same
field can be resolved and unresolved within the same method
(because of inlining). Therefore, disable removing loads and
stores in a method when there are unresolved accesses.
bug:
29433999
Change-Id: I8fcfb52c584222474a8220eb16c6581350b702e0
Vladimir Marko [Mon, 27 Jun 2016 12:50:16 +0000 (13:50 +0100)]
Clean up StringReferenceValueComparator and DexFile.
Add a helper function to StringReference, so that the
StringReferenceValueComparator doesn't need to repeatedly
reference the same StringReference variable which led to
the bug
29602109.
Also clean up the DexFile, moving definitions of functions
that depend on the dex_file-inl.h from dex_file.h also to
the dex_file-inl.h.
Test: Run standard ART test suite on host and Nexus 5.
Bug:
29602109
Change-Id: I83e2aa67173c62b3432c26478e528bbb53b6d09f
Goran Jakovljevic [Mon, 27 Jun 2016 12:12:48 +0000 (14:12 +0200)]
Optimizing: Do not depend on sharpening in test 450
The sharpening may or may not remove the ArtMethod*
parameter, so the test must not depend on its absence.
This fixes the test 450 checker test on mips/mips64.
Change-Id: Ie62c5a7da5994c3b0c6f0452c9abb37575216806
Alexandre Rames [Mon, 27 Jun 2016 12:36:56 +0000 (12:36 +0000)]
Merge \"Fixes and cleaning for test/458-checker-instruction-simplification.\"
am:
337fcb78e2
Change-Id: I8aa22fc03dd4586c63487c9839a36399b87d3ce7
Roland Levillain [Mon, 27 Jun 2016 12:29:37 +0000 (12:29 +0000)]
Merge "Fixes and cleaning for test/458-checker-instruction-simplification."
Vladimir Marko [Tue, 21 Jun 2016 17:21:53 +0000 (18:21 +0100)]
Fix 004-ThreadStress.
Synchronize the start of performing the tasks after all
threads have been created and runners reported their start.
This prevents a daemon thread from allocating all memory
before the main thread tries to allocate the next daemon
thread, which is the likely culprit of failing to print any
output whatsoever (the main thread exits due to an uncaught
OOME and printing the message also fails due to OOME).
Instead of repeating attempts to print "Finishing worker"
until it succeeds, print the message through JNI which does
not require any Java heap memory. Similarly, print caught
Throwables through JNI. Also make sure to preallocate
Strings that are used once we start running tasks to avoid
const-string throwing OOME. This also prevents a partial
success followed by a retry; we have seen a failure to
print the EOL, yielding "Finishing workerFinishing worker".
Change the "Thread exited..." message to be printed only in
DEBUG mode and compare the full output, ignoring different
numbers as the "Starting worker for <id>" may be reordered.
Test: "make -j 32 test-art-host-run-test-004-ThreadStress"
(4 configs: with or without gcstress, 32-bit and 64-bit)
100 times while also keeping the machine under load with
"make -j 32" to repeatedly build another full AOSP tree.
Bug:
27371304
Change-Id: I28286d70a08be64c36d0e49dd5558686813ff264
Alexandre Rames [Mon, 27 Jun 2016 10:13:34 +0000 (11:13 +0100)]
Fixes and cleaning for test/458-checker-instruction-simplification.
- Use the `doThrow` trick to defeat inlining.
- Fix the order of `expected` and `found` arguments for a few tests.
Change-Id: Id8e5041993d72f61e75b4586b49180006cda4b5c
Pavel Vyssotski [Fri, 24 Jun 2016 19:08:35 +0000 (19:08 +0000)]
Merge \"ART: OneBit intrinsics should use 1ULL for 64-bit shift\"
am:
1e28d1e145
Change-Id: Ifca8f91f444537704477824a52ae50309db93858
Roland Levillain [Fri, 24 Jun 2016 19:08:34 +0000 (19:08 +0000)]
Merge \"Adjust ART tests expectations after libcore changes.\"
am:
7caad2a084
Change-Id: I0c2666a36e76c6faccbf0fb265d198c8dd77f431
Treehugger Robot [Fri, 24 Jun 2016 18:58:53 +0000 (18:58 +0000)]
Merge "ART: OneBit intrinsics should use 1ULL for 64-bit shift"
Treehugger Robot [Fri, 24 Jun 2016 18:53:48 +0000 (18:53 +0000)]
Merge "Adjust ART tests expectations after libcore changes."
Roland Levillain [Fri, 24 Jun 2016 17:44:36 +0000 (18:44 +0100)]
Adjust ART tests expectations after libcore changes.
Test: test/100-reflect2, test/201-built-in-exception-detail-messages
Change-Id: I0c13e37973d0b954cbafa15b049cb8934b88ebe5
Vladimir Marko [Fri, 24 Jun 2016 15:56:33 +0000 (15:56 +0000)]
Merge \"Fix StringReferenceValueComparator.\"
am:
8543d324d1
Change-Id: Ie45f9019bf8189029efc74d1a09dce5e62c923d4
Vladimir Marko [Fri, 24 Jun 2016 15:48:31 +0000 (15:48 +0000)]
Merge "Fix StringReferenceValueComparator."
Vladimir Marko [Fri, 24 Jun 2016 10:56:59 +0000 (11:56 +0100)]
Fix StringReferenceValueComparator.
Test: Added a regression test in string_reference_test.cc,
run the standard ART test suite on host and Nexus 5.
Bug:
29602109
Change-Id: Idcc059a07df048a0e3ece257b16b6556f242243e
Roland Levillain [Fri, 24 Jun 2016 13:12:47 +0000 (13:12 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82
am:
31167a5785
Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49
Roland Levillain [Fri, 24 Jun 2016 13:04:36 +0000 (13:04 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82
* changes:
Re-enable most intrinsics with read barriers.
Fix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.
Fix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge \"Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am:
bad21cb538
Change-Id: I327c5c1d906f5fea59797bc7ff79578dcef510b4
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Pavel Vyssotski [Wed, 22 Jun 2016 06:36:10 +0000 (12:36 +0600)]
ART: OneBit intrinsics should use 1ULL for 64-bit shift
Change-Id: I91cbe769081045e6a45a95154a8a8acf1ec352ef
Signed-off-by: Pavel Vyssotski <pavel.n.vyssotski@intel.com>
David Brazdil [Thu, 23 Jun 2016 17:50:05 +0000 (17:50 +0000)]
Merge \"ART: Run RTP if invoke inputs have more specific type\"
am:
79fb0a294c
Change-Id: I59d5146cfedd244f2d9aa77d0cd83602d320b4e0
David Brazdil [Thu, 23 Jun 2016 17:37:51 +0000 (17:37 +0000)]
Merge "ART: Run RTP if invoke inputs have more specific type"
Greg Kaiser [Thu, 23 Jun 2016 16:30:51 +0000 (16:30 +0000)]
Merge \"elf_builder: Fix Mips header flags\"
am:
156d8ca8c1
Change-Id: I1f076879a3e294a24a208a13d6923915736d1cc2
Greg Kaiser [Thu, 23 Jun 2016 16:26:24 +0000 (16:26 +0000)]
Merge "elf_builder: Fix Mips header flags"
Richard Uhler [Thu, 23 Jun 2016 16:22:45 +0000 (16:22 +0000)]
Merge \"OatFileAssistantTest: do not relocate image randomly.\"
am:
9822f6b81f
Change-Id: I4c443278e4a7af5de0831dacf60164b4c709077d
Richard Uhler [Thu, 23 Jun 2016 16:14:58 +0000 (16:14 +0000)]
Merge "OatFileAssistantTest: do not relocate image randomly."
Goran Jakovljevic [Thu, 23 Jun 2016 09:49:30 +0000 (11:49 +0200)]
MIPS64: Remove the workaround in VisitInvokeStaticOrDirect
This is not needed since $s2-$s8 are not blocked any more. This is
follow-up change for I325ab403752c6b9cd788147cb8b21d42aaff629e.
Change-Id: I934a21adb85581e137a6dcb3355605742b085d83
David Brazdil [Tue, 21 Jun 2016 16:48:19 +0000 (17:48 +0100)]
ART: Run RTP if invoke inputs have more specific type
Moving RTP inside the graph builder introduced a regression where
replacing the inner parameters with the actual arguments of the
HInvoke would not build the inner graph with types more specific
than the method's signature.
This patch runs RTP on the inner graph again when it is detected
that RTP may improve typing precision.
Bug:
29595335
Change-Id: I351babc8497c83c2fba589aa51f46eaa0b7ab33c
Roland Levillain [Thu, 23 Jun 2016 12:53:42 +0000 (13:53 +0100)]
Re-enable most intrinsics with read barriers.
Also extend sun.misc.Unsafe test coverage to exercise
sun.misc.Unsafe.{get,put}{Int,Long,Object}Volatile.
Bug:
26205973
Bug:
29516905
Change-Id: I4d8da7cee5c8a310c8825c1631f71e5cb2b80b30
Test: Covered by ART's run-tests.
Roland Levillain [Thu, 23 Jun 2016 12:48:47 +0000 (13:48 +0100)]
Fix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.
The implementation was incorrectly interpreting the 'offset'
input as an index in a (4-byte) object reference array,
whereas it is a (1-byte) offset to an object reference field
within the 'base' (object) input.
Bug:
29516905
Change-Id: I4da5be0193217965f25e5d141c242592dea6ffe8
Test: Covered by test/004-UnsafeTest.
Sang, Chunlei [Tue, 5 Apr 2016 09:12:59 +0000 (17:12 +0800)]
Fix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.
The implementation was incorrectly interpreting the 'offset'
input as an index in a (4-byte) object reference array,
whereas it is a (1-byte) offset to an object reference field
within the 'base' (object) input.
Bug:
29516905
Change-Id: Idfbead8289222b55069816a81284401eff791e85
Test: Covered by test/004-UnsafeTest.
Aart Bik [Thu, 23 Jun 2016 00:51:01 +0000 (00:51 +0000)]
Merge \"Fixed typo in comment.\"
am:
ee2d222cc5
Change-Id: Icb3370b74afd36a350df351181a5d6df36a1918d
Treehugger Robot [Thu, 23 Jun 2016 00:39:49 +0000 (00:39 +0000)]
Merge "Fixed typo in comment."
Aart Bik [Wed, 22 Jun 2016 23:58:59 +0000 (23:58 +0000)]
Merge \"Support the -i flag in the new dexdump.\"
am:
f4c7dd6658
Change-Id: I1c964998a08043addc79f10546bca7659c6bac73
Aart Bik [Wed, 22 Jun 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Support the -i flag in the new dexdump."
Aart Bik [Wed, 22 Jun 2016 23:34:46 +0000 (16:34 -0700)]
Fixed typo in comment.
Change-Id: I818e5e67d664dfd2bddd464ed8e4f5efceb1fb22
Aart Bik [Wed, 22 Jun 2016 01:30:10 +0000 (18:30 -0700)]
Support the -i flag in the new dexdump.
Rationale:
The old dexdump supported the -i feature (ignore checksum failures).
This CL adds the same functionality to the new dexdump. Note that
this feature is, for example, useful to inspect DEX files that are
extracted from images (with quickened instructions), since the
checksum is not always valid in those cases.
BUG=
29548017
Change-Id: I6017b2f3d789f450560b568297f43c62bf9453b1
Richard Uhler [Tue, 26 Apr 2016 17:24:38 +0000 (10:24 -0700)]
OatFileAssistantTest: do not relocate image randomly.
Manually relocate the boot image to a known location before starting
the runtime so that the image won't be randomly relocated. This fixes
flaky test failures due to the image randomly being relocated by 0.
Bug:
28294887
Change-Id: I05a7961f1237a05e89d3f631c959e260ccfe0b70
Nicolas Geoffray [Wed, 22 Jun 2016 13:18:05 +0000 (13:18 +0000)]
Merge \"Revert \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"\"\"
am:
739dc72773
Change-Id: I8d553a1122a801c92ff13311c6a342df7640a003
Nicolas Geoffray [Wed, 22 Jun 2016 13:14:21 +0000 (13:14 +0000)]
Merge "Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""""
Nicolas Geoffray [Wed, 22 Jun 2016 13:13:59 +0000 (13:13 +0000)]
Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""""
Bug:
29387050
This reverts commit
0b8a91477a3cd3357e89c20d78726728cf897246.
Change-Id: Ie349d70ee489fd4b9065df4a445bbf8ef42ae911
Przemyslaw Szczepaniak [Wed, 22 Jun 2016 12:30:36 +0000 (13:30 +0100)]
Track libcore change
694e617f54a7bfbdad24913ce96f5d56f1a1960a
Added new method to string class, resized the mirror object.
Bug:
28666126
Change-Id: Ibed4e134c16512bde5183e73e130534f08256888
Christina Wadsworth [Tue, 21 Jun 2016 21:48:00 +0000 (21:48 +0000)]
Merge \"Number of unique strings loaded from dex code added to oatdump\"
am:
12e6e9f3f1
Change-Id: I45b0660d4864d4721fe6327f7d55c5cc2cc28bb8
Mathieu Chartier [Tue, 21 Jun 2016 21:39:06 +0000 (21:39 +0000)]
Merge "Number of unique strings loaded from dex code added to oatdump"
Christina Wadsworth [Mon, 20 Jun 2016 22:01:32 +0000 (15:01 -0700)]
Number of unique strings loaded from dex code added to oatdump
bug:
20323084
(cherry picked from commit
c0bf6a678fcf6c8aa230ea3401093ed162225f85)
Change-Id: I8dfb6c8e8cae1a9eb7cc209390062ea84092a824
Aart Bik [Tue, 21 Jun 2016 19:59:53 +0000 (19:59 +0000)]
Merge \"Added a dexdump test containing every DEX instruction\"
am:
5f5560dbce
Change-Id: I1360035879b2f4afaf2e761e0ca55fb85169c957
Aart Bik [Tue, 21 Jun 2016 19:47:25 +0000 (19:47 +0000)]
Merge "Added a dexdump test containing every DEX instruction"
Goran Jakovljevic [Tue, 21 Jun 2016 17:02:04 +0000 (17:02 +0000)]
Merge \"MIPS64: Unblock callee-save registers\"
am:
abc9f689d3
Change-Id: I27b553198b96043ae03a041899b0bd0a0098eb35
Treehugger Robot [Tue, 21 Jun 2016 16:54:17 +0000 (16:54 +0000)]
Merge "MIPS64: Unblock callee-save registers"
Vladimir Marko [Tue, 21 Jun 2016 16:23:25 +0000 (16:23 +0000)]
Merge \"Replace String.charAt() with HIR.\"
am:
4692c35c15
Change-Id: I445a603d8c25caaa6ddc4c56b80d452dbc7f449b
Vladimir Marko [Tue, 21 Jun 2016 16:18:10 +0000 (16:18 +0000)]
Merge "Replace String.charAt() with HIR."
Vladimir Marko [Tue, 21 Jun 2016 15:17:06 +0000 (15:17 +0000)]
Merge \"Improve HLoadClass code generation.\"
am:
f6d4f6e0e6
Change-Id: Iaefb899c1f55077072f2be4c9313ac811afc5f99
Vladimir Marko [Tue, 21 Jun 2016 15:12:24 +0000 (15:12 +0000)]
Merge "Improve HLoadClass code generation."
Vladimir Marko [Tue, 21 Jun 2016 14:26:04 +0000 (14:26 +0000)]
Merge \"x86: Fix CFI info for FOUR_ARG_DOWNCALL.\"
am:
2150d94b5a
Change-Id: Ifc8ee429da31647927ed0c928c36760f55b0ff6a
Vladimir Marko [Tue, 21 Jun 2016 14:21:08 +0000 (14:21 +0000)]
Merge "x86: Fix CFI info for FOUR_ARG_DOWNCALL."
Vladimir Marko [Thu, 28 Apr 2016 14:52:11 +0000 (15:52 +0100)]
Replace String.charAt() with HIR.
Replace String.charAt() with HArrayLength, HBoundsCheck and
HArrayGet. This allows GVN on the HArrayLength and BCE on
the HBoundsCheck as well as using the infrastructure for
HArrayGet, i.e. better handling of constant indexes than
the old intrinsic and using the HArm64IntermediateAddress.
Bug:
28330359
Change-Id: I32bf1da7eeafe82537a60416abf6ac412baa80dc
Vladimir Marko [Wed, 30 Mar 2016 12:23:58 +0000 (13:23 +0100)]
Improve HLoadClass code generation.
For classes in the boot image, use either direct pointers
or PC-relative addresses. For other classes, use PC-relative
access to the dex cache arrays for AOT and direct address of
the type's dex cache slot for JIT.
For aosp_flounder-userdebug:
- 32-bit boot.oat: -252KiB (-0.3%)
- 64-bit boot.oat: -412KiB (-0.4%)
- 32-bit dalvik cache total: -392KiB (-0.4%)
- 64-bit dalvik-cache total: -2312KiB (-1.0%)
(contains more files than the 32-bit dalvik cache)
For aosp_flounder-userdebug forced to compile PIC:
- 32-bit boot.oat: -124KiB (-0.2%)
- 64-bit boot.oat: -420KiB (-0.5%)
- 32-bit dalvik cache total: -136KiB (-0.1%)
- 64-bit dalvik-cache total: -1136KiB (-0.5%)
(contains more files than the 32-bit dalvik cache)
Bug:
27950288
Change-Id: I4da991a4b7e53c63c92558b97923d18092acf139
Nicolas Geoffray [Tue, 21 Jun 2016 12:14:28 +0000 (12:14 +0000)]
Merge \"Fix braino in the test to make it work on target.\"
am:
b94b5706f0
Change-Id: I8877ecceb98659247afa67e1126aa029aee5f106
Goran Jakovljevic [Tue, 21 Jun 2016 10:39:04 +0000 (12:39 +0200)]
MIPS64: Unblock callee-save registers
Callee-save registers shouldn't be blocked, except floating point
registers if the graph is debuggable.
Change-Id: I325ab403752c6b9cd788147cb8b21d42aaff629e
Nicolas Geoffray [Tue, 21 Jun 2016 12:06:50 +0000 (12:06 +0000)]
Merge "Fix braino in the test to make it work on target."
Nicolas Geoffray [Tue, 21 Jun 2016 12:05:24 +0000 (13:05 +0100)]
Fix braino in the test to make it work on target.
Change-Id: I074b93e8ceca9ca8cc49fa47af19484f522a78af
Vladimir Marko [Tue, 21 Jun 2016 10:24:47 +0000 (11:24 +0100)]
x86: Fix CFI info for FOUR_ARG_DOWNCALL.
Follow-up to
https://android-review.googlesource.com/237073
Bug:
28348339
Change-Id: I586828acf1269a6677128a0ded48cb8039024143
Vladimir Marko [Tue, 21 Jun 2016 11:26:01 +0000 (11:26 +0000)]
Merge \"Catch additional OOME in ThreadStress.\"
am:
9a8620e45e
Change-Id: I0b4fbd2e578194a357be4d9ed7479c7cf8220a3f
Nicolas Geoffray [Tue, 21 Jun 2016 11:26:00 +0000 (11:26 +0000)]
Merge \"Release the thread_list lock while waiting for daemons.\"
am:
bbcf0728f0
Change-Id: Icf9b891a9efe2c7108f8b2a37c44f58b039b57b8
Vladimir Marko [Tue, 21 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge "Catch additional OOME in ThreadStress."
Nicolas Geoffray [Tue, 21 Jun 2016 11:19:54 +0000 (11:19 +0000)]
Merge "Release the thread_list lock while waiting for daemons."
Vladimir Marko [Tue, 21 Jun 2016 09:38:23 +0000 (10:38 +0100)]
Catch additional OOME in ThreadStress.
And use pthread_sigmask() instead of sigprocmask() because
the latter is unspecified in a multithreaded process.
Bug:
27371304
Change-Id: Ia511ff62d38c0fcd985421442e506cdc5f8f30bf
Nicolas Geoffray [Mon, 20 Jun 2016 14:58:32 +0000 (15:58 +0100)]
Release the thread_list lock while waiting for daemons.
Daemons might be in a state where they are actually waiting for
it (for example Thread.isInterrupted). If the shutdown thread
doesn't release the lock, such daemon cannot make progress.
bug:
27353286
Change-Id: Ib7f4c7d1b56d73a829d01d5bfc0ab663fbb80b46
Andreas Gampe [Mon, 20 Jun 2016 23:48:02 +0000 (23:48 +0000)]
Merge \"ART: Use null for the BootClassLoader in LoadLibrary\"
am:
ec02795d89
Change-Id: I9de1b34725db8a70235411368953b30eb72be981
Treehugger Robot [Mon, 20 Jun 2016 23:41:51 +0000 (23:41 +0000)]
Merge "ART: Use null for the BootClassLoader in LoadLibrary"
Andreas Gampe [Fri, 17 Jun 2016 19:46:14 +0000 (12:46 -0700)]
ART: Use null for the BootClassLoader in LoadLibrary
We must translate the fake BootClassLoader object to the internally
used null when loading libraries.
Bug:
29449194
Test: test-art-host
(cherry picked from commit
f7e0db0ce1170b88043f7eb6afcc93c861c4611d)
Change-Id: I823d34e209149b5b96529a423c60a1d77bf8e9d1
Aart Bik [Mon, 20 Jun 2016 21:14:43 +0000 (14:14 -0700)]
Added a dexdump test containing every DEX instruction
Rationale:
To get full dexdump coverage, every DEX instruction should at
least be tested once. Since it is hard to construct Java tests
that eventually yield every possible instruction, smali has been
used to construct the all.dex file with every DEX opcode.
NOTE that the DEX file does not verify (or even makes sense).
It is merely intended as test input to dexdump to ensure each
opcode renders well.
Change-Id: I44d534d5ea076a3dbc16233e27cb8940f00c1d57
Aart Bik [Mon, 20 Jun 2016 18:13:36 +0000 (18:13 +0000)]
Merge \"Implemented annotations display in dexdump.\"
am:
e059b5b612
Change-Id: Ifbc4c721cf8f08d9bd2dc5422089d4f8ff48108d
Aart Bik [Mon, 20 Jun 2016 18:08:44 +0000 (18:08 +0000)]
Merge "Implemented annotations display in dexdump."
Mathieu Chartier [Sat, 18 Jun 2016 00:38:06 +0000 (00:38 +0000)]
Merge \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"\"
am:
34cfc661a5
Change-Id: Ibfb1cfe870ec55a0764e5d02a733cbfbddb7dcf7
Mathieu Chartier [Sat, 18 Jun 2016 00:27:47 +0000 (00:27 +0000)]
Merge "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""""
Mathieu Chartier [Sat, 18 Jun 2016 00:03:23 +0000 (17:03 -0700)]
Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""
Bug:
29387050
This reverts commit
64ed882e0787014e5a0e5d62fe049dbfce150f92.
Change-Id: I09a5e0773dffccae741d7534405e7c1a7aa222ed
Christopher Ferris [Sat, 18 Jun 2016 00:05:21 +0000 (00:05 +0000)]
Merge \"Add lock when iterating over BacktraceMap.\"
am:
58c0b44694
Change-Id: I9cef369f5927addb32b1c264a1dc91616f1831cb