OSDN Git Service

android-x86/art.git
8 years agoMerge \"Fix StringReferenceValueComparator.\"
Vladimir Marko [Fri, 24 Jun 2016 15:56:33 +0000 (15:56 +0000)]
Merge \"Fix StringReferenceValueComparator.\"
am: 8543d324d1

Change-Id: Ie45f9019bf8189029efc74d1a09dce5e62c923d4

8 years agoMerge "Fix StringReferenceValueComparator."
Vladimir Marko [Fri, 24 Jun 2016 15:48:31 +0000 (15:48 +0000)]
Merge "Fix StringReferenceValueComparator."

8 years agoFix 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

8 years agoMerge changes I4d8da7ce,I4da5be01,Idfbead82
Roland Levillain [Fri, 24 Jun 2016 13:12:47 +0000 (13:12 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82
am: 31167a5785

Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49

8 years agoMerge changes I4d8da7ce,I4da5be01,Idfbead82
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.

8 years agoMerge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: bad21cb538

Change-Id: I327c5c1d906f5fea59797bc7ff79578dcef510b4

8 years agoMerge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Merge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"

8 years agoMerge \"ART: Run RTP if invoke inputs have more specific type\"
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

8 years agoMerge "ART: Run RTP if invoke inputs have more specific type"
David Brazdil [Thu, 23 Jun 2016 17:37:51 +0000 (17:37 +0000)]
Merge "ART: Run RTP if invoke inputs have more specific type"

8 years agoMerge \"elf_builder: Fix Mips header flags\"
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

8 years agoMerge "elf_builder: Fix Mips header flags"
Greg Kaiser [Thu, 23 Jun 2016 16:26:24 +0000 (16:26 +0000)]
Merge "elf_builder: Fix Mips header flags"

8 years agoMerge \"OatFileAssistantTest: do not relocate image randomly.\"
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

8 years agoMerge "OatFileAssistantTest: do not relocate image randomly."
Richard Uhler [Thu, 23 Jun 2016 16:14:58 +0000 (16:14 +0000)]
Merge "OatFileAssistantTest: do not relocate image randomly."

8 years agoART: Run RTP if invoke inputs have more specific type
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

8 years agoRe-enable most intrinsics with read barriers.
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.

8 years agoFix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.
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.

8 years agoFix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.
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.

8 years agoMerge \"Fixed typo in comment.\"
Aart Bik [Thu, 23 Jun 2016 00:51:01 +0000 (00:51 +0000)]
Merge \"Fixed typo in comment.\"
am: ee2d222cc5

Change-Id: Icb3370b74afd36a350df351181a5d6df36a1918d

8 years agoMerge "Fixed typo in comment."
Treehugger Robot [Thu, 23 Jun 2016 00:39:49 +0000 (00:39 +0000)]
Merge "Fixed typo in comment."

8 years agoMerge \"Support the -i flag in the new dexdump.\"
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

8 years agoMerge "Support the -i flag in the new dexdump."
Aart Bik [Wed, 22 Jun 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Support the -i flag in the new dexdump."

8 years agoFixed typo in comment.
Aart Bik [Wed, 22 Jun 2016 23:34:46 +0000 (16:34 -0700)]
Fixed typo in comment.

Change-Id: I818e5e67d664dfd2bddd464ed8e4f5efceb1fb22

8 years agoSupport the -i flag in the new dexdump.
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

8 years agoOatFileAssistantTest: do not relocate image randomly.
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

8 years agoMerge \"Revert \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its outpu...
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

8 years agoMerge "Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output...
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."""""

8 years agoRevert "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

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
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

8 years agoMerge \"Number of unique strings loaded from dex code added to oatdump\"
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

8 years agoMerge "Number of unique strings loaded from dex code added to oatdump"
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"

8 years agoNumber 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

8 years agoMerge \"Added a dexdump test containing every DEX instruction\"
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

8 years agoMerge "Added a dexdump test containing every DEX instruction"
Aart Bik [Tue, 21 Jun 2016 19:47:25 +0000 (19:47 +0000)]
Merge "Added a dexdump test containing every DEX instruction"

8 years agoMerge \"MIPS64: Unblock callee-save registers\"
Goran Jakovljevic [Tue, 21 Jun 2016 17:02:04 +0000 (17:02 +0000)]
Merge \"MIPS64: Unblock callee-save registers\"
am: abc9f689d3

Change-Id: I27b553198b96043ae03a041899b0bd0a0098eb35

8 years agoMerge "MIPS64: Unblock callee-save registers"
Treehugger Robot [Tue, 21 Jun 2016 16:54:17 +0000 (16:54 +0000)]
Merge "MIPS64: Unblock callee-save registers"

8 years agoMerge \"Replace String.charAt() with HIR.\"
Vladimir Marko [Tue, 21 Jun 2016 16:23:25 +0000 (16:23 +0000)]
Merge \"Replace String.charAt() with HIR.\"
am: 4692c35c15

Change-Id: I445a603d8c25caaa6ddc4c56b80d452dbc7f449b

8 years agoMerge "Replace String.charAt() with HIR."
Vladimir Marko [Tue, 21 Jun 2016 16:18:10 +0000 (16:18 +0000)]
Merge "Replace String.charAt() with HIR."

8 years agoMerge \"Improve HLoadClass code generation.\"
Vladimir Marko [Tue, 21 Jun 2016 15:17:06 +0000 (15:17 +0000)]
Merge \"Improve HLoadClass code generation.\"
am: f6d4f6e0e6

Change-Id: Iaefb899c1f55077072f2be4c9313ac811afc5f99

8 years agoMerge "Improve HLoadClass code generation."
Vladimir Marko [Tue, 21 Jun 2016 15:12:24 +0000 (15:12 +0000)]
Merge "Improve HLoadClass code generation."

8 years agoMerge \"x86: Fix CFI info for FOUR_ARG_DOWNCALL.\"
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

8 years agoMerge "x86: Fix CFI info for FOUR_ARG_DOWNCALL."
Vladimir Marko [Tue, 21 Jun 2016 14:21:08 +0000 (14:21 +0000)]
Merge "x86: Fix CFI info for FOUR_ARG_DOWNCALL."

8 years agoReplace String.charAt() with HIR.
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

8 years agoImprove HLoadClass code generation.
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

8 years agoMerge \"Fix braino in the test to make it work on target.\"
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

8 years agoMIPS64: Unblock callee-save registers
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

8 years agoMerge "Fix braino in the test to make it work on target."
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."

8 years agoFix 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

8 years agox86: Fix CFI info for FOUR_ARG_DOWNCALL.
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

8 years agoMerge \"Catch additional OOME in ThreadStress.\"
Vladimir Marko [Tue, 21 Jun 2016 11:26:01 +0000 (11:26 +0000)]
Merge \"Catch additional OOME in ThreadStress.\"
am: 9a8620e45e

Change-Id: I0b4fbd2e578194a357be4d9ed7479c7cf8220a3f

8 years agoMerge \"Release the thread_list lock while waiting for daemons.\"
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

8 years agoMerge "Catch additional OOME in ThreadStress."
Vladimir Marko [Tue, 21 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge "Catch additional OOME in ThreadStress."

8 years agoMerge "Release the thread_list lock while waiting for daemons."
Nicolas Geoffray [Tue, 21 Jun 2016 11:19:54 +0000 (11:19 +0000)]
Merge "Release the thread_list lock while waiting for daemons."

8 years agoCatch additional OOME in ThreadStress.
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

8 years agoRelease the thread_list lock while waiting for daemons.
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

8 years agoMerge \"ART: Use null for the BootClassLoader in LoadLibrary\"
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

8 years agoMerge "ART: Use null for the BootClassLoader in LoadLibrary"
Treehugger Robot [Mon, 20 Jun 2016 23:41:51 +0000 (23:41 +0000)]
Merge "ART: Use null for the BootClassLoader in LoadLibrary"

8 years agoART: 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

8 years agoAdded a dexdump test containing every DEX instruction
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

8 years agoMerge \"Implemented annotations display in dexdump.\"
Aart Bik [Mon, 20 Jun 2016 18:13:36 +0000 (18:13 +0000)]
Merge \"Implemented annotations display in dexdump.\"
am: e059b5b612

Change-Id: Ifbc4c721cf8f08d9bd2dc5422089d4f8ff48108d

8 years agoMerge "Implemented annotations display in dexdump."
Aart Bik [Mon, 20 Jun 2016 18:08:44 +0000 (18:08 +0000)]
Merge "Implemented annotations display in dexdump."

8 years agoMerge \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is...
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

8 years agoMerge "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky...
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.""""

8 years agoRevert "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

8 years agoMerge \"Add lock when iterating over BacktraceMap.\"
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

8 years agoMerge "Add lock when iterating over BacktraceMap."
Christopher Ferris [Fri, 17 Jun 2016 23:57:14 +0000 (23:57 +0000)]
Merge "Add lock when iterating over BacktraceMap."

8 years agoImplemented annotations display in dexdump.
Aart Bik [Fri, 10 Jun 2016 23:04:03 +0000 (16:04 -0700)]
Implemented annotations display in dexdump.

Rationale:
Showing this in true dexdump style as a separate construct
under switch -a (rather than interpreting the data and showing
each annotation where it is used). Also added new test to
cover many more value encodings in static fields.

BUG=28981655

Change-Id: I6d7d44cbd358d9880aab78812471bdb0dc6b6ad8

8 years agoMerge changes I25d9ac3e,I783dac75
Mathieu Chartier [Fri, 17 Jun 2016 18:49:49 +0000 (18:49 +0000)]
Merge changes I25d9ac3e,I783dac75
am: 83eab26cf2

Change-Id: Ibe5fd16e2c7737bca240fe3da633363f3ff5564c

8 years agoMerge \"Use collector specific helper classes\"
Mathieu Chartier [Fri, 17 Jun 2016 18:49:49 +0000 (18:49 +0000)]
Merge \"Use collector specific helper classes\"
am: dca4d5d2bf

Change-Id: I537fd415cce0329e59596d706e3fc721b83f1123

8 years agoMerge changes I25d9ac3e,I783dac75
Mathieu Chartier [Fri, 17 Jun 2016 18:41:28 +0000 (18:41 +0000)]
Merge changes I25d9ac3e,I783dac75

* changes:
  Revert "Revert "Skip DumpForSigQuit if debugger is active""
  Revert "Skip DumpForSigQuit if debugger is active"

8 years agoRevert "Revert "Skip DumpForSigQuit if debugger is active""
Mathieu Chartier [Fri, 17 Jun 2016 18:39:15 +0000 (11:39 -0700)]
Revert "Revert "Skip DumpForSigQuit if debugger is active""

Bug: 26118154

This reverts commit 539f7fb0964a184b24bf40c729577be76dd7749a.

8 years agoRevert "Skip DumpForSigQuit if debugger is active"
Mathieu Chartier [Fri, 17 Jun 2016 00:02:52 +0000 (17:02 -0700)]
Revert "Skip DumpForSigQuit if debugger is active"

Bug: 26118154

This reverts commit 0b8f1bfdfc721a41d98d13e12c4c67f62f698dfc.

(cherry picked from commit 6017782485d30c4e440e53107dde03dc20d56a9a)

Change-Id: I783dac75b97a424c2d770e0d69e6f346c915a754

8 years agoMerge "Use collector specific helper classes"
Mathieu Chartier [Fri, 17 Jun 2016 18:37:41 +0000 (18:37 +0000)]
Merge "Use collector specific helper classes"

8 years agoUse collector specific helper classes
Mathieu Chartier [Thu, 16 Jun 2016 18:44:28 +0000 (11:44 -0700)]
Use collector specific helper classes

Changed to use inner classes. Also changed some visitors to lambdas.

Bug: 29413717
Bug: 19534862

Change-Id: I631c8bfe5f795eda4623c5bb4f357f2dd12358e2

8 years agoMerge \"ARM: Improve String.getCharsNoCheck intrinsic.\"
Scott Wakeling [Fri, 17 Jun 2016 12:08:20 +0000 (12:08 +0000)]
Merge \"ARM: Improve String.getCharsNoCheck intrinsic.\"
am: d5aa626b28

Change-Id: Id36110686dfd9efb5eeb65fe8d515a4acf036b8f

8 years agoMerge "ARM: Improve String.getCharsNoCheck intrinsic."
Vladimir Marko [Fri, 17 Jun 2016 12:02:41 +0000 (12:02 +0000)]
Merge "ARM: Improve String.getCharsNoCheck intrinsic."

8 years agoARM: Improve String.getCharsNoCheck intrinsic.
Scott Wakeling [Mon, 25 Apr 2016 10:32:37 +0000 (11:32 +0100)]
ARM: Improve String.getCharsNoCheck intrinsic.

- Optimize for short retrievals.
- Improve performance of longer retrievals with unrolled LDR/STR.

Change-Id: I24ec52067104b2f68799c04aebb61d20fff94020

8 years agoAdd lock when iterating over BacktraceMap.
Christopher Ferris [Fri, 17 Jun 2016 06:19:36 +0000 (23:19 -0700)]
Add lock when iterating over BacktraceMap.

In order to avoid a race condition in the maps data, acquire
a read lock while iterating over the maps data.

Bug: 29387050
Change-Id: I7d484cac11503be060a9309bc886d1e5441a57b2

8 years agoMerge \"Change IMT size from 64 to 43\"
Matthew Gharrity [Fri, 17 Jun 2016 01:54:17 +0000 (01:54 +0000)]
Merge \"Change IMT size from 64 to 43\"
am: 30564fd3c9

Change-Id: Ie93335158b40b6924f6b020c2372662f7bf416ff

8 years agoMerge "Change IMT size from 64 to 43"
Treehugger Robot [Fri, 17 Jun 2016 01:12:35 +0000 (01:12 +0000)]
Merge "Change IMT size from 64 to 43"

8 years agoelf_builder: Fix Mips header flags
Greg Kaiser [Thu, 16 Jun 2016 22:55:15 +0000 (15:55 -0700)]
elf_builder: Fix Mips header flags

Bitwise OR has a higher precendence than ternary conditional,
so we need to use parentheses around our ternary conditional
to get the behavior we desire.

Bug: 28320822
Change-Id: I4b95ab88e688176939f16f8586d45784c9d92a42

8 years agoChange IMT size from 64 to 43
Matthew Gharrity [Thu, 16 Jun 2016 18:49:23 +0000 (11:49 -0700)]
Change IMT size from 64 to 43

Data shows that this change can save around 2MB with an estimated
less than 2% regression in interface method invokation speed.

Further investigation is needed to measure the performance impact
in practice, particularly for much smaller IMT sizes. We are making
this initial change to 43 to see if it affects runtime perf benchmarks.

Change-Id: Ic0e036091c5da0e6b93f519fc695e9b48ab5ec46

8 years agoMerge \"For deadlock test, print out any unexpected exceptions.\"
Jeff Hao [Thu, 16 Jun 2016 20:12:30 +0000 (20:12 +0000)]
Merge \"For deadlock test, print out any unexpected exceptions.\"
am: 8651203072

Change-Id: I71a3c2548f807727cacd98a718bd72accc878ba1

8 years agoMerge "For deadlock test, print out any unexpected exceptions."
Treehugger Robot [Thu, 16 Jun 2016 20:01:33 +0000 (20:01 +0000)]
Merge "For deadlock test, print out any unexpected exceptions."

8 years agoFor deadlock test, print out any unexpected exceptions.
Jeff Hao [Thu, 16 Jun 2016 18:29:42 +0000 (11:29 -0700)]
For deadlock test, print out any unexpected exceptions.

Bug: 28663029
Change-Id: Icd10cabdde282f292fd997c3a8ad9dd6d1a14e0e

8 years agoMerge changes I7d3ba051,I2dc96535
Andreas Gampe [Thu, 16 Jun 2016 18:25:31 +0000 (18:25 +0000)]
Merge changes I7d3ba051,I2dc96535
am: 76b7919ca3

Change-Id: Id403ac9f47ff87b1b6d97cd46cdbed5caf9e565f

8 years agoMerge changes I7d3ba051,I2dc96535
Treehugger Robot [Thu, 16 Jun 2016 18:15:17 +0000 (18:15 +0000)]
Merge changes I7d3ba051,I2dc96535

* changes:
  ART: Fix ImageSpace::Init
  Revert "Reduce ImageSpace::Init frame size"

8 years agoMerge \"Avoid duplicate class for mark compact\"
Mathieu Chartier [Thu, 16 Jun 2016 17:51:37 +0000 (17:51 +0000)]
Merge \"Avoid duplicate class for mark compact\"
am: 3fa401661e

Change-Id: Ibc263ea7d114d62515c951ab45dc460ca74c6565

8 years agoMerge "Avoid duplicate class for mark compact"
Mathieu Chartier [Thu, 16 Jun 2016 17:43:31 +0000 (17:43 +0000)]
Merge "Avoid duplicate class for mark compact"

8 years agoAvoid duplicate class for mark compact
Mathieu Chartier [Thu, 16 Jun 2016 17:28:43 +0000 (10:28 -0700)]
Avoid duplicate class for mark compact

Renamed BitmapSetSlowPathVisitor to MCBitmapSetSlowPathVisitor for
the mark compact case.

Bug: 29413717
Change-Id: Ibb85acc8e796c0b8208b13c468b5510b0cec47e1

8 years agoMerge \"Ensure we get a ProfilingInfo object before compiling.\"
Nicolas Geoffray [Thu, 16 Jun 2016 14:14:34 +0000 (14:14 +0000)]
Merge \"Ensure we get a ProfilingInfo object before compiling.\"
am: 48f9f28c9b

Change-Id: I4886b150e1b83a5319996fc2d9c96745db9502fb

8 years agoMerge "Ensure we get a ProfilingInfo object before compiling."
Treehugger Robot [Thu, 16 Jun 2016 14:04:52 +0000 (14:04 +0000)]
Merge "Ensure we get a ProfilingInfo object before compiling."

8 years agoEnsure we get a ProfilingInfo object before compiling.
Nicolas Geoffray [Thu, 16 Jun 2016 13:09:03 +0000 (14:09 +0100)]
Ensure we get a ProfilingInfo object before compiling.

Otherwise, the compiler could decide not to JIT compile
the method.

Change-Id: I6e92224748861317c5ac629395ea180df4e51f8b

8 years agoMerge \"MIPS32: Assembler tests for MIPS32R6\"
Chris Larsen [Thu, 16 Jun 2016 12:29:47 +0000 (12:29 +0000)]
Merge \"MIPS32: Assembler tests for MIPS32R6\"
am: 80fdcfc127

Change-Id: If3bd579ecb941aff88c19bdde53abd8c2f0b1619

8 years agoMerge "MIPS32: Assembler tests for MIPS32R6"
Treehugger Robot [Thu, 16 Jun 2016 12:21:30 +0000 (12:21 +0000)]
Merge "MIPS32: Assembler tests for MIPS32R6"

8 years agoMerge \"Use a barrier instead of sleep for flaky deadlock test.\"
Jeff Hao [Thu, 16 Jun 2016 01:28:31 +0000 (01:28 +0000)]
Merge \"Use a barrier instead of sleep for flaky deadlock test.\"
am: 61b370e455

Change-Id: I583c4ee37503e5a81297b7f9018ceb05a37bec20

8 years agoMerge "Use a barrier instead of sleep for flaky deadlock test."
Treehugger Robot [Thu, 16 Jun 2016 01:23:32 +0000 (01:23 +0000)]
Merge "Use a barrier instead of sleep for flaky deadlock test."

8 years agoART: Fix ImageSpace::Init
Andreas Gampe [Thu, 16 Jun 2016 00:45:01 +0000 (17:45 -0700)]
ART: Fix ImageSpace::Init

Refactor ImageSpace::Init. Fix a case of using nullptr for error_msg
where it was unsafe. Instead fix the remaining case of verbose map
dumping.

Also fixes the stack frame size issue on x86-64.

Change-Id: I7d3ba05100592b5a44a29b34349edd8a44b4a72f

8 years agoMerge \"Propagate flags to ShouldHaveEmbeddedVTable\"
Mathieu Chartier [Thu, 16 Jun 2016 01:04:28 +0000 (01:04 +0000)]
Merge \"Propagate flags to ShouldHaveEmbeddedVTable\"
am: 641466b022

Change-Id: I11ac74b1ad13b5e873c3de6c3ee2f9c3770e9e38

8 years agoMerge "Propagate flags to ShouldHaveEmbeddedVTable"
Mathieu Chartier [Thu, 16 Jun 2016 00:57:19 +0000 (00:57 +0000)]
Merge "Propagate flags to ShouldHaveEmbeddedVTable"

8 years agoPropagate flags to ShouldHaveEmbeddedVTable
Mathieu Chartier [Wed, 15 Jun 2016 22:07:03 +0000 (15:07 -0700)]
Propagate flags to ShouldHaveEmbeddedVTable

Pass kVerifyFlags and kReadBarrierrOption to ShouldHaveEmbeddedVTable
from ShouldHaveImt.

Bug: 29188168

Change-Id: Ibddd6e744a2f313b4048719987c41f2da04a4e0a