OSDN Git Service
David Srbecky [Tue, 2 Feb 2016 15:16:58 +0000 (15:16 +0000)]
Merge "Use more compact encoding for DWARF flags." am:
4e09bcb7bd
am:
c240b7b873
* commit '
c240b7b8739a1414330b0bc59783d3db1fe5d7a5':
Use more compact encoding for DWARF flags.
David Srbecky [Tue, 2 Feb 2016 15:16:45 +0000 (15:16 +0000)]
Merge "Optimize DWARF namespace encoding." am:
18e94ee5f7
am:
dc0aa5da50
* commit '
dc0aa5da508e084af2859f31fba56fd1ab2e7a5d':
Optimize DWARF namespace encoding.
David Srbecky [Tue, 2 Feb 2016 15:14:58 +0000 (15:14 +0000)]
Merge "Use more compact encoding for DWARF flags."
am:
4e09bcb7bd
* commit '
4e09bcb7bdb295a86225a4a632436c514d422d24':
Use more compact encoding for DWARF flags.
David Srbecky [Tue, 2 Feb 2016 15:14:51 +0000 (15:14 +0000)]
Merge "Optimize DWARF namespace encoding."
am:
18e94ee5f7
* commit '
18e94ee5f73460e7a35b219e692c897a00e6ab86':
Optimize DWARF namespace encoding.
David Srbecky [Tue, 2 Feb 2016 15:11:26 +0000 (15:11 +0000)]
Merge "Use more compact encoding for DWARF flags."
David Srbecky [Tue, 2 Feb 2016 15:10:55 +0000 (15:10 +0000)]
Merge "Optimize DWARF namespace encoding."
Vladimir Marko [Tue, 2 Feb 2016 15:10:47 +0000 (15:10 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 449." am:
c2dd1761b9
am:
5bfee98b9a
* commit '
5bfee98b9a108ff649d24010410eae1bd6c7ec05':
Optimizing: Do not depend on sharpening in test 449.
Vladimir Marko [Tue, 2 Feb 2016 15:08:49 +0000 (15:08 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 449."
am:
c2dd1761b9
* commit '
c2dd1761b9c7f415f0b38078403ecbe8bf961434':
Optimizing: Do not depend on sharpening in test 449.
Vladimir Marko [Tue, 2 Feb 2016 15:04:57 +0000 (15:04 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 449."
David Brazdil [Tue, 2 Feb 2016 14:56:26 +0000 (14:56 +0000)]
Merge "ART: Add test case for Select implementations" am:
5b38b35dd8
am:
0d65a3ceb8
* commit '
0d65a3ceb85b6bfab09ebd79b98606e569228d9d':
ART: Add test case for Select implementations
Vladimir Marko [Tue, 2 Feb 2016 14:53:47 +0000 (14:53 +0000)]
Optimizing: Do not depend on sharpening in test 449.
The sharpening may or may not remove the ArtMethod*
parameter, so the test must not depend on its absence.
This fixes the test 449 checker test on mips/mips64.
Change-Id: I0c9e7353234365c97b622c7c84708be3dcbbe4ff
David Brazdil [Tue, 2 Feb 2016 14:54:17 +0000 (14:54 +0000)]
Merge "ART: Add test case for Select implementations"
am:
5b38b35dd8
* commit '
5b38b35dd8519787dd801508c30309a2da8c8fa3':
ART: Add test case for Select implementations
David Brazdil [Tue, 2 Feb 2016 14:50:08 +0000 (14:50 +0000)]
Merge "ART: Add test case for Select implementations"
David Srbecky [Fri, 29 Jan 2016 15:13:19 +0000 (15:13 +0000)]
Use more compact encoding for DWARF flags.
Use DW_FORM_flag_present when possible (new in DWARF4).
This avoids encoding the value in entries if it is always true.
Change-Id: Ib31908399b4d0fea7f7c175240aa9b0d6d473b5a
David Srbecky [Fri, 29 Jan 2016 15:02:44 +0000 (15:02 +0000)]
Optimize DWARF namespace encoding.
Instead of encapsulating each class in its own set of namespace tags,
create hierarchy with multiple classes in the leaf namespaces.
Change-Id: I1fdb717d45e5ee3aa0c505c90a15b1670f45774f
David Brazdil [Tue, 2 Feb 2016 10:09:14 +0000 (10:09 +0000)]
ART: Add test case for Select implementations
Change-Id: I487f9cdde321d2bad8239464000ffa20c57c82de
Roland Levillain [Tue, 2 Feb 2016 14:42:29 +0000 (14:42 +0000)]
Merge "Remove unused DMB code paths in the ARM64 Optimizing Compiler" am:
5f16c05407
am:
779c9c7ed6
* commit '
779c9c7ed6eed8a511bb07bffec0a87dc793e1d5':
Remove unused DMB code paths in the ARM64 Optimizing Compiler
Roland Levillain [Tue, 2 Feb 2016 14:40:22 +0000 (14:40 +0000)]
Merge "Remove unused DMB code paths in the ARM64 Optimizing Compiler"
am:
5f16c05407
* commit '
5f16c05407ed5f7f72fa761263fd5eac37de0077':
Remove unused DMB code paths in the ARM64 Optimizing Compiler
Roland Levillain [Tue, 2 Feb 2016 14:36:58 +0000 (14:36 +0000)]
Merge "Remove unused DMB code paths in the ARM64 Optimizing Compiler"
Roland Levillain [Tue, 2 Feb 2016 13:01:16 +0000 (13:01 +0000)]
Merge "ARM64: Add direct calls to math intrinsics" am:
b86f963ce9
am:
9acfccef54
* commit '
9acfccef545db97537625eabf7d9c90756b1d928':
ARM64: Add direct calls to math intrinsics
Roland Levillain [Tue, 2 Feb 2016 12:59:13 +0000 (12:59 +0000)]
Merge "ARM64: Add direct calls to math intrinsics"
am:
b86f963ce9
* commit '
b86f963ce95b25bfae892fa425ab02f2fb706f87':
ARM64: Add direct calls to math intrinsics
Roland Levillain [Tue, 2 Feb 2016 12:55:02 +0000 (12:55 +0000)]
Merge "ARM64: Add direct calls to math intrinsics"
Anton Kirilov [Wed, 20 Jan 2016 16:48:19 +0000 (16:48 +0000)]
ARM64: Add direct calls to math intrinsics
This change mirrors the work that has already been done for x86 and
x86_64. The following functions are affected: cos, sin, acos, asin,
atan, atan2, cbrt, cosh, exp, expm1, hypot, log, log10, nextafter,
sinh, tan, tanh.
Change-Id: I0f381bd2c1c4273b243c045107110fed551c6124
Signed-off-by: Anton Kirilov <anton.kirilov@linaro.org>
Vladimir Marko [Tue, 2 Feb 2016 11:33:34 +0000 (11:33 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 569." am:
909147a304
am:
32c9a17fa0
* commit '
32c9a17fa03f003fc567e7caccd96158e5315211':
Optimizing: Do not depend on sharpening in test 569.
Vladimir Marko [Tue, 2 Feb 2016 11:31:20 +0000 (11:31 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 569."
am:
909147a304
* commit '
909147a304500737824de5e1feab135560881e86':
Optimizing: Do not depend on sharpening in test 569.
Vladimir Marko [Tue, 2 Feb 2016 11:26:15 +0000 (11:26 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 569."
Vladimir Marko [Tue, 2 Feb 2016 11:10:16 +0000 (11:10 +0000)]
Optimizing: Do not depend on sharpening in test 569.
The sharpening may or may not remove the ArtMethod*
parameter, so the test must not depend on its absence.
This fixes the test 569 checker test on mips/mips64.
Change-Id: Ibee88d3602778006558caf33cf69e7c419918699
Sebastien Hertz [Tue, 2 Feb 2016 10:57:29 +0000 (10:57 +0000)]
Merge "Revert "ART: Mterp for arm64"" am:
f1e2b4dd92
am:
a9270b9a34
* commit '
a9270b9a34e5069f518f16d2c8cea974defca9ab':
Revert "ART: Mterp for arm64"
Sebastien Hertz [Tue, 2 Feb 2016 10:55:19 +0000 (10:55 +0000)]
Merge "Revert "ART: Mterp for arm64""
am:
f1e2b4dd92
* commit '
f1e2b4dd9238d85d041f47b6bd853babe0a53c85':
Revert "ART: Mterp for arm64"
Sebastien Hertz [Tue, 2 Feb 2016 10:50:30 +0000 (10:50 +0000)]
Merge "Revert "ART: Mterp for arm64""
Sebastien Hertz [Tue, 2 Feb 2016 10:48:49 +0000 (10:48 +0000)]
Revert "ART: Mterp for arm64"
This reverts commit
e0c269e0a5f50b1a551ddba1205f6e5b4b5e6c98.
The CL is causing build breakages on arm64 targets.
Change-Id: I7402fe34869258ae870c57308b2062e50d801bdd
Vladimir Marko [Tue, 2 Feb 2016 10:45:57 +0000 (10:45 +0000)]
Merge "MIPS64: Remove unaligned memory access from art generated code" am:
a9e5521b2a
am:
f1177ec145
* commit '
f1177ec14540a1405471fc7092e8702e9f7c840f':
MIPS64: Remove unaligned memory access from art generated code
Vladimir Marko [Tue, 2 Feb 2016 10:43:54 +0000 (10:43 +0000)]
Merge "MIPS64: Remove unaligned memory access from art generated code"
am:
a9e5521b2a
* commit '
a9e5521b2ae04a64c5a90be6955fc154d4a5da4e':
MIPS64: Remove unaligned memory access from art generated code
Vladimir Marko [Tue, 2 Feb 2016 10:39:20 +0000 (10:39 +0000)]
Merge "MIPS64: Remove unaligned memory access from art generated code"
Bill Buzbee [Tue, 2 Feb 2016 09:13:19 +0000 (09:13 +0000)]
Merge "ART: Mterp for arm64" am:
7fac3532a8
am:
2989fb5968
* commit '
2989fb5968f5478e283e941e2f8c8d7ec230ab85':
ART: Mterp for arm64
Mathieu Chartier [Tue, 2 Feb 2016 09:13:10 +0000 (09:13 +0000)]
Merge "Fix up dex cache strings stored in classes" am:
85db315a42
am:
5872a1c224
* commit '
5872a1c2247433aeff4a89ca1de29dc81f031edd':
Fix up dex cache strings stored in classes
Mathieu Chartier [Tue, 2 Feb 2016 09:13:01 +0000 (09:13 +0000)]
Merge "Add read barrier option to UpdateEntrypoints" am:
36fe0e8709
am:
d3e3679764
* commit '
d3e3679764d5f8d1afc8f5744d9577d193c5a1dc':
Add read barrier option to UpdateEntrypoints
Bill Buzbee [Tue, 2 Feb 2016 04:44:18 +0000 (04:44 +0000)]
Merge "ART: Mterp for arm64"
am:
7fac3532a8
* commit '
7fac3532a836920cf4d478d97b9d67b2bf2aed39':
ART: Mterp for arm64
Bill Buzbee [Tue, 2 Feb 2016 04:40:47 +0000 (04:40 +0000)]
Merge "ART: Mterp for arm64"
Mathieu Chartier [Tue, 2 Feb 2016 04:11:54 +0000 (04:11 +0000)]
Merge "Fix up dex cache strings stored in classes"
am:
85db315a42
* commit '
85db315a4245666be0d0dfafa46818b404a7b8b2':
Fix up dex cache strings stored in classes
Mathieu Chartier [Tue, 2 Feb 2016 04:05:22 +0000 (04:05 +0000)]
Merge "Fix up dex cache strings stored in classes"
Mathieu Chartier [Mon, 1 Feb 2016 18:34:47 +0000 (10:34 -0800)]
Fix up dex cache strings stored in classes
Previously we left the image pointer instead of fixing up the pointer
to the one in the BSS. This only showed up because JIT does the same
as boot image, bypassing null check.
Fixed a bug where oat files without embedded dex cache arrays would
get their dex cache arrays corrupted.
Added a non virtual class visitor for performance.
Bug:
26846419
Bug:
22858531
Change-Id: I8cd0d61e440f753b4628ddb8c932eb23a0a81027
Mathieu Chartier [Tue, 2 Feb 2016 02:12:32 +0000 (02:12 +0000)]
Merge "Add read barrier option to UpdateEntrypoints"
am:
36fe0e8709
* commit '
36fe0e870901070703152e43346e88dc7ae45f0f':
Add read barrier option to UpdateEntrypoints
Mathieu Chartier [Tue, 2 Feb 2016 02:07:06 +0000 (02:07 +0000)]
Merge "Add read barrier option to UpdateEntrypoints"
Mathieu Chartier [Tue, 2 Feb 2016 00:08:15 +0000 (16:08 -0800)]
Add read barrier option to UpdateEntrypoints
Also call this without read barrier for image relocation.
Bug:
26786304
Change-Id: Ia718c1491b54cadb7283c62afc1eb9031a15b4ef
buzbee [Wed, 27 Jan 2016 02:23:19 +0000 (18:23 -0800)]
ART: Mterp for arm64
Ready for review. All opcodes handled. All applicable run-tests pass.
Device boots to desktop in interpret-only mode.
Change-Id: I937d8bcf848a831e04d4b9de8d1914667a197d75
Aart Bik [Mon, 1 Feb 2016 18:38:45 +0000 (18:38 +0000)]
Merge "Implemented signum() on ARM64." am:
c3cf1d2e35
am:
d911390be7
* commit '
d911390be760b2e53bd47e6e9abf4c2d2280c4f0':
Implemented signum() on ARM64.
Aart Bik [Mon, 1 Feb 2016 18:36:46 +0000 (18:36 +0000)]
Merge "Implemented signum() on ARM64."
am:
c3cf1d2e35
* commit '
c3cf1d2e35a45bd2e2c60fbc9c2a1a6a56dfc529':
Implemented signum() on ARM64.
Aart Bik [Mon, 1 Feb 2016 18:32:50 +0000 (18:32 +0000)]
Merge "Implemented signum() on ARM64."
Aart Bik [Fri, 29 Jan 2016 20:54:04 +0000 (12:54 -0800)]
Implemented signum() on ARM64.
Change-Id: Ib805e62341f6c5e4fcc35c73d12e217fbae948ce
David Brazdil [Mon, 1 Feb 2016 18:11:46 +0000 (18:11 +0000)]
Merge "ART: Fix test 117 after OatFileAssistant change" am:
fda30a435d
am:
ebfb119dee
* commit '
ebfb119deefd0783a2198ecddae321143260a42c':
ART: Fix test 117 after OatFileAssistant change
David Brazdil [Mon, 1 Feb 2016 18:09:20 +0000 (18:09 +0000)]
Merge "ART: Fix test 117 after OatFileAssistant change"
am:
fda30a435d
* commit '
fda30a435d672988c3ec1805905b359a5e756bf3':
ART: Fix test 117 after OatFileAssistant change
David Brazdil [Mon, 1 Feb 2016 18:06:16 +0000 (18:06 +0000)]
Merge "ART: Fix test 117 after OatFileAssistant change"
David Brazdil [Mon, 1 Feb 2016 18:00:06 +0000 (18:00 +0000)]
ART: Fix test 117 after OatFileAssistant change
Change-Id: I20fc37ab869cb025c7ac5b550f5349d2e17de112
David Brazdil [Mon, 1 Feb 2016 16:56:53 +0000 (16:56 +0000)]
Merge "ART: Release DexFile in OatFileAssistant" am:
7375fa1b21
am:
76b4a6dd9a
* commit '
76b4a6dd9afb0410e25e7d7d62dae748319f34cd':
ART: Release DexFile in OatFileAssistant
David Brazdil [Mon, 1 Feb 2016 16:54:30 +0000 (16:54 +0000)]
Merge "ART: Release DexFile in OatFileAssistant"
am:
7375fa1b21
* commit '
7375fa1b2169a12de69e03679b67a6f04128d9e0':
ART: Release DexFile in OatFileAssistant
David Brazdil [Mon, 1 Feb 2016 16:50:36 +0000 (16:50 +0000)]
Merge "ART: Release DexFile in OatFileAssistant"
David Brazdil [Mon, 1 Feb 2016 16:32:50 +0000 (16:32 +0000)]
ART: Release DexFile in OatFileAssistant
Change-Id: I4ff0041191d2fe7a33c2b55f163a33e92da62b6b
Roland Levillain [Mon, 1 Feb 2016 15:54:45 +0000 (15:54 +0000)]
Merge "Ensure instruction cache is flushed in compiler tests with Clang." am:
d111cce1d2
am:
9a3ae4e2a9
* commit '
9a3ae4e2a9e62a0c8bc8393586f3e899a6ede587':
Ensure instruction cache is flushed in compiler tests with Clang.
Roland Levillain [Mon, 1 Feb 2016 15:52:57 +0000 (15:52 +0000)]
Merge "Ensure instruction cache is flushed in compiler tests with Clang."
am:
d111cce1d2
* commit '
d111cce1d266567d71be828c4213f3456dbdac2c':
Ensure instruction cache is flushed in compiler tests with Clang.
Roland Levillain [Mon, 1 Feb 2016 15:48:42 +0000 (15:48 +0000)]
Merge "Ensure instruction cache is flushed in compiler tests with Clang."
David Brazdil [Mon, 1 Feb 2016 15:34:41 +0000 (15:34 +0000)]
Merge "Ignore image checksum for ExtractOnly oat files" am:
bceee26590
am:
455a4bfd50
* commit '
455a4bfd506d4cd2c6956c78b07d485594114e04':
Ignore image checksum for ExtractOnly oat files
David Brazdil [Mon, 1 Feb 2016 15:32:38 +0000 (15:32 +0000)]
Merge "Ignore image checksum for ExtractOnly oat files"
am:
bceee26590
* commit '
bceee26590c8c757987689d2e1002c2f98f0ab33':
Ignore image checksum for ExtractOnly oat files
David Brazdil [Mon, 1 Feb 2016 15:27:34 +0000 (15:27 +0000)]
Merge "Ignore image checksum for ExtractOnly oat files"
Roland Levillain [Mon, 1 Feb 2016 15:23:20 +0000 (15:23 +0000)]
Ensure instruction cache is flushed in compiler tests with Clang.
Invoke __builtin___clear_cache with Clang in
art::CommonCompilerTest::MakeExecutable. This fixes
"Illegal instruction" failures in codegen_test on angler.
Factor this logic in a function and use it in
art::jit::JitCodeCache::CommitCodeInternal too.
Bug:
26786447
Change-Id: I81fa056c8d7c6bf2168c9340deeab82231cb1084
David Brazdil [Thu, 28 Jan 2016 15:05:49 +0000 (15:05 +0000)]
Ignore image checksum for ExtractOnly oat files
Oat files compiled with --compiler-filter=verify-at-runtime contain
no compiled code and therefore are independent of the boot image.
This patch stores an ExtractOnly flag in the oat header and skips
the image checksum test if the flag is set, rendering the oat file
up to date even after OTAs.
Bug:
26813999
Change-Id: I25291d5b49d9e9d0018844e957a2dc88ef6bdc27
Nicolas Geoffray [Mon, 1 Feb 2016 15:08:54 +0000 (15:08 +0000)]
Merge "Be on the safe side: emit an environment for runtime calls." am:
99b4d43c7b
am:
860169dde5
* commit '
860169dde56ab89777153de20bcd1b962e269859':
Be on the safe side: emit an environment for runtime calls.
Nicolas Geoffray [Mon, 1 Feb 2016 15:07:01 +0000 (15:07 +0000)]
Merge "Be on the safe side: emit an environment for runtime calls."
am:
99b4d43c7b
* commit '
99b4d43c7b2c81a0a4712578016efdfc65cdc21b':
Be on the safe side: emit an environment for runtime calls.
Nicolas Geoffray [Mon, 1 Feb 2016 15:02:23 +0000 (15:02 +0000)]
Merge "Be on the safe side: emit an environment for runtime calls."
Narayan Kamath [Mon, 1 Feb 2016 14:09:07 +0000 (14:09 +0000)]
Narayan Kamath [Mon, 1 Feb 2016 14:06:16 +0000 (14:06 +0000)]
Narayan Kamath [Mon, 1 Feb 2016 14:01:36 +0000 (14:01 +0000)]
Calin Juravle [Mon, 1 Feb 2016 13:51:25 +0000 (13:51 +0000)]
Merge "Invoke all other registered handlers only for generated code" am:
3caf203854
am:
fe4e778d3f
* commit '
fe4e778d3f9077ca90baabb5556a82fd3ff19274':
Invoke all other registered handlers only for generated code
Calin Juravle [Mon, 1 Feb 2016 13:49:31 +0000 (13:49 +0000)]
Merge "Invoke all other registered handlers only for generated code"
am:
3caf203854
* commit '
3caf203854a9270eed6d2858744fc1f6a3f76940':
Invoke all other registered handlers only for generated code
Narayan Kamath [Mon, 1 Feb 2016 13:22:18 +0000 (13:22 +0000)]
Track libcore change
aa517a356a38b8cd6764667e1edd735aaf5978e9.
Change-Id: I32a995eb62e3268c20fa5c2ac8dc2bf190c6fb7a
Calin Juravle [Mon, 1 Feb 2016 13:43:27 +0000 (13:43 +0000)]
Merge "Invoke all other registered handlers only for generated code"
Nicolas Geoffray [Mon, 1 Feb 2016 12:23:22 +0000 (12:23 +0000)]
Be on the safe side: emit an environment for runtime calls.
Even if those runtime calls don't throw, they may be interrupted
and be asked to dump their stack. Since dumping a stack also dumps
locked Java objects, we need a DexRegisterMap at these locations
to know the location of those objects.
Adds 0.05% to boot image code size.
bug:
26168076
Change-Id: I7c3975addea9ddf3123183b07108b0701bb26fc8
David Brazdil [Mon, 1 Feb 2016 12:25:05 +0000 (12:25 +0000)]
Merge "ART: Disallow uses of uninitialized references" am:
6f2c459c97
am:
4e2ecda358
* commit '
4e2ecda358b57dd464711229ee5ef90ac8b94227':
ART: Disallow uses of uninitialized references
David Brazdil [Mon, 1 Feb 2016 12:23:19 +0000 (12:23 +0000)]
Merge "ART: Disallow uses of uninitialized references"
am:
6f2c459c97
* commit '
6f2c459c97fad172991d05f96cb6036050c2db97':
ART: Disallow uses of uninitialized references
David Brazdil [Mon, 1 Feb 2016 12:19:53 +0000 (12:19 +0000)]
Merge "ART: Disallow uses of uninitialized references"
David Brazdil [Tue, 19 Jan 2016 14:25:29 +0000 (14:25 +0000)]
ART: Disallow uses of uninitialized references
The following instructions accepted uninitialized reference types
as their arguments:
- instance-of
- check-cast
- throw
- iput-object (stored value argument)
- sput-object
- invoke-* (non-this arguments)
Monitor-enter and monitor-exit are allowed.
Bug:
26594149
Change-Id: I2a4decb1fba274b8969b17bc237ac0fd19b93c80
Narayan Kamath [Mon, 1 Feb 2016 11:47:58 +0000 (11:47 +0000)]
Merge "Revert "Disable test after failing test was pushed."" am:
2b8624cf94
am:
643207f508
* commit '
643207f5081476d16a82255e79be19e591990cc0':
Revert "Disable test after failing test was pushed."
Narayan Kamath [Mon, 1 Feb 2016 11:46:12 +0000 (11:46 +0000)]
Merge "Revert "Disable test after failing test was pushed.""
am:
2b8624cf94
* commit '
2b8624cf9487e9dee3b817833499564b627248c4':
Revert "Disable test after failing test was pushed."
Narayan Kamath [Mon, 1 Feb 2016 11:41:40 +0000 (11:41 +0000)]
Merge "Revert "Disable test after failing test was pushed.""
Narayan Kamath [Mon, 1 Feb 2016 10:40:38 +0000 (10:40 +0000)]
Revert "Disable test after failing test was pushed."
This reverts commit
fd825201137046db7ffa4371ad6d374beda89735.
The change that fixes this test has been submitted.
Change-Id: I35612987b6b149f538b6c6d757eaa626b5349bbd
Mathieu Chartier [Sat, 30 Jan 2016 01:05:45 +0000 (01:05 +0000)]
Merge "Clean up UpdateOatFile for app images" am:
7f1551d28b
am:
356fe5e881
* commit '
356fe5e88172cb6734ec5aa4634068a375857b72':
Clean up UpdateOatFile for app images
Mathieu Chartier [Sat, 30 Jan 2016 01:03:51 +0000 (01:03 +0000)]
Merge "Clean up UpdateOatFile for app images"
am:
7f1551d28b
* commit '
7f1551d28b3674799a4bb2b198bf6b16f32082af':
Clean up UpdateOatFile for app images
Mathieu Chartier [Sat, 30 Jan 2016 00:58:56 +0000 (00:58 +0000)]
Merge "Clean up UpdateOatFile for app images"
Mathieu Chartier [Sat, 30 Jan 2016 00:14:25 +0000 (00:14 +0000)]
Merge "Add oat checksum check for app image loading" am:
dc5909af87
am:
0436f59846
* commit '
0436f59846caa2979002ba1db10ff61f3b085a70':
Add oat checksum check for app image loading
Mathieu Chartier [Sat, 30 Jan 2016 00:12:33 +0000 (00:12 +0000)]
Merge "Add oat checksum check for app image loading"
am:
dc5909af87
* commit '
dc5909af876474898e34bb41240130f6c3a37b6c':
Add oat checksum check for app image loading
Mathieu Chartier [Fri, 29 Jan 2016 04:33:36 +0000 (20:33 -0800)]
Clean up UpdateOatFile for app images
Check that for the there is only one oat file name for the app image
case.
Avoid calling GetOatElfInformation unless necessary.
Bug:
22858531
Change-Id: I88d258a1cc2823956ecc4fca9a6f7b2d3c4b986e
Mathieu Chartier [Sat, 30 Jan 2016 00:07:45 +0000 (00:07 +0000)]
Merge "Add oat checksum check for app image loading"
Mathieu Chartier [Fri, 29 Jan 2016 23:54:18 +0000 (23:54 +0000)]
Merge "ART: Do not reopen oat file in ImageWriter::UpdateOatFile()." am:
472964bceb
am:
092ccae9f7
* commit '
092ccae9f786c1a9c9cfacdd612328ac017ba3e9':
ART: Do not reopen oat file in ImageWriter::UpdateOatFile().
Mathieu Chartier [Fri, 29 Jan 2016 23:52:09 +0000 (23:52 +0000)]
Merge "ART: Do not reopen oat file in ImageWriter::UpdateOatFile()."
am:
472964bceb
* commit '
472964bcebeeb42e7428aca93c2d8d6295e865ee':
ART: Do not reopen oat file in ImageWriter::UpdateOatFile().
Jeff Hao [Fri, 29 Jan 2016 23:50:06 +0000 (23:50 +0000)]
Merge "Regression test ensuring unresolved classes are not put in dex cache." am:
36a0cc7176
am:
7e98241854
* commit '
7e98241854013694a7c6ff0829259a0bf441037a':
Regression test ensuring unresolved classes are not put in dex cache.
Mathieu Chartier [Fri, 29 Jan 2016 23:48:56 +0000 (23:48 +0000)]
Merge "ART: Do not reopen oat file in ImageWriter::UpdateOatFile()."
Jeff Hao [Fri, 29 Jan 2016 23:48:11 +0000 (23:48 +0000)]
Merge "Regression test ensuring unresolved classes are not put in dex cache."
am:
36a0cc7176
* commit '
36a0cc7176f271b170f972aae86fccd0c4bfd241':
Regression test ensuring unresolved classes are not put in dex cache.
Jeff Hao [Fri, 29 Jan 2016 23:43:04 +0000 (23:43 +0000)]
Merge "Regression test ensuring unresolved classes are not put in dex cache."
Jeff Hao [Fri, 29 Jan 2016 02:22:36 +0000 (18:22 -0800)]
Regression test ensuring unresolved classes are not put in dex cache.
Bug:
26792072
(cherry-picked from commit
2bf56594e78ab7b01ee85c1d885c92cb469dfdf2)
Change-Id: I4e9f4ab0b8ff215c39d854ee041c1acfedcf0b6d
Jeff Hao [Fri, 29 Jan 2016 23:39:38 +0000 (23:39 +0000)]
Merge "Regression test ensuring unresolved classes are not put in dex cache."
OSDN Git Service
