OSDN Git Service
Ying Wang [Thu, 23 Jul 2015 02:06:40 +0000 (02:06 +0000)]
am
d72bef09: am
c962dd74: Merge "Prefer 32-bit host executables on Mac."
* commit '
d72bef09d6e77158a7b2fa4bfc9440f82a9f57d9':
Prefer 32-bit host executables on Mac.
Richard Uhler [Thu, 23 Jul 2015 02:06:16 +0000 (02:06 +0000)]
am
0a72d65a: am
56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."
* commit '
0a72d65ab483085c6de22bf76176873cddd5a30f':
Add more checks to diagnose flaky oat file assistant test.
Andreas Gampe [Thu, 23 Jul 2015 01:27:38 +0000 (01:27 +0000)]
am
9aa5c9be: am
2bb897ea: Merge "Refine the canary pattern in RedZone"
* commit '
9aa5c9bedecc2def743a428ca0f03384ac42a1fd':
Refine the canary pattern in RedZone
Ying Wang [Tue, 21 Jul 2015 23:57:44 +0000 (23:57 +0000)]
am
c962dd74: Merge "Prefer 32-bit host executables on Mac."
* commit '
c962dd742ea2c514cd36f02381c0ad33fc89e8b3':
Prefer 32-bit host executables on Mac.
Ying Wang [Tue, 21 Jul 2015 23:45:21 +0000 (23:45 +0000)]
Merge "Prefer 32-bit host executables on Mac."
Mathieu Chartier [Tue, 21 Jul 2015 20:47:50 +0000 (20:47 +0000)]
am
be86eabe: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev
* commit '
be86eabe578df433f46055bae08e77314a661d49':
Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
Mathieu Chartier [Tue, 21 Jul 2015 20:47:48 +0000 (20:47 +0000)]
am
3387f397: Get non proxy method for StackDumpVisitor
* commit '
3387f39750942b0442eec351757c7d1f9b1405ca':
Get non proxy method for StackDumpVisitor
Richard Uhler [Tue, 21 Jul 2015 20:38:49 +0000 (20:38 +0000)]
am
56ebee4d: Merge "Add more checks to diagnose flaky oat file assistant test."
* commit '
56ebee4d2b94bcf4040f49eddaa35ad7e43cc53d':
Add more checks to diagnose flaky oat file assistant test.
Mathieu Chartier [Tue, 21 Jul 2015 20:34:45 +0000 (20:34 +0000)]
Merge "Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo" into mnc-dev
Mathieu Chartier [Sat, 18 Jul 2015 02:53:47 +0000 (19:53 -0700)]
Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
(cherry picked from commit
7c0fe5e99d1d150b3072a3ae4cd0f0362fe32834)
Bug:
22541058
Change-Id: Id084a69ccd9835147ec71df6bb759e0f1b5e6fbf
Richard Uhler [Tue, 21 Jul 2015 20:27:18 +0000 (20:27 +0000)]
Merge "Add more checks to diagnose flaky oat file assistant test."
Ying Wang [Tue, 21 Jul 2015 19:05:30 +0000 (12:05 -0700)]
Prefer 32-bit host executables on Mac.
Bug:
22527295
Change-Id: I2cb1d3086b65b8227e6bdac9c0485fdc452f1e9c
Andreas Gampe [Tue, 21 Jul 2015 18:26:05 +0000 (18:26 +0000)]
am
e3bab35d: am
b203b332: Merge "ART: Fix UninitializedReference handling"
* commit '
e3bab35d4ff256e9c9ba7510123ccca5e8799232':
ART: Fix UninitializedReference handling
Richard Uhler [Tue, 21 Jul 2015 18:25:59 +0000 (18:25 +0000)]
am
75c82d00: am
364fa537: Merge "Fix bug in OatFileAssistant::GetBestOatFile."
* commit '
75c82d009fb6aa31c81f5f8b8d5abb2eadd395b0':
Fix bug in OatFileAssistant::GetBestOatFile.
Andreas Gampe [Tue, 21 Jul 2015 18:25:55 +0000 (18:25 +0000)]
am
7f474a0d: am
411b96d6: Merge "ART: Remove some of the Mac craziness"
* commit '
7f474a0dfefb45021303de4702f6a4409536cfa6':
ART: Remove some of the Mac craziness
Andreas Gampe [Tue, 21 Jul 2015 18:07:43 +0000 (18:07 +0000)]
am
2bb897ea: Merge "Refine the canary pattern in RedZone"
* commit '
2bb897ea8551ff8f486a59c7bc8368f4388b7760':
Refine the canary pattern in RedZone
Andreas Gampe [Tue, 21 Jul 2015 17:56:40 +0000 (17:56 +0000)]
Merge "Refine the canary pattern in RedZone"
Mathieu Chartier [Sat, 18 Jul 2015 01:46:32 +0000 (18:46 -0700)]
Get non proxy method for StackDumpVisitor
Fixes failing DCHECK.
(cherry picked from commit
ef76c3fa57ddf3f7ca32e118f599da8cb4eb1560)
Bug:
22553459
Change-Id: I6fe1012f9a5f8d29cb98bf25e3a279da51c5e1c0
Andreas Gampe [Tue, 21 Jul 2015 16:43:38 +0000 (16:43 +0000)]
am
b203b332: Merge "ART: Fix UninitializedReference handling"
* commit '
b203b332be18c7bf1e4b3be3e0ddd345174e0517':
ART: Fix UninitializedReference handling
Andreas Gampe [Tue, 21 Jul 2015 16:32:22 +0000 (16:32 +0000)]
Merge "ART: Fix UninitializedReference handling"
Andreas Gampe [Tue, 14 Jul 2015 04:12:43 +0000 (21:12 -0700)]
ART: Fix UninitializedReference handling
The merge rules in the verifier allowed Object to be successfully
merged with uninitialized references. This is invalid and should
result in a conflict. Fix by moving UninitializedReference rules
earlier.
Also add a test that forward merging is correctly allowed, both
with a valid result as well as a conflict.
Also add tests that backwards branches have the expected behavior.
Bug:
22411633
Change-Id: If837376c15f0b3550d6ce1721a3cde5901c80c7f
Richard Uhler [Tue, 21 Jul 2015 16:16:50 +0000 (16:16 +0000)]
am
364fa537: Merge "Fix bug in OatFileAssistant::GetBestOatFile."
* commit '
364fa537a78ef67825a3f7aa6b4bf8ff32c39266':
Fix bug in OatFileAssistant::GetBestOatFile.
Richard Uhler [Tue, 21 Jul 2015 16:08:10 +0000 (16:08 +0000)]
Merge "Fix bug in OatFileAssistant::GetBestOatFile."
Andreas Gampe [Tue, 21 Jul 2015 16:04:18 +0000 (16:04 +0000)]
am
411b96d6: Merge "ART: Remove some of the Mac craziness"
* commit '
411b96d641a9db09c5b6bf3dcccd7198cab688ae':
ART: Remove some of the Mac craziness
Andreas Gampe [Tue, 21 Jul 2015 15:56:21 +0000 (15:56 +0000)]
Merge "ART: Remove some of the Mac craziness"
Andreas Gampe [Wed, 15 Jul 2015 06:34:44 +0000 (23:34 -0700)]
ART: Remove some of the Mac craziness
We rely on new-enough Clang/LLVM builds nowadays. The integrated
assembler supports named parameters. Throw away most of the
old duplication (effectively cutting support for older Clang
versions). The only required duplications are:
1) Clang as does not support .altmacro. However, the Clang
preprocessor works different wrt/ the GCC preprocessor
and does not give us trouble with inserted spaces.
2) On the Mac, symbols are prefixed with an underscore.
This should help to avoid breaking the Mac build when changing
the assembly code, and prepare for a complete Clang-only build
for x86 and x86-64. Switching to the integrated assembler for
the host build may be done in a follow-up CL.
Bug:
17443165
Change-Id: I1a077d4b612abc2b1b851c1bdabb5008a52e5aa6
Mathieu Chartier [Tue, 21 Jul 2015 02:34:58 +0000 (02:34 +0000)]
am
86aee341: am
9ed82069: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo"
* commit '
86aee341a23398696516b843f7c35d26056c9b50':
Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
Aart Bik [Tue, 21 Jul 2015 02:34:56 +0000 (02:34 +0000)]
am
c0023fec: am
84bfbe14: Merge "Fix broken tests."
* commit '
c0023fec9f5eed1cf926ca44d53cacbc8218319d':
Fix broken tests.
Igor Murashkin [Tue, 21 Jul 2015 02:34:28 +0000 (02:34 +0000)]
am
3495f1ea: am
af0365ac: Merge "runtime: Add lambda box/unbox object equality"
* commit '
3495f1ea7aeca69befe9cafd3fd1a0e71dbbaf22':
runtime: Add lambda box/unbox object equality
Mathieu Chartier [Tue, 21 Jul 2015 01:33:19 +0000 (01:33 +0000)]
am
9ed82069: Merge "Don\'t check code pointer for proxies in ArtMethod::GetQuickFrameInfo"
* commit '
9ed820697b75179e236fe5a07981b198a36400b3':
Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
Mathieu Chartier [Tue, 21 Jul 2015 01:20:16 +0000 (01:20 +0000)]
Merge "Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo"
Aart Bik [Tue, 21 Jul 2015 01:10:53 +0000 (01:10 +0000)]
am
84bfbe14: Merge "Fix broken tests."
* commit '
84bfbe14f708cdbc2ef310a5b8973be6911602b5':
Fix broken tests.
Aart Bik [Tue, 21 Jul 2015 01:01:36 +0000 (01:01 +0000)]
Merge "Fix broken tests."
Aart Bik [Mon, 20 Jul 2015 21:08:59 +0000 (14:08 -0700)]
Fix broken tests.
Rationale:
(1) volatile field write/read need to apply to all
to comply with Java memory model
(2) clinit only needs only the write
(3) added conservative assumptions to memory barrier
(nothing broke, but this seems better)
Change-Id: I37787ec8f3f2c8d6166a94c57193fa4544ad3372
Igor Murashkin [Mon, 20 Jul 2015 22:51:20 +0000 (22:51 +0000)]
am
af0365ac: Merge "runtime: Add lambda box/unbox object equality"
* commit '
af0365ac6a4c7d242df6f50c4da69ba0ff67e3f1':
runtime: Add lambda box/unbox object equality
Igor Murashkin [Mon, 20 Jul 2015 22:36:04 +0000 (22:36 +0000)]
Merge "runtime: Add lambda box/unbox object equality"
Igor Murashkin [Fri, 10 Jul 2015 20:49:08 +0000 (13:49 -0700)]
runtime: Add lambda box/unbox object equality
A lambda that is boxed with box-lambda is now stored as a weak reference
in a global runtime table (lambda::BoxTable). Repeatedly boxing the same
lambda closure value will always return the same java.lang.Object back.
Since there is no way to observe the address of an object, a GC can
happen and clean up the table of any dead boxed lambdas, which can also
shrink the table to prevent the memory use from growing too much.
(Note that a lambda closure is immutable, so hashing over it is
guaranteed safe.)
Change-Id: I786c1323ff14eed937936b303d511875f9642524
Aart Bik [Mon, 20 Jul 2015 18:43:58 +0000 (18:43 +0000)]
am
f2d108e1: am
e07300b7: Merge "Improved side effect analysis (field/array write/read)."
* commit '
f2d108e1aea5cd5f8bce392a78b9021410ef5aaa':
Improved side effect analysis (field/array write/read).
Aart Bik [Mon, 20 Jul 2015 18:19:04 +0000 (18:19 +0000)]
am
e07300b7: Merge "Improved side effect analysis (field/array write/read)."
* commit '
e07300b712f44397ecbfed1ef7f880686e46274a':
Improved side effect analysis (field/array write/read).
Aart Bik [Mon, 20 Jul 2015 17:56:35 +0000 (17:56 +0000)]
Merge "Improved side effect analysis (field/array write/read)."
Aart Bik [Tue, 14 Jul 2015 23:07:00 +0000 (16:07 -0700)]
Improved side effect analysis (field/array write/read).
Rationale:
Types (int, float etc.) and access type (field vs. array)
can be used to disambiguate write/read side-effects analysis.
This directly improves e.g. dead code elimination and licm.
Change-Id: I371f6909a3f42bda13190a03f04c4a867bde1d06
Richard Uhler [Mon, 20 Jul 2015 16:40:34 +0000 (09:40 -0700)]
Add more checks to diagnose flaky oat file assistant test.
Bug:
22599792
Change-Id: I00574444133fb1cb2571f6ae71ac39c30a36275f
Andreas Gampe [Mon, 20 Jul 2015 15:53:01 +0000 (15:53 +0000)]
am
936c7ed9: am
16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"
* commit '
936c7ed92fd3ae6c6e478dd6999326d6e087b3bf':
ART: Fix arm32 quick_invoke_stub CFI
Richard Uhler [Fri, 17 Jul 2015 19:28:32 +0000 (12:28 -0700)]
Fix bug in OatFileAssistant::GetBestOatFile.
Previously, GetBestOatFile would fail to return an oat file in the
case where a non-executable oat file was requested and the only
problem with the oat file was that it wasn't relocated.
Bug:
22561444
Change-Id: I6446bf474afaf6c97861e7a89bd74a07c5a52a21
Andreas Gampe [Mon, 20 Jul 2015 15:40:03 +0000 (15:40 +0000)]
am
16a150b8: Merge "ART: Fix arm32 quick_invoke_stub CFI"
* commit '
16a150b8a4c5c8c9e7159aff3b2ffbd918494abd':
ART: Fix arm32 quick_invoke_stub CFI
Andreas Gampe [Mon, 20 Jul 2015 15:25:55 +0000 (15:25 +0000)]
Merge "ART: Fix arm32 quick_invoke_stub CFI"
Roland Levillain [Mon, 20 Jul 2015 10:17:59 +0000 (10:17 +0000)]
am
f9f0b860: am
6db13772: Merge "Improve documentation of memory layouts in stack_map.h."
* commit '
f9f0b860c1b295ca5bc931c45d5595c1827cb7ec':
Improve documentation of memory layouts in stack_map.h.
Roland Levillain [Mon, 20 Jul 2015 10:04:41 +0000 (10:04 +0000)]
am
6db13772: Merge "Improve documentation of memory layouts in stack_map.h."
* commit '
6db13772db22489e61e7934dee43144ee5362d8e':
Improve documentation of memory layouts in stack_map.h.
Roland Levillain [Mon, 20 Jul 2015 08:57:36 +0000 (08:57 +0000)]
Merge "Improve documentation of memory layouts in stack_map.h."
Mathieu Chartier [Sat, 18 Jul 2015 02:53:47 +0000 (19:53 -0700)]
Don't check code pointer for proxies in ArtMethod::GetQuickFrameInfo
Bug:
22541058
Change-Id: Id084a69ccd9835147ec71df6bb759e0f1b5e6fbf
Andreas Gampe [Sat, 18 Jul 2015 03:14:50 +0000 (20:14 -0700)]
ART: Fix arm32 quick_invoke_stub CFI
Follow-up to
4808846b2a8647a448aaa05d561a4f60b190196b.
Change-Id: I534ba39a4f59eaea9cfec8e81c944675284fc427
Mathieu Chartier [Sat, 18 Jul 2015 02:34:12 +0000 (02:34 +0000)]
am
cf6fee10: am
b2295afd: Merge "Get non proxy method for StackDumpVisitor"
* commit '
cf6fee1040853f02f04639f6bee077be846eaf7e':
Get non proxy method for StackDumpVisitor
Mathieu Chartier [Sat, 18 Jul 2015 02:21:33 +0000 (02:21 +0000)]
am
b2295afd: Merge "Get non proxy method for StackDumpVisitor"
* commit '
b2295afd038c921ac4219c3d09774579bd577c87':
Get non proxy method for StackDumpVisitor
Mathieu Chartier [Sat, 18 Jul 2015 02:15:04 +0000 (02:15 +0000)]
am
3b34cc63: am
11237947: Merge "Change intern table to not use WaitHoldingLocks"
* commit '
3b34cc634ad00ecf5bef4913dda427e7c09661d6':
Change intern table to not use WaitHoldingLocks
Mathieu Chartier [Sat, 18 Jul 2015 02:11:12 +0000 (02:11 +0000)]
Merge "Get non proxy method for StackDumpVisitor"
Mathieu Chartier [Sat, 18 Jul 2015 02:00:58 +0000 (02:00 +0000)]
am
11237947: Merge "Change intern table to not use WaitHoldingLocks"
* commit '
11237947eefd3ec3167d9df41f2f3a041e717b6f':
Change intern table to not use WaitHoldingLocks
Mathieu Chartier [Sat, 18 Jul 2015 01:46:32 +0000 (18:46 -0700)]
Get non proxy method for StackDumpVisitor
Fixes failing DCHECK.
Bug:
22553459
Change-Id: I6fe1012f9a5f8d29cb98bf25e3a279da51c5e1c0
Mathieu Chartier [Sat, 18 Jul 2015 01:49:00 +0000 (01:49 +0000)]
Merge "Change intern table to not use WaitHoldingLocks"
Igor Murashkin [Sat, 18 Jul 2015 01:05:19 +0000 (01:05 +0000)]
am
8cd99c8f: am
7745dc34: Merge "runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS"
* commit '
8cd99c8f2d7c7268afc95a66f7e64ab0fb6b9e40':
runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS
Igor Murashkin [Sat, 18 Jul 2015 00:51:19 +0000 (00:51 +0000)]
am
7745dc34: Merge "runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS"
* commit '
7745dc34f0b40c8c2ef2ef1a540c84c305cd987a':
runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS
Igor Murashkin [Sat, 18 Jul 2015 00:40:25 +0000 (00:40 +0000)]
Merge "runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS"
Igor Murashkin [Sat, 11 Jul 2015 01:27:47 +0000 (18:27 -0700)]
runtime: Add -Xverify:softfail and ART_TEST_INTERPRETER_ACCESS_CHECKS
Use ART_TEST_INTERPRETER_ACCESS_CHECKS=true to run all the tests through
the interpreter with access checks enabled. The normal interpreter tests
do not currently enable access checks, which means that a large part of
the interpreter codebase is untested.
The verifier will force every class into a soft fail mode if
-Xverify:softfail is used, thereby ensuring that if used along with the
interpreter (-Xint) that the interpret is always in access checks mode.
This is used alongside with --compile-filter=verify-at-runtime to
prevent the AOT compiler from putting down any code.
Change-Id: I35a10ed8c43d76fa96133cf01fdad497da387200
Mathieu Chartier [Mon, 13 Jul 2015 21:35:43 +0000 (14:35 -0700)]
Change intern table to not use WaitHoldingLocks
Bug:
22423014
Change-Id: I9e16b8cb4def72fff73f1783a182877105feb7aa
Aart Bik [Fri, 17 Jul 2015 18:24:24 +0000 (18:24 +0000)]
am
73aca5e9: am
479ebe07: Merge "Extended test with "cross-over arrays"."
* commit '
73aca5e9f39632b6039520b0413f79f55d9a37b2':
Extended test with "cross-over arrays".
Aart Bik [Fri, 17 Jul 2015 18:09:32 +0000 (18:09 +0000)]
am
479ebe07: Merge "Extended test with "cross-over arrays"."
* commit '
479ebe076561e4a48129ab0c78cf8ca93c44baf6':
Extended test with "cross-over arrays".
Aart Bik [Fri, 17 Jul 2015 18:01:17 +0000 (18:01 +0000)]
Merge "Extended test with "cross-over arrays"."
Aart Bik [Fri, 17 Jul 2015 17:21:15 +0000 (10:21 -0700)]
Extended test with "cross-over arrays".
Rationale:
Since HIR is mostly sloppy with array references types, it is good
to extend the tests with some false invariant array references.
Bug:
22538329
Change-Id: I2ef22cbdc999c0d627590f76e7bac61984ac6ad6
Richard Uhler [Fri, 17 Jul 2015 15:49:30 +0000 (15:49 +0000)]
am
74c32d6a: am
511bb656: Merge "Fix FieldGap priority queue ordering bug."
* commit '
74c32d6adc3cc92f8b4e237089908cff695f2720':
Fix FieldGap priority queue ordering bug.
Richard Uhler [Fri, 17 Jul 2015 15:35:28 +0000 (15:35 +0000)]
am
511bb656: Merge "Fix FieldGap priority queue ordering bug."
* commit '
511bb656522e22f0570a9edff8dd295e0de6c145':
Fix FieldGap priority queue ordering bug.
Richard Uhler [Fri, 17 Jul 2015 15:22:10 +0000 (15:22 +0000)]
Merge "Fix FieldGap priority queue ordering bug."
Vladimir Marko [Fri, 17 Jul 2015 12:45:44 +0000 (12:45 +0000)]
am
91825544: am
2661ffc6: Merge "Improve Thumb2 branch/load-literal fixup performance."
* commit '
9182554402d024912256a4e1bf4560f7c477f200':
Improve Thumb2 branch/load-literal fixup performance.
Nicolas Geoffray [Fri, 17 Jul 2015 12:45:42 +0000 (12:45 +0000)]
am
eb4b5b09: am
75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
* commit '
eb4b5b09d00475cef167a2b314757f755aaa9c9e':
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Vladimir Marko [Fri, 17 Jul 2015 12:14:45 +0000 (12:14 +0000)]
am
2661ffc6: Merge "Improve Thumb2 branch/load-literal fixup performance."
* commit '
2661ffc6f739f2006bfa5c70bbb2f60badfaf321':
Improve Thumb2 branch/load-literal fixup performance.
Nicolas Geoffray [Fri, 17 Jul 2015 12:14:43 +0000 (12:14 +0000)]
am
75fd056e: Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
* commit '
75fd056e2ac95492bb9a044fc77ef47e413a3ea1':
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Vladimir Marko [Fri, 17 Jul 2015 12:08:20 +0000 (12:08 +0000)]
Merge "Improve Thumb2 branch/load-literal fixup performance."
Nicolas Geoffray [Fri, 17 Jul 2015 12:03:05 +0000 (12:03 +0000)]
Merge "Revert "Revert "Use the quickened metadata to compile -QUICK opcodes."""
Vladimir Marko [Tue, 14 Jul 2015 10:58:38 +0000 (11:58 +0100)]
Improve Thumb2 branch/load-literal fixup performance.
Replace per-Fixup dependents vectors with a single array
held by the assembler and referenced by the Fixups to avoid
the cost of many allocations with the default allocator.
This improves the compilation time of the boot.oat on N5,
AOSP ToT, by about ~3% as measured by the "Compile Time"
reported with --dump-timing (~2% of the "dex2oat took...").
Change-Id: I7121cdef32d9edc6d287e602d774ffe03f530d18
Nicolas Geoffray [Fri, 17 Jul 2015 11:51:28 +0000 (11:51 +0000)]
Revert "Revert "Use the quickened metadata to compile -QUICK opcodes.""
This reverts commit
8ab9a9010f3929acbb6c671008b8885b762b01e1.
Change-Id: I1e654d5010ea2112982c3055fcb8c8f9c10e9ac8
Nicolas Geoffray [Fri, 17 Jul 2015 11:24:59 +0000 (11:24 +0000)]
am
030f2af2: Reduce space filter threshold to 128.
* commit '
030f2af20dcae2c44bcf1b7b265cf3db4e3c23f8':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 11:23:42 +0000 (11:23 +0000)]
am
06fc780f: am
33e50d85: Merge "Reduce space filter threshold to 128."
* commit '
06fc780faeaef3406aab181ba4301273af7f9579':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 11:11:33 +0000 (11:11 +0000)]
am
33e50d85: Merge "Reduce space filter threshold to 128."
* commit '
33e50d85a3e43072fad4f58369b71da73b8f966c':
Reduce space filter threshold to 128.
Nicolas Geoffray [Fri, 17 Jul 2015 10:11:09 +0000 (11:11 +0100)]
Reduce space filter threshold to 128.
In order to get closer to our code increase limit.
Bug:
21868508
(cherry picked from commit
432bf3d525dd0736c91238d69e29b4db6a2f7b80)
Change-Id: Iab19fe99a8a869b0fb841bac317016e4a3dc00e2
Nicolas Geoffray [Fri, 17 Jul 2015 10:57:42 +0000 (10:57 +0000)]
Merge "Reduce space filter threshold to 128."
Nicolas Geoffray [Fri, 17 Jul 2015 10:29:16 +0000 (10:29 +0000)]
am
4c310c4c: am
32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
* commit '
4c310c4c31a4f54dcd6c0b53cf74158d18750be9':
Revert "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 10:14:52 +0000 (10:14 +0000)]
am
32f59e58: Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
* commit '
32f59e585a1f8932f2a4ab3f934a0a83e29b3d19':
Revert "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 10:11:09 +0000 (11:11 +0100)]
Reduce space filter threshold to 128.
In order to get closer to our code increase limit.
Bug:
21868508
Change-Id: I05f76bfd97f03bda3741eca4e6a678c536ad0702
Nicolas Geoffray [Fri, 17 Jul 2015 10:07:54 +0000 (10:07 +0000)]
am
38216947: am
c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."
* commit '
3821694760a428ffb7239ab95d3c632e07e74da7':
Use the quickened metadata to compile -QUICK opcodes.
Nicolas Geoffray [Fri, 17 Jul 2015 10:04:31 +0000 (11:04 +0100)]
resolved conflicts for merge of
a2407de1 to mnc-dev-plus-aosp
Change-Id: Iaf366cec9606c8fed79ec00ac2573f2298de199c
Nicolas Geoffray [Fri, 17 Jul 2015 10:02:45 +0000 (10:02 +0000)]
Merge "Revert "Use the quickened metadata to compile -QUICK opcodes.""
Nicolas Geoffray [Fri, 17 Jul 2015 10:02:30 +0000 (10:02 +0000)]
Revert "Use the quickened metadata to compile -QUICK opcodes."
Broke sdk build. Investigating.
This reverts commit
4515a67434c9e3e1627586629a1f2aba1a99aa6a.
Change-Id: I6c1107ab626758570a59dc6bf3e4228c70a57196
Nicolas Geoffray [Fri, 17 Jul 2015 09:55:53 +0000 (09:55 +0000)]
am
c3c0a06b: Merge "Use the quickened metadata to compile -QUICK opcodes."
* commit '
c3c0a06bea879741972add3dfc8099de729856a1':
Use the quickened metadata to compile -QUICK opcodes.
Nicolas Geoffray [Fri, 17 Jul 2015 09:15:56 +0000 (09:15 +0000)]
Merge "Use the quickened metadata to compile -QUICK opcodes."
Nicolas Geoffray [Fri, 17 Jul 2015 08:54:20 +0000 (08:54 +0000)]
Merge "ART: Boolean simplifier fix" into mnc-dev
Aart Bik [Fri, 17 Jul 2015 01:45:54 +0000 (01:45 +0000)]
am
2cf3fc24: am
913a737b: Merge "Test on (in)variant static and instance field arrays."
* commit '
2cf3fc24395e2a166001144bf28f0cf87943fe43':
Test on (in)variant static and instance field arrays.
Aart Bik [Fri, 17 Jul 2015 01:31:12 +0000 (01:31 +0000)]
am
913a737b: Merge "Test on (in)variant static and instance field arrays."
* commit '
913a737ba5774b3fec944190c13fcdf5b2257b6a':
Test on (in)variant static and instance field arrays.
Andreas Gampe [Fri, 17 Jul 2015 01:16:41 +0000 (01:16 +0000)]
am
69f77ac2: am
caa2fe33: Merge "ART: Fix System.arraycopy"
* commit '
69f77ac22c33c128cb76a73fd09f6d627d141dca':
ART: Fix System.arraycopy
Aart Bik [Fri, 17 Jul 2015 01:15:58 +0000 (01:15 +0000)]
Merge "Test on (in)variant static and instance field arrays."
Andreas Gampe [Fri, 17 Jul 2015 01:02:49 +0000 (01:02 +0000)]
am
caa2fe33: Merge "ART: Fix System.arraycopy"
* commit '
caa2fe33a8c4b3a5f7ffd0a6d6adb68337f8655f':
ART: Fix System.arraycopy
Aart Bik [Fri, 17 Jul 2015 00:40:44 +0000 (17:40 -0700)]
Test on (in)variant static and instance field arrays.
Rationale:
Ensure upcoming improved side effects analysis
results in valid optimizations only.
Bug:
22538329
Change-Id: I87e699853e914a0e42adfd1c4e4f9789781b65df
Andreas Gampe [Fri, 17 Jul 2015 00:51:11 +0000 (00:51 +0000)]
Merge "ART: Fix System.arraycopy"