summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-30Merge "Revert "ART: Fix up some multi-image cases"" Nicolas Geoffray
2015-12-30Revert "ART: Fix up some multi-image cases" Nicolas Geoffray
Fails imgdiag_test on device. Bug: 26317072 Bug: 26320300 This reverts commit 288b1e9a0dddfb91e85067fe81de55174f313c7c. Change-Id: Iccd05827b0630281b6f959331eaa4202526df78e
2015-12-30Merge "Add new test expectations after enso move." Nicolas Geoffray
2015-12-30Add new test expectations after enso move. Nicolas Geoffray
bug:26353151 bug:26326992 Change-Id: I7e172fceb265938435cae8eb4c0ef79ba6209348
2015-12-30Merge "On x64, cmpl can never take a int64 immediate." Nicolas Geoffray
2015-12-30On x64, cmpl can never take a int64 immediate. Nicolas Geoffray
Fix a wrong type widening in x64 code generator and add CHECKs in the assembler. Change-Id: Id35f5d47c6cf78ed07e73ab783db09712d3c437f
2015-12-30Merge "Fix code generation for String.<init> on x64." Nicolas Geoffray
2015-12-30Merge "Fix bogus logging statement." Narayan Kamath
2015-12-30Fix bogus logging statement. Narayan Kamath
We were always logging an empty string. Change-Id: I9ebc89ce2df8cb664aaf2640a16dcd85bdfa036e
2015-12-30Merge "ART: Fix JDWP GetClassLoader command" Andreas Gampe
2015-12-29ART: Fix JDWP GetClassLoader command Andreas Gampe
The command is spec-ed to take a type, and return the type's classloader. The input is thus already a Class, not a generic Object. Fix the implementation to not always return null. Bug: 26349019 Change-Id: I4aa075902f4a112624edc644d3540a59eea057c8
2015-12-29Merge "ART: Fix up some multi-image cases" Andreas Gampe
2015-12-29Fix code generation for String.<init> on x64. Nicolas Geoffray
The ArtMethod is a 64bit pointer so should be loaded with movq. Change-Id: I80803046a9144776d7f069e8baee61e39ae289d5
2015-12-28ART: Fix up some multi-image cases Andreas Gampe
Change the auto-generated multi-image names to include the path components from the first image, as well as prefix them with the first image's name to disambiguate. This fixes vogar-style usage. Fix an out-of-bounds issue in dex2oat when dex files are missing. Forbid generating or patching multi-image parts when loading images. Instead just fail loading them. Remember ImageSpace instances that have been added while trying to load a multi-image set. Remove all loaded instances when the overall loading process fails. Refactor the dex location adaptation into ImageSpace. Reuse the code in the Runtime path for fallback, so that all dex files can be found correctly. Fix an out-of-bounds access in OatFileAssistant in fallback mode. Partially reverts d895961d07a1d320b29f2045a48bc5a1944a4d3c. Push an actual image name, that is, something with an art extension, to the vogar scripts. Partially reverts c525604b313bb77a2077e1fec43dfab76cb1b9b1. Test 119-noimage-patchoat works again. Bug: 26317072 Bug: 26320300 Change-Id: I3f05fa77f22a2b9ca54c3105ffc53646c1928604
2015-12-28Merge changes I00dc6cfc,Iae8f1c88 Andreas Gampe
* changes: ART: Disable Math.round intrinsics Revert "Make Math.round consistent on arm64."
2015-12-28ART: Disable Math.round intrinsics Andreas Gampe
The move to OpenJDK means that Android has caught up with the definition change of Math.round. Disable intrinsics. Bug: 26327751 Change-Id: I00dc6cfca12bd7c95e56a4ab76ffee707d3822dc
2015-12-28Revert "Make Math.round consistent on arm64." Andreas Gampe
This reverts commit 40041c9a38e3961d8675d117517719458a115520. Needs to be generalized to all platforms. Bug: 26327751 Change-Id: Iae8f1c8846d120d8e3e99b6eb87f3760bf793ec5
2015-12-27Merge "Remove duplicate entry in expectations." Nicolas Geoffray
2015-12-27Remove duplicate entry in expectations. Nicolas Geoffray
Change-Id: Ia265787f132ae8a5685fa0a699fa133f6f7f0554
2015-12-27Merge "Make Math.round consistent on arm64." Nicolas Geoffray
2015-12-27Make Math.round consistent on arm64. Nicolas Geoffray
OpenJDK seems to have a different rounding implementation than libcore. Temporarily disable the intrinsic. Test that fails: Assert.assertEquals(StrictMath.round(0.49999999999999994d), 1l); Assert.assertEquals(Math.round(0.49999999999999994d), 1l); bug:26327751 Change-Id: Iad2fb847e4a553b8c1f5031f772c81e7e4db9f4c
2015-12-27Merge "Tweaks to get vogar runs working after enso move." Nicolas Geoffray
2015-12-27Tweaks to get vogar runs working after enso move. Nicolas Geoffray
- Use ART_TEST_ANDROID_ROOT for the dex locations, so that ART can find resources. - Use the pre-compiled boot image to avoid b/26320300. - Add new failures to failures file. bug:26320300 Change-Id: I08653b563f837a7ac3a014424951417f6bdd3294
2015-12-26Merge "Tweaks to get run-test working after enso." Nicolas Geoffray
2015-12-26Tweaks to get run-test working after enso. Nicolas Geoffray
- test 119 temporarily disabled - set java.io.tmpdir in the command line for target bug:26320300 Change-Id: I9ddeac4f23f065eea62511f9fa392ea4764d0435
2015-12-24Merge internal master into aosp/master. Narayan Kamath
2015-12-24Merge "Save profile information in a separate thread." am: 58b2329de7 Calin Juravle
am: da6e49016d * commit 'da6e49016dc37704f45b13217a8c6f8e726ab8e1': Save profile information in a separate thread.
2015-12-24Merge "Save profile information in a separate thread." Calin Juravle
am: 58b2329de7 * commit '58b2329de74a73d2f0a7ed001e50cc39df33d9da': Save profile information in a separate thread.
2015-12-24Merge "Save profile information in a separate thread." Calin Juravle
2015-12-24Save profile information in a separate thread. Calin Juravle
Previously we would save the profiling information only when the app was sent to background. This missed on an important number of updates on the jit code cache and it didn't work for background processes. Bug: 26080105 Change-Id: I84075629870e69b3ed372f00f4806af1e9391e0f
2015-12-24Merge "Dex2oat support for multiple oat file and image file outputs." Andreas Gampe
2015-12-23Dex2oat support for multiple oat file and image file outputs. Jeff Hao
Multiple changes to dex2oat and the runtime to support a --multi-image option. This generates a separate oat file and image file output for each dex file input. Change-Id: Ie1d6f0b8afa8aed5790065b8c2eb177990c60129
2015-12-23Merge "Optimize HLoadClass when we know the class is in the cache." am: ↵ Nicolas Geoffray
883ef45b5d am: bd5a084171 am: 8dac686bc7 * commit '8dac686bc7f975d098c18614572c4685373792a0':
2015-12-23Merge "Add backward branch instumentation to the switch interpreter." am: ↵ Nicolas Geoffray
fca8008f54 am: 3abc5a1b36 am: 05eeb91c08 * commit '05eeb91c08ae5d81862dc068f54c3c3047f257a2':
2015-12-23Merge "ART: Fix SafeMap::Put()/PutBefore() rvalue overloads." am: dcb07112d1 ↵ Vladimir Marko
am: d8fd461658 am: 586e765022 * commit '586e7650227f9f7685544540cf99e20d8a931e1b':
2015-12-23Merge "A few more optimizations on avoiding HClinit." am: 95f7bbcd99 am: ↵ Nicolas Geoffray
a7386e40c2 am: dbfe31b53c * commit 'dbfe31b53c9560d07f4a5960f4eae673dce000eb':
2015-12-23Merge "MIPS32: Record missing implicit null checks" am: b110fd6f23 am: ↵ Nicolas Geoffray
67efef697b am: 2aaa4ba667 * commit '2aaa4ba66727d45367a6d88760891789271638a4':
2015-12-23Merge "Revamp art::CheckEntrypointTypes uses." am: 22c20ef131 am: f27aa970e6 Roland Levillain
am: 67ef7262bc * commit '67ef7262bc90adde06176d53712bcc385aec574d':
2015-12-23Merge "MIPS64: Support short and long branches" am: 51a354c747 am: e73ddd8db1 Roland Levillain
am: d75def2278 * commit 'd75def2278fbca3c1c7bd9e5fab3443c63d1aa52':
2015-12-23Merge "Add another test for wide stores fix in optimizing." am: 7f8275549f ↵ Nicolas Geoffray
am: 03ea981f95 am: ffeabe2039 * commit 'ffeabe20390d16d6b9c2f04825b42e18c2702342':
2015-12-23Merge "Clean up read barrier related comments in Optimizing." am: 43922a52eb ↵ Roland Levillain
am: 94d4b661ce am: 672e6ccc49 * commit '672e6ccc499a8636ef42106c7eacf36135bb3448':
2015-12-23Merge "Revert "lambda: Add support for invoke-interface for boxed innate ↵ Nicolas Geoffray
lambdas"" am: a4bce7141a am: 3928e8ccc3 am: 776db131f3 * commit '776db131f3755cf4bde7b8b02b9f7d18c0e941b2':
2015-12-23Merge "Disable JDWP tests with read barriers." am: 0c32fdeaed am: 54c9448680 Roland Levillain
am: fcd595a72c * commit 'fcd595a72c9c5efa8b5d22ce6177667fdd9bedb6':
2015-12-23Merge "Make target-sync work with verity." am: db001ab8d8 am: 9db399ea9a Alex Light
am: 96667e03b7 * commit '96667e03b70312d86c23001218c64d0536328fb3':
2015-12-23Merge "ARM64: Add support for multiply-accumulate." am: 67e0ad6df9 am: ↵ Vladimir Marko
f6dc22c5d7 am: 1aa98e4182 * commit '1aa98e41829e7bf378d19d267a5e685999fe33b3':
2015-12-23Merge "ART: Fix wide stores in Optimizing" am: 349106d96c am: fb601d2eeb David Brazdil
am: f177c7394a * commit 'f177c7394abc5ab219cae57820be0125e0f64c1f':
2015-12-23Merge "Optimizing: Avoid a PrettyMethod() call per compiled method." am: ↵ Vladimir Marko
eb4955b5aa am: a5c0a6c6de am: 6e556435ab * commit '6e556435abdb0290883f263d80a4f05872adb243':
2015-12-23Merge "Do not change to the access check entrypoint when inlined." am: ↵ Nicolas Geoffray
6d92d59fb0 am: c61ac2785c am: 00df6d2bc0 * commit '00df6d2bc054021c7ea4a45ee440af1c9ba3099d':
2015-12-23Merge "Optimizing/ARM: Improve long shifts by 1." am: f180af0fc0 am: f2550c7330 Vladimir Marko
am: bda98bfb15 * commit 'bda98bfb15a5ecfec4128d8cc59eeda02ccce638':
2015-12-23Merge "Optimizing/Thumb2: Improve load/store for large offsets." am: ↵ Vladimir Marko
97cd5bb34c am: 7d1e7e8dc4 am: 47c471fd01 * commit '47c471fd0174c0c8ca840b5271adf78191096bf6':