OSDN Git Service
Roland Levillain [Tue, 14 Jul 2015 22:52:57 +0000 (22:52 +0000)]
am
047272ea: am
d1665b7a: Merge "Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."""
* commit '
047272ea5bcde215ce0e6ef6bf9f00b3329e1822':
Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
Mathieu Chartier [Tue, 14 Jul 2015 22:52:42 +0000 (22:52 +0000)]
am
3caab920: am
c6f3439b: Merge "ART: JNI thread state transition optimization"
* commit '
3caab920473b09243ee98dc400191f5d0d20412e':
ART: JNI thread state transition optimization
Evgenii Stepanov [Tue, 14 Jul 2015 22:52:39 +0000 (22:52 +0000)]
am
83527e77: am
e978aba2: Merge "Disable ASan on Thread::InstallImplicitProtection."
* commit '
83527e77f3c587d14f332be563e048cac7ade848':
Disable ASan on Thread::InstallImplicitProtection.
Evgenii Stepanov [Tue, 14 Jul 2015 22:28:08 +0000 (22:28 +0000)]
am
37fdd2cd: am
0541502e: Merge "Generalize Valgrind annotations in ART to support ASan."
* commit '
37fdd2cdddd49caa95025607645e46a6dc0ebc7e':
Generalize Valgrind annotations in ART to support ASan.
Hiroshi Yamauchi [Tue, 14 Jul 2015 21:52:33 +0000 (21:52 +0000)]
am
f8202a9d: am
5b1eea0a: Merge "Thread-local mark stacks for the CC collector."
* commit '
f8202a9d05fec171204b1d00f5668a5a81f2d7b9':
Thread-local mark stacks for the CC collector.
Christopher Ferris [Tue, 14 Jul 2015 21:30:13 +0000 (21:30 +0000)]
am
16364599: am
24db1bc5: Merge "Fix cfi information for x86."
* commit '
16364599e07e0c45eaf3ef65bf7de0c363de2519':
Fix cfi information for x86.
Roland Levillain [Tue, 14 Jul 2015 10:14:46 +0000 (10:14 +0000)]
am
d1665b7a: Merge "Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."""
* commit '
d1665b7a689086ec5b33a69a05313c46ea1a95e4':
Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
Roland Levillain [Tue, 14 Jul 2015 09:25:42 +0000 (09:25 +0000)]
Merge "Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."""
Mathieu Chartier [Tue, 14 Jul 2015 02:02:35 +0000 (02:02 +0000)]
am
c6f3439b: Merge "ART: JNI thread state transition optimization"
* commit '
c6f3439b67962584cfb764133e192c3317f0e1fc':
ART: JNI thread state transition optimization
Mathieu Chartier [Tue, 14 Jul 2015 01:47:39 +0000 (01:47 +0000)]
Merge "ART: JNI thread state transition optimization"
Evgenii Stepanov [Tue, 14 Jul 2015 01:41:20 +0000 (01:41 +0000)]
am
e978aba2: Merge "Disable ASan on Thread::InstallImplicitProtection."
* commit '
e978aba24094cce90453ad3294b8c4536ee8e4b4':
Disable ASan on Thread::InstallImplicitProtection.
Evgenii Stepanov [Tue, 14 Jul 2015 01:28:04 +0000 (01:28 +0000)]
Merge "Disable ASan on Thread::InstallImplicitProtection."
Evgenii Stepanov [Tue, 14 Jul 2015 01:02:57 +0000 (01:02 +0000)]
am
0541502e: Merge "Generalize Valgrind annotations in ART to support ASan."
* commit '
0541502e6d9d0efa50aa333db32898a0664512c3':
Generalize Valgrind annotations in ART to support ASan.
Evgenii Stepanov [Mon, 13 Jul 2015 17:41:57 +0000 (10:41 -0700)]
Disable ASan on Thread::InstallImplicitProtection.
This function reads random stack locations and confuses ASan.
Bug:
21785137
Change-Id: Iaaee6032a651618e5275ab46e6e8f886df60a5d0
Evgenii Stepanov [Tue, 14 Jul 2015 00:47:06 +0000 (00:47 +0000)]
Merge "Generalize Valgrind annotations in ART to support ASan."
Evgenii Stepanov [Wed, 20 May 2015 19:30:59 +0000 (12:30 -0700)]
Generalize Valgrind annotations in ART to support ASan.
Also add redzones around non-fixed mem_map(s).
Also extend -Wframe-larger-than limit to enable arm64 ASan build.
Change-Id: Ie572481a25fead59fc8978d2c317a33ac418516c
Hiroshi Yamauchi [Mon, 13 Jul 2015 23:04:44 +0000 (23:04 +0000)]
am
5b1eea0a: Merge "Thread-local mark stacks for the CC collector."
* commit '
5b1eea0a6c90e6e82393cdb7337f0c2bb05637d9':
Thread-local mark stacks for the CC collector.
Yu Li [Mon, 29 Jun 2015 02:50:03 +0000 (10:50 +0800)]
ART: JNI thread state transition optimization
This patch improves the JNI performance by removing the explicit acquiring and
releasing the mutator lock when a thread state transits between suspended and
runnable states.
The functions responsible for changing the state were found to be the costliest
part of the JNI. Originally, a thread needs to acquire a shared mutator lock by
a CAS instruction when entering the runnable state and also needs to release
the lock by a CAS when entering the native state from runnable. This patch
removes these CAS operations when a thread state transits between suspended and
runnable. A thread in the runnable state is considered to have shared ownership
of the mutator lock and therefore transitions in and out of the runnable state
have associated implication on the mutator lock ownership. Meanwhile, a barrier
is added to control suspending all threads from running.
JNI transition overhead was reduced by 25% on IA platform and by 17% on ARM
platform by this patch, while it has little impact on GC pause time (measured
with "suspend all histogram").
Change-Id: Icee95d8ffff1bbfc95309a41cc48836536fec689
Signed-off-by: Yu, Li <yu.l.li@intel.com>
Signed-off-by: Haitao, Feng <haitao.feng@intel.com>
Signed-off-by: Lei, Li <lei.l.li@intel.com>
Hiroshi Yamauchi [Mon, 13 Jul 2015 22:51:39 +0000 (22:51 +0000)]
Merge "Thread-local mark stacks for the CC collector."
Hiroshi Yamauchi [Wed, 17 Jun 2015 01:29:23 +0000 (18:29 -0700)]
Thread-local mark stacks for the CC collector.
Thread-local mark stacks are assigned to mutators where they push
references in read barriers to reduce the (CAS) synchronization cost
in a global mark stack/queue.
We step through three mark stack modes (thread-local, shared,
GC-exclusive) and use per-thread flags to disable/enable system weak
accesses (only for the CC collector) instead of the existing global
one to safely perform the marking phase. The reasons are 1)
thread-local mark stacks for mutators need to be revoked using a
checkpoint to avoid races (incorrectly leaving a reference on mark
stacks) when terminating marking, and 2) we can’t use a checkpoint
while system weak accesses are disabled (or a deadlock would
happen). More details are described in the code comments.
Performance improvements in Ritzperf EAAC: a ~2.8% improvement
(13290->12918) in run time and a ~23% improvement (51.6s->39.8s) in
the total GC time on N5.
Bug:
12687968
Change-Id: I5d234d7e48bf115cd773d38bdb62ad24ce9116c7
Christopher Ferris [Mon, 13 Jul 2015 20:51:35 +0000 (20:51 +0000)]
am
24db1bc5: Merge "Fix cfi information for x86."
* commit '
24db1bc55bf8fb3240690436a229352453ae75e1':
Fix cfi information for x86.
Christopher Ferris [Mon, 13 Jul 2015 20:39:09 +0000 (20:39 +0000)]
Merge "Fix cfi information for x86."
Christopher Ferris [Mon, 13 Jul 2015 20:33:06 +0000 (20:33 +0000)]
am
22ee0902: Merge "Fix cfi information for x86." into mnc-dev
* commit '
22ee090292e9f2ab0326600a467294ecb8b0e2ad':
Fix cfi information for x86.
Christopher Ferris [Mon, 13 Jul 2015 19:21:00 +0000 (12:21 -0700)]
Fix cfi information for x86.
With this change, I can now enable debug malloc fully.
Bug:
19071092
(cherry picked from commit
9f66589f3ca6055501c99333a19b69349b8f8568)
Change-Id: I04d477d0294d67c5e3a9d9147889bdffb9086bd4
Christopher Ferris [Mon, 13 Jul 2015 20:19:56 +0000 (20:19 +0000)]
Merge "Fix cfi information for x86." into mnc-dev
Andreas Gampe [Mon, 13 Jul 2015 19:42:51 +0000 (19:42 +0000)]
am
2a1bcdd3: am
cc22d7cd: Merge "ART: Fix DexFileVerifier try_items OoO validation"
* commit '
2a1bcdd3179c9d2985a5877b9c439cb3ffb7b716':
ART: Fix DexFileVerifier try_items OoO validation
Andreas Gampe [Mon, 13 Jul 2015 19:28:32 +0000 (19:28 +0000)]
am
cc22d7cd: Merge "ART: Fix DexFileVerifier try_items OoO validation"
* commit '
cc22d7cde1062126aed90d314dcf675bd78e306e':
ART: Fix DexFileVerifier try_items OoO validation
Christopher Ferris [Mon, 13 Jul 2015 19:21:00 +0000 (12:21 -0700)]
Fix cfi information for x86.
With this change, I can now enable debug malloc fully.
Bug:
19071092
Change-Id: Iabfb18505feffb480504a8bbfbac60dd219ed48a
Andreas Gampe [Mon, 13 Jul 2015 19:16:46 +0000 (19:16 +0000)]
Merge "ART: Fix DexFileVerifier try_items OoO validation"
Nicolas Geoffray [Mon, 13 Jul 2015 17:45:49 +0000 (17:45 +0000)]
am
3df677fe: am
f68c8545: Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
* commit '
3df677fe387ea2a769f54695b5ed076dae61c94d':
Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Nicolas Geoffray [Mon, 13 Jul 2015 17:31:09 +0000 (17:31 +0000)]
am
f68c8545: Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
* commit '
f68c8545382925062da2b87169ca2b5314f0b431':
Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Nicolas Geoffray [Mon, 13 Jul 2015 17:02:42 +0000 (17:02 +0000)]
Merge "Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""""
Nicolas Geoffray [Mon, 13 Jul 2015 17:02:30 +0000 (17:02 +0000)]
Revert "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Breaks again in some configurations I don't fully understand yet.
This reverts commit
f075879649686e59b7a9065c5a061dbfdcdfbecc.
Change-Id: I0ac5533825e40b06462ee69b2740e4a96fb5c582
Nicolas Geoffray [Mon, 13 Jul 2015 16:13:59 +0000 (16:13 +0000)]
am
fc36c603: am
6fb5b1bd: Merge "Fix baseline for arm64."
* commit '
fc36c603a43540fe4d51b80b20678ea2b147c17b':
Fix baseline for arm64.
Anestis Bechtsoudis [Sun, 12 Jul 2015 17:51:35 +0000 (12:51 -0500)]
ART: Fix DexFileVerifier try_items OoO validation
DexFileVerifier::CheckIntraCodeItem() implements an out of order
validation for CodeItem try_items. try_items_size is validated for
sanity via CheckListSize() at dex_file_verifier.cc:800, although
handlers_size ULEB128 read (offset calculated from tries_size_) occurs
before at lines 797-798.
An out of bounds (wild) read will occur for invalid try_items_size at
parsed DEX file.
handlers_size read has been moved after try_items validation to resolve
this OoO issue.
Bug:
21307613
Bug: https://code.google.com/p/android/issues/detail?id=178592
Change-Id: I94d00819ee9a465f57ba9a1fdfdd356979e35ed7
Vladimir Marko [Mon, 13 Jul 2015 16:05:05 +0000 (16:05 +0000)]
am
b70f697d: am
f32521b1: Merge "ART: Don\'t nest indenters in oatdump."
* commit '
b70f697df0fc3f9cb842d58a2353a4a6c5e9deb0':
ART: Don't nest indenters in oatdump.
Andreas Gampe [Mon, 13 Jul 2015 16:05:04 +0000 (16:05 +0000)]
am
9658ccd5: am
15c9881c: Merge "ART: Fix arm32 assembly stub CFI"
* commit '
9658ccd58008d6c6ff7c16d8587d8fb840916579':
ART: Fix arm32 assembly stub CFI
Nicolas Geoffray [Mon, 13 Jul 2015 16:04:46 +0000 (16:04 +0000)]
am
6fb5b1bd: Merge "Fix baseline for arm64."
* commit '
6fb5b1bdd5cfcc3c32fedd6539670b01b5cda9a2':
Fix baseline for arm64.
Roland Levillain [Mon, 13 Jul 2015 15:54:55 +0000 (15:54 +0000)]
Revert "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
This reverts commit
bed50d2430e02a3d6b94972e8ab4873d7b3b8be0.
Bug:
21120453
Change-Id: I5e4aab2703966d9324ebde25bd8b83056fdb10ed
Nicolas Geoffray [Mon, 13 Jul 2015 15:54:02 +0000 (15:54 +0000)]
Merge "Fix baseline for arm64."
Nicolas Geoffray [Mon, 13 Jul 2015 15:51:12 +0000 (15:51 +0000)]
am
e0e83608: am
d562cb13: Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
* commit '
e0e83608006c201a64425c8c0efc98fa79a31662':
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
Vladimir Marko [Mon, 13 Jul 2015 15:50:44 +0000 (15:50 +0000)]
am
f32521b1: Merge "ART: Don\'t nest indenters in oatdump."
* commit '
f32521b18b3078b2fbd8f1e52d5da9375cd02cbc':
ART: Don't nest indenters in oatdump.
Andreas Gampe [Mon, 13 Jul 2015 15:50:42 +0000 (15:50 +0000)]
am
15c9881c: Merge "ART: Fix arm32 assembly stub CFI"
* commit '
15c9881c7c480d0131099e436cff2f13ba50e5e3':
ART: Fix arm32 assembly stub CFI
Nicolas Geoffray [Mon, 13 Jul 2015 14:55:26 +0000 (15:55 +0100)]
Fix baseline for arm64.
A HFakeString acts like a null constant. Other backends have
different code paths for handling it, so it was only arm64 failing.
Change-Id: Iba44d87c8d114b916404db0302574c7059143010
Vladimir Marko [Mon, 13 Jul 2015 15:42:00 +0000 (15:42 +0000)]
Merge "ART: Don't nest indenters in oatdump."
Roland Levillain [Mon, 13 Jul 2015 15:38:24 +0000 (15:38 +0000)]
am
811cfddf: Re-enable run-test 449-checker-bce on MIPS64.
* commit '
811cfddf464a89892543f1c8c7389b8dac81ae74':
Re-enable run-test 449-checker-bce on MIPS64.
Nicolas Geoffray [Mon, 13 Jul 2015 15:36:57 +0000 (15:36 +0000)]
am
d562cb13: Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
* commit '
d562cb1347dbb673b6da830cac6fd9e0264d8b2b':
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
Andreas Gampe [Mon, 13 Jul 2015 15:35:27 +0000 (15:35 +0000)]
Merge "ART: Fix arm32 assembly stub CFI"
Nicolas Geoffray [Mon, 13 Jul 2015 15:17:37 +0000 (15:17 +0000)]
Merge "Revert "Revert "Make dex2dex return a CompiledMethod after quickening."""
Roland Levillain [Mon, 13 Jul 2015 14:33:25 +0000 (14:33 +0000)]
am
6576159b: am
af12baea: Merge "Re-enable run-test 449-checker-bce on MIPS64."
* commit '
6576159b061530c4a4b4bb4b233a24471fece8ba':
Re-enable run-test 449-checker-bce on MIPS64.
Nicolas Geoffray [Mon, 13 Jul 2015 14:20:53 +0000 (14:20 +0000)]
am
3ce33cf7: am
f7b3c6ed: Merge "Remove the --compiler-backend option from script."
* commit '
3ce33cf7d09a6cf9d1e8a7f1d9b188406952e728':
Remove the --compiler-backend option from script.
Roland Levillain [Mon, 13 Jul 2015 14:20:41 +0000 (14:20 +0000)]
am
af12baea: Merge "Re-enable run-test 449-checker-bce on MIPS64."
* commit '
af12baeacf33b46a8b399f19735613539382229a':
Re-enable run-test 449-checker-bce on MIPS64.
Roland Levillain [Mon, 13 Jul 2015 12:33:04 +0000 (13:33 +0100)]
Re-enable run-test 449-checker-bce on MIPS64.
(cherry picked from commit
c3f73f788a2f46e4007433bd3ed3dce64e2f5f33)
Bug:
21555893
Change-Id: I92e11637cc1f8f694e4d4138512cbcf47e22a249
Nicolas Geoffray [Mon, 13 Jul 2015 14:06:29 +0000 (14:06 +0000)]
am
f7b3c6ed: Merge "Remove the --compiler-backend option from script."
* commit '
f7b3c6ed3a04e86dc285bac7da7e847e4674e41d':
Remove the --compiler-backend option from script.
Roland Levillain [Mon, 13 Jul 2015 14:06:20 +0000 (14:06 +0000)]
Merge "Re-enable run-test 449-checker-bce on MIPS64."
Nicolas Geoffray [Mon, 13 Jul 2015 13:56:50 +0000 (13:56 +0000)]
Merge "Remove the --compiler-backend option from script."
Nicolas Geoffray [Mon, 13 Jul 2015 11:56:00 +0000 (11:56 +0000)]
Revert "Revert "Make dex2dex return a CompiledMethod after quickening.""
This reverts commit
327c5ed30a1f016ef3e1bb26ea7b4abd34eb63b9.
Change-Id: I0dc5d92e5d1ef98830fbd3c40ec59a93f9e0422d
Nicolas Geoffray [Mon, 13 Jul 2015 13:41:16 +0000 (13:41 +0000)]
am
582a0c3c: am
77d5e6bf: Merge "Change JIT code to use optimizing."
* commit '
582a0c3cd2bed60a6f5501f123d1238dd08184cb':
Change JIT code to use optimizing.
Nicolas Geoffray [Mon, 13 Jul 2015 13:35:17 +0000 (14:35 +0100)]
Remove the --compiler-backend option from script.
Optimizing is now the default for apps.
Change-Id: I15617b881ac7a5a6fe7a281bfa61446bc60ef65d
Nicolas Geoffray [Mon, 13 Jul 2015 13:28:59 +0000 (13:28 +0000)]
am
77d5e6bf: Merge "Change JIT code to use optimizing."
* commit '
77d5e6bf4ea357d332762cde3aa3321a402eac75':
Change JIT code to use optimizing.
Nicolas Geoffray [Mon, 13 Jul 2015 13:18:41 +0000 (13:18 +0000)]
Merge "Change JIT code to use optimizing."
Roland Levillain [Mon, 13 Jul 2015 12:42:26 +0000 (12:42 +0000)]
am
54167205: Merge "Initialize pDeoptimize quick entry pointer for Mips." into mnc-dev
* commit '
54167205ec6f2b5dac3eaec6e4d2f5aee2684c6e':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Mon, 13 Jul 2015 12:33:04 +0000 (13:33 +0100)]
Re-enable run-test 449-checker-bce on MIPS64.
Bug:
21555893
Change-Id: I92e11637cc1f8f694e4d4138512cbcf47e22a249
Roland Levillain [Mon, 13 Jul 2015 12:32:04 +0000 (12:32 +0000)]
Merge "Initialize pDeoptimize quick entry pointer for Mips." into mnc-dev
Vladimir Marko [Fri, 26 Jun 2015 11:06:30 +0000 (12:06 +0100)]
ART: Don't nest indenters in oatdump.
Reduces the time taken by the oatdump_test by ~12s (15%)
on host and ~55s (9%) on N5.
Change-Id: I99bb16ff5f3640389815f1fe54379ca64eac071b
Nicolas Geoffray [Mon, 13 Jul 2015 12:16:50 +0000 (12:16 +0000)]
am
8c8c2ad3: am
f185fb36: Merge "[optimizing] Don\'t rely on the verifier for String.<init>."
* commit '
8c8c2ad31067b9bbdba7e4dc85196d0d863db9c8':
[optimizing] Don't rely on the verifier for String.<init>.
Nicolas Geoffray [Mon, 13 Jul 2015 12:16:49 +0000 (12:16 +0000)]
am
4af5742f: am
5e094de2: Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
* commit '
4af5742fca392c9bd9aea40c4d0cea387a78ba7e':
Revert "Make dex2dex return a CompiledMethod after quickening."
Nicolas Geoffray [Mon, 13 Jul 2015 12:05:24 +0000 (12:05 +0000)]
am
f185fb36: Merge "[optimizing] Don\'t rely on the verifier for String.<init>."
* commit '
f185fb365e9faf58428762bace96d7729ea5bdbc':
[optimizing] Don't rely on the verifier for String.<init>.
Nicolas Geoffray [Mon, 13 Jul 2015 12:05:22 +0000 (12:05 +0000)]
am
5e094de2: Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
* commit '
5e094de24827292d8a13be2adbdcca54ae7d5ff0':
Revert "Make dex2dex return a CompiledMethod after quickening."
Nicolas Geoffray [Mon, 13 Jul 2015 11:55:19 +0000 (11:55 +0000)]
Merge "[optimizing] Don't rely on the verifier for String.<init>."
Nicolas Geoffray [Mon, 13 Jul 2015 11:54:08 +0000 (11:54 +0000)]
Merge "Revert "Make dex2dex return a CompiledMethod after quickening.""
Nicolas Geoffray [Mon, 13 Jul 2015 11:53:56 +0000 (11:53 +0000)]
Revert "Make dex2dex return a CompiledMethod after quickening."
Build failures on arm/arm64.
This reverts commit
6920703c8eae0d90528ea09945e742582b6f8198.
Change-Id: I0dd5426610150937dac6e4d9dd9aa759bdf7fca4
Nicolas Geoffray [Mon, 13 Jul 2015 11:32:53 +0000 (11:32 +0000)]
am
e2329f46: am
8bf1b566: Merge "Make dex2dex return a CompiledMethod after quickening."
* commit '
e2329f46f8302972fa1c874cd029eba7a74e9eed':
Make dex2dex return a CompiledMethod after quickening.
Nicolas Geoffray [Mon, 13 Jul 2015 11:20:43 +0000 (11:20 +0000)]
am
8bf1b566: Merge "Make dex2dex return a CompiledMethod after quickening."
* commit '
8bf1b5668257b50c220c05be5cb1105a9661afba':
Make dex2dex return a CompiledMethod after quickening.
Douglas Leung [Mon, 13 Jul 2015 09:55:45 +0000 (10:55 +0100)]
Initialize pDeoptimize quick entry pointer for Mips.
This fixes art test 449-checker-bce.
(cherry picked from commit
2e8bf554574516e0e6a9b10ccd9f13bf56189795)
Bug:
21555893
Change-Id: I9a87c430168ea35984289b0b4a417aa0c659b6d5
Nicolas Geoffray [Mon, 13 Jul 2015 11:07:18 +0000 (11:07 +0000)]
Merge "Make dex2dex return a CompiledMethod after quickening."
Nicolas Geoffray [Mon, 13 Jul 2015 10:02:11 +0000 (11:02 +0100)]
resolved conflicts for merge of
b0139e85 to mnc-dev-plus-aosp
Change-Id: I52d8f8e72dab68713fcf0723d5c0e52e40890f58
Nicolas Geoffray [Mon, 13 Jul 2015 09:27:05 +0000 (09:27 +0000)]
Merge "Return an invalid StackMap when none can be found." into mnc-dev
Nicolas Geoffray [Fri, 10 Jul 2015 09:56:40 +0000 (10:56 +0100)]
Return an invalid StackMap when none can be found.
bug:
22389275
Partial cherry-pick of:
https://android-review.googlesource.com/#/c/151853
(commit
e12997fbce8e22431be58cac9db2535f7b4a7ac3)
Change-Id: Ia30b817be1b50d97243ba32967eeee359ed679c4
Mathieu Chartier [Mon, 13 Jul 2015 07:21:36 +0000 (07:21 +0000)]
am
99767387: Fix proxy handling in FindDeclaredVirtualMethod
* commit '
997673870a487baa136f1b13f81ae26dd3005e14':
Fix proxy handling in FindDeclaredVirtualMethod
Mathieu Chartier [Sat, 11 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Fix proxy handling in FindDeclaredVirtualMethod
Added missing GetInterfaceMethodIfProxy and test.
Fixed formatting.
Bug:
22411819
https://code.google.com/p/android-developer-preview/issues/detail?id=2635
(cherry picked from commit
72156e28fd6bc72ac965b29446f8801b2e82f2fd)
Change-Id: I3eece9c72091bb9d0262aacf0a75ec6908b5f4d2
Andreas Gampe [Sat, 11 Jul 2015 06:51:03 +0000 (23:51 -0700)]
ART: Fix arm32 assembly stub CFI
Follow-up to
7ea6a170486d81b127e69673cd1020c4db628c93.
Change-Id: Ib6df28653374994c78cd5586f2381d36b74ca846
Andreas Gampe [Sat, 11 Jul 2015 04:41:37 +0000 (04:41 +0000)]
am
d3ef8f54: am
d4da3600: Merge "ART: Add Thread start VLOG"
* commit '
d3ef8f5499275fdc82b79a005b209942815bbd21':
ART: Add Thread start VLOG
Andreas Gampe [Sat, 11 Jul 2015 04:28:43 +0000 (04:28 +0000)]
am
d4da3600: Merge "ART: Add Thread start VLOG"
* commit '
d4da360082e8eadcd12b5030f42a9ba598332471':
ART: Add Thread start VLOG
Andreas Gampe [Sat, 11 Jul 2015 04:15:34 +0000 (04:15 +0000)]
Merge "ART: Add Thread start VLOG"
Andreas Gampe [Fri, 10 Jul 2015 04:53:15 +0000 (21:53 -0700)]
ART: Add Thread start VLOG
Add a stack trace at the time of thread creation or attaching to
the verbose:threads logging.
Change-Id: I5e07c81ce24f145c37ab172eda7bb4c54dad4445
Mathieu Chartier [Sat, 11 Jul 2015 03:07:39 +0000 (03:07 +0000)]
am
ea093986: am
ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"
* commit '
ea093986219743556b058fcac86ab565e1354821':
Fix proxy handling in FindDeclaredVirtualMethod
Mathieu Chartier [Sat, 11 Jul 2015 02:54:14 +0000 (02:54 +0000)]
am
ec97825f: Merge "Fix proxy handling in FindDeclaredVirtualMethod"
* commit '
ec97825f8553b3a99b6dfbbb90a50fe65301ea94':
Fix proxy handling in FindDeclaredVirtualMethod
Mathieu Chartier [Sat, 11 Jul 2015 02:42:47 +0000 (02:42 +0000)]
Merge "Fix proxy handling in FindDeclaredVirtualMethod"
Mathieu Chartier [Sat, 11 Jul 2015 01:26:41 +0000 (18:26 -0700)]
Fix proxy handling in FindDeclaredVirtualMethod
Added missing GetInterfaceMethodIfProxy and test.
Fixed formatting.
Bug:
22411819
https://code.google.com/p/android-developer-preview/issues/detail?id=2635
Change-Id: I3eece9c72091bb9d0262aacf0a75ec6908b5f4d2
Mathieu Chartier [Sat, 11 Jul 2015 01:07:43 +0000 (01:07 +0000)]
am
3e9439c1: am
3aec6a37: Merge "Add VMDebug.countInstancesOfClasses"
* commit '
3e9439c1fcd9b47618e0cbcc0ccc43db6eac28a9':
Add VMDebug.countInstancesOfClasses
Mathieu Chartier [Sat, 11 Jul 2015 00:52:49 +0000 (00:52 +0000)]
am
3aec6a37: Merge "Add VMDebug.countInstancesOfClasses"
* commit '
3aec6a37ac110cbbdc1422b8b1d38c4f9ef9bf5a':
Add VMDebug.countInstancesOfClasses
Mathieu Chartier [Sat, 11 Jul 2015 00:38:16 +0000 (00:38 +0000)]
Merge "Add VMDebug.countInstancesOfClasses"
Mathieu Chartier [Fri, 10 Jul 2015 20:19:51 +0000 (13:19 -0700)]
Add VMDebug.countInstancesOfClasses
countInstancesOfClasses allows passing multiple classes unlike
countInstanceOfClass instead of needing to do one at a time.
This is going to be used to speed up string mode checking.
Also changed the logic to not do a GC, this was the old Dalvik
behavior. It is the job of the caller to do this.
Added test.
https://code.google.com/p/android/issues/detail?id=177552
Change-Id: Ia85684f40cf59a52aa71a8479c711a994651209b
Mathieu Chartier [Fri, 10 Jul 2015 23:15:58 +0000 (23:15 +0000)]
am
297e9c12: am
d6dae315: Merge "Change VisitNativeRoots to use unchecked get for method arrays"
* commit '
297e9c121fef3b94faa283c21225536d402cd9cf':
Change VisitNativeRoots to use unchecked get for method arrays
Mathieu Chartier [Fri, 10 Jul 2015 22:58:41 +0000 (22:58 +0000)]
am
d6dae315: Merge "Change VisitNativeRoots to use unchecked get for method arrays"
* commit '
d6dae315390e7bbb9e29fbc87e364261e737728f':
Change VisitNativeRoots to use unchecked get for method arrays
Mathieu Chartier [Fri, 10 Jul 2015 22:44:12 +0000 (22:44 +0000)]
Merge "Change VisitNativeRoots to use unchecked get for method arrays"
Mathieu Chartier [Fri, 10 Jul 2015 22:00:20 +0000 (15:00 -0700)]
Change VisitNativeRoots to use unchecked get for method arrays
Fixes some DCHECKs.
Change-Id: I464b599866a09bd4294b7033d69be880821767fb
Mathieu Chartier [Fri, 10 Jul 2015 18:34:20 +0000 (18:34 +0000)]
am
554dc0f7: am
eaffe350: Merge "Fix race condition for method root marking in VisitNativeRoots"
* commit '
554dc0f775611a1901b44e469a5b13195d547f5a':
Fix race condition for method root marking in VisitNativeRoots
Mathieu Chartier [Fri, 10 Jul 2015 18:19:19 +0000 (18:19 +0000)]
am
eaffe350: Merge "Fix race condition for method root marking in VisitNativeRoots"
* commit '
eaffe35038dc7b9e9e95ec997d32d19571973f54':
Fix race condition for method root marking in VisitNativeRoots