OSDN Git Service
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 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.
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
Mathieu Chartier [Fri, 10 Jul 2015 18:08:56 +0000 (18:08 +0000)]
Merge "Fix race condition for method root marking in VisitNativeRoots"
Mathieu Chartier [Fri, 10 Jul 2015 01:31:35 +0000 (18:31 -0700)]
Fix race condition for method root marking in VisitNativeRoots
Only mark if non null, we may see a non zero length with a null
array due to race conditions with class loading.
Bug:
22077752
Change-Id: Icd37f70482efe320185d46ce4391aa0e0e43ff6f
Nicolas Geoffray [Fri, 10 Jul 2015 16:29:39 +0000 (17:29 +0100)]
Change JIT code to use optimizing.
Obviously, will fall back to quick for most methods currently,
due to lack of -QUICK opcodes support.
Change-Id: I28882fbe805cd907275b6047437d9639a475964a
Aart Bik [Fri, 10 Jul 2015 17:41:34 +0000 (17:41 +0000)]
am
01aef866: am
753e36e2: Merge "Enable multi-dex content per file in dexlist/dump."
* commit '
01aef866122cdef715701b9e3c2474d76dcd3ca3':
Enable multi-dex content per file in dexlist/dump.
Roland Levillain [Fri, 10 Jul 2015 17:41:32 +0000 (17:41 +0000)]
am
3bf6e581: am
e46d0b50: Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
* commit '
3bf6e581f0f0c1b6a8a582e2a0e3aaba414bef0d':
Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."
Aart Bik [Fri, 10 Jul 2015 17:29:44 +0000 (17:29 +0000)]
am
753e36e2: Merge "Enable multi-dex content per file in dexlist/dump."
* commit '
753e36e29a75db786d1dfe0aaeec526cea463c76':
Enable multi-dex content per file in dexlist/dump.
Roland Levillain [Fri, 10 Jul 2015 17:29:43 +0000 (17:29 +0000)]
am
e46d0b50: Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
* commit '
e46d0b50fe63c3d7b7a690d8d367bae2c17a3dfe':
Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."
Aart Bik [Fri, 10 Jul 2015 17:25:39 +0000 (17:25 +0000)]
Merge "Enable multi-dex content per file in dexlist/dump."
Nicolas Geoffray [Fri, 10 Jul 2015 10:38:52 +0000 (11:38 +0100)]
[optimizing] Don't rely on the verifier for String.<init>.
Continue work on cutting the dependency on the verifier.
Change-Id: I0f95b1eb2e10fd8f6bf54817f1202bdf6dfdb0fe
Roland Levillain [Fri, 10 Jul 2015 17:19:29 +0000 (17:19 +0000)]
Merge "Revert "Fuse long and FP compare & condition on ARM64 in Optimizing.""
Roland Levillain [Fri, 10 Jul 2015 17:18:11 +0000 (17:18 +0000)]
Revert "Fuse long and FP compare & condition on ARM64 in Optimizing."
This reverts commit
5cfe61f27ed9203498169355bb95db756486d292.
Change-Id: I9879e76e7f8315cace05700e3b571a6a4749bf1a
Nicolas Geoffray [Thu, 9 Jul 2015 17:15:19 +0000 (18:15 +0100)]
Make dex2dex return a CompiledMethod after quickening.
This is the starting piece of pushing more verification and
dex2dex data into an .oat file, to lower the dependency on verification
results at runtime.
Change-Id: I8e1b49a0207714bc5b84d1f606806718c5c7fb69
Andreas Gampe [Fri, 10 Jul 2015 16:59:47 +0000 (16:59 +0000)]
am
25e1af5b: ART: Change merges with Undefined to Undefined
* commit '
25e1af5b4e1ce7e03a188ca1d0197a9f5b6acaf8':
ART: Change merges with Undefined to Undefined
Roland Levillain [Fri, 10 Jul 2015 15:32:29 +0000 (15:32 +0000)]
am
2efd93fe: am
404ea410: Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
* commit '
2efd93fefe29787f501bc82e43d570857df1376e':
Fuse long and FP compare & condition on ARM64 in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 15:19:12 +0000 (15:19 +0000)]
am
404ea410: Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
* commit '
404ea410c5c1566909ae741582046b7cae2bd681':
Fuse long and FP compare & condition on ARM64 in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 15:10:46 +0000 (15:10 +0000)]
Merge "Fuse long and FP compare & condition on ARM64 in Optimizing."
Roland Levillain [Fri, 10 Jul 2015 11:13:29 +0000 (11:13 +0000)]
am
9e58a50d: am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
9e58a50d64c83527eeb3278669900e7e3e18d1c4':
Fuse long and FP compare & condition on ARM in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 11:01:37 +0000 (11:01 +0000)]
am
f4000216: Merge "Fuse long and FP compare & condition on ARM in Optimizing."
* commit '
f40002163fed58215df569e89f0a0b9661e16273':
Fuse long and FP compare & condition on ARM in Optimizing.
Roland Levillain [Fri, 10 Jul 2015 10:51:14 +0000 (10:51 +0000)]
Merge "Fuse long and FP compare & condition on ARM in Optimizing."
Roland Levillain [Fri, 10 Jul 2015 10:35:10 +0000 (10:35 +0000)]
am
4821d42c: am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
4821d42ca747a4118bd6750ceaad3a51502569ad':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Fri, 10 Jul 2015 10:20:41 +0000 (10:20 +0000)]
am
f16b820f: Merge "Initialize pDeoptimize quick entry pointer for Mips."
* commit '
f16b820fc18ff86e765a14176f05417305d689a0':
Initialize pDeoptimize quick entry pointer for Mips.
Roland Levillain [Fri, 10 Jul 2015 10:08:06 +0000 (10:08 +0000)]
Merge "Initialize pDeoptimize quick entry pointer for Mips."
Roland Levillain [Fri, 10 Jul 2015 09:38:11 +0000 (10:38 +0100)]
Fuse long and FP compare & condition on ARM64 in Optimizing.
Bug:
21120453
Change-Id: I701e808600fb5ba9ff4d0f5e19e4ce22b1d34b29
Andreas Gampe [Fri, 10 Jul 2015 01:53:40 +0000 (01:53 +0000)]
am
b0423784: am
f470eb88: Merge "ART: Change merges with Undefined to Undefined"
* commit '
b0423784ca9251c055ac063956e4c7623d773649':
ART: Change merges with Undefined to Undefined
OSDN Git Service
