OSDN Git Service
Sebastien Hertz [Thu, 5 Nov 2015 07:41:00 +0000 (07:41 +0000)]
Merge "Fix continuous build"
am:
e597d59771
* commit '
e597d59771ac85a18744587eebc8711286aae5d4':
Fix continuous build
Sebastien Hertz [Thu, 5 Nov 2015 07:38:42 +0000 (07:38 +0000)]
Merge "Fix continuous build"
Sebastien Hertz [Thu, 5 Nov 2015 07:32:10 +0000 (08:32 +0100)]
Fix continuous build
Stop building vogar.jar target since it no longer exists.
Change-Id: I4b834abd519736199c5ee1e5881b3531dbbf2c6f
Mathieu Chartier [Thu, 5 Nov 2015 02:12:52 +0000 (02:12 +0000)]
Merge "Add basic image writer support for app images"
am:
a930832a4e
* commit '
a930832a4ef0a2ef0835c5db4650750018ab0765':
Add basic image writer support for app images
Mathieu Chartier [Thu, 5 Nov 2015 02:09:05 +0000 (02:09 +0000)]
Merge "Add basic image writer support for app images"
Mathieu Chartier [Mon, 2 Nov 2015 18:30:20 +0000 (10:30 -0800)]
Add basic image writer support for app images
Needed to handle references from app image -> boot image.
Generate app images for tests to enable some testing.
Bug:
22858531
Change-Id: I1af98b6c4dfcb3a147fb5b0dea64aa4946c7ce57
Andreas Gampe [Wed, 4 Nov 2015 23:44:16 +0000 (23:44 +0000)]
Merge "ART: Change behavior for rethrowing init failures"
am:
accc24985c
* commit '
accc24985c08e98a27f43bc856fba4c3c48e79e9':
ART: Change behavior for rethrowing init failures
Andreas Gampe [Wed, 4 Nov 2015 23:42:13 +0000 (23:42 +0000)]
Merge "ART: Change behavior for rethrowing init failures"
David Brazdil [Wed, 4 Nov 2015 22:52:08 +0000 (22:52 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation""
am:
3c60103948
* commit '
3c60103948a8357497765965234eff7a56164061':
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
David Brazdil [Wed, 4 Nov 2015 22:49:06 +0000 (22:49 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation""
David Brazdil [Wed, 4 Nov 2015 22:48:45 +0000 (22:48 +0000)]
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
Crashes on YouTube, need to investigate
This reverts commit
1749e2cfb5c5ed4d6970a09aecf898ca9cdfcb75.
Change-Id: If5f133d55dcc26b8db79a670a48fbd4af7807556
Andreas Gampe [Tue, 3 Nov 2015 00:20:00 +0000 (16:20 -0800)]
ART: Change behavior for rethrowing init failures
Allow to store a Throwable instance or a throwable class. Handle
rethrow accordingly.
Bug:
25444180
Change-Id: I703c2c6eaf34ad0e3bc0f5a104d65f2ff1b212ca
David Brazdil [Wed, 4 Nov 2015 18:57:23 +0000 (18:57 +0000)]
Merge "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
am:
26bfcec526
* commit '
26bfcec526860857410944f0d437957d109ef7ae':
ART: Implement DeadPhiHandling in PrimitiveTypePropagation
David Brazdil [Wed, 4 Nov 2015 18:48:52 +0000 (18:48 +0000)]
Merge "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
David Brazdil [Mon, 28 Sep 2015 12:49:59 +0000 (13:49 +0100)]
ART: Implement DeadPhiHandling in PrimitiveTypePropagation
DeadPhiHandling revives non-conflicting phis with environment uses
but does not properly merge types. To not duplicate code, this patch
modifies PrimitiveTypePropagation to deal with conflicts and thus
replaces DeadPhiHandling altogether.
Bug:
24252151
Bug:
24252100
Change-Id: I198c71d1b8167fc05783a5a24aa9f1e3804acafe
Vladimir Marko [Wed, 4 Nov 2015 16:31:16 +0000 (16:31 +0000)]
Merge "Delay emitting CFI PC adjustments until after Thumb2/Mips fixup."
am:
c8894ab502
* commit '
c8894ab5021aecd0fa5eba94af47f732914af33b':
Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.
Vladimir Marko [Wed, 4 Nov 2015 16:27:44 +0000 (16:27 +0000)]
Merge "Delay emitting CFI PC adjustments until after Thumb2/Mips fixup."
Vladimir Marko [Thu, 22 Oct 2015 14:25:54 +0000 (15:25 +0100)]
Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.
On Mips also take into account out-of-order CFI data emitted
from EmitBranches().
Change-Id: I03b0b0b4c2b1ea31a02699ef5fa1c55aa42c23c3
Nicolas Geoffray [Wed, 4 Nov 2015 11:01:18 +0000 (11:01 +0000)]
Merge "Fix test in case we run the ART_TEST_TRACE tests."
am:
b178e11d9e
* commit '
b178e11d9eb44fc0ac666049f3aa14f7f14ffd64':
Fix test in case we run the ART_TEST_TRACE tests.
Nicolas Geoffray [Wed, 4 Nov 2015 10:58:11 +0000 (10:58 +0000)]
Merge "Fix test in case we run the ART_TEST_TRACE tests."
Nicolas Geoffray [Wed, 4 Nov 2015 10:57:23 +0000 (10:57 +0000)]
Fix test in case we run the ART_TEST_TRACE tests.
Change-Id: Ic998a29f2d5c573f34def798eb4f2fe5cf30e8a5
Sebastien Hertz [Wed, 4 Nov 2015 10:12:36 +0000 (10:12 +0000)]
Merge "JDWP: fix java.lang.String creation"
am:
6bf6e438cd
* commit '
6bf6e438cd4746effce0b26d504c54100191c988':
JDWP: fix java.lang.String creation
Sebastien Hertz [Wed, 4 Nov 2015 10:10:12 +0000 (10:10 +0000)]
Merge "JDWP: fix java.lang.String creation"
Nicolas Geoffray [Wed, 4 Nov 2015 09:33:03 +0000 (09:33 +0000)]
Merge "Fix TODO on instrumentation and add some more DCHECKs."
am:
12cbc87247
* commit '
12cbc872477dd278a27599d8714381657211b184':
Fix TODO on instrumentation and add some more DCHECKs.
Nicolas Geoffray [Wed, 4 Nov 2015 09:32:54 +0000 (09:32 +0000)]
Merge "Fix mips32oc ArraySet null constant assignment"
am:
147bc832ca
* commit '
147bc832ca81c4297c38c14eb7d5a8e281d4483d':
Fix mips32oc ArraySet null constant assignment
Nicolas Geoffray [Wed, 4 Nov 2015 09:30:50 +0000 (09:30 +0000)]
Merge "Fix TODO on instrumentation and add some more DCHECKs."
Nicolas Geoffray [Wed, 4 Nov 2015 09:29:53 +0000 (09:29 +0000)]
Merge "Fix mips32oc ArraySet null constant assignment"
Nicolas Geoffray [Tue, 3 Nov 2015 18:58:57 +0000 (18:58 +0000)]
Fix TODO on instrumentation and add some more DCHECKs.
bug:
25343683
bug:
25438583
Change-Id: I232deb1b6761466b514c687ce304f61928755cdc
Pavle Batuta [Tue, 3 Nov 2015 12:23:54 +0000 (13:23 +0100)]
Fix mips32oc ArraySet null constant assignment
Fix assigning a null constant to an array index. Previously this
would unnecessarily invoke pAputObject.
This commit fixes previous test failure: 521-checker-array-set-null.
Change-Id: I02ff5296fa3a48b021c0dfd9bb10628ba6e5d5e5
Bill Yi [Tue, 3 Nov 2015 22:28:55 +0000 (14:28 -0800)]
Igor Murashkin [Tue, 3 Nov 2015 21:20:28 +0000 (21:20 +0000)]
Merge "lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews."
am:
f33ea7911d
* commit '
f33ea7911dadab2e49c4634cb1763f0526047e89':
lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.
Igor Murashkin [Tue, 3 Nov 2015 21:15:50 +0000 (21:15 +0000)]
Merge "lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews."
Richard Uhler [Tue, 3 Nov 2015 19:51:16 +0000 (19:51 +0000)]
Merge "Annotate References with their referent."
am:
530dcc8b74
* commit '
530dcc8b74a0f4e5f54e2b2c326580d58594a2f7':
Annotate References with their referent.
Nicolas Geoffray [Tue, 3 Nov 2015 19:51:07 +0000 (19:51 +0000)]
Merge "Fix broken handling of instrumentation lists."
am:
fb4b605612
* commit '
fb4b60561201fb866bdfbe6be8f0f1b5d8794809':
Fix broken handling of instrumentation lists.
Alex Light [Tue, 3 Nov 2015 19:50:59 +0000 (19:50 +0000)]
Merge "Make things generally quieter."
am:
3f922d1f3c
* commit '
3f922d1f3ccd7a1341f887ac3e8176b5208ecf6d':
Make things generally quieter.
Bill Yi [Tue, 3 Nov 2015 19:39:47 +0000 (19:39 +0000)]
Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD
am:
243a468c11
* commit '
243a468c11fdb24ce549353b7427678dc8e9e2d5':
Richard Uhler [Tue, 3 Nov 2015 19:39:36 +0000 (19:39 +0000)]
Merge "Limit summary string lengths to 200 characters."
am:
7727ea62d0
* commit '
7727ea62d0f10ded6225abca2dfa2c421051d341':
Limit summary string lengths to 200 characters.
Richard Uhler [Tue, 3 Nov 2015 18:44:22 +0000 (18:44 +0000)]
Merge "Annotate References with their referent."
Richard Uhler [Thu, 29 Oct 2015 20:02:42 +0000 (13:02 -0700)]
Annotate References with their referent.
Also, don't include annotations in an object's link. That way we can
distinguish between the object link and any links in the annotations.
Change-Id: I3fef3f5b2c343699f527cad9efa7c93a4b35a3a4
Nicolas Geoffray [Tue, 3 Nov 2015 18:33:28 +0000 (18:33 +0000)]
Merge "Fix broken handling of instrumentation lists."
Alex Light [Tue, 3 Nov 2015 18:15:48 +0000 (18:15 +0000)]
Merge "Make things generally quieter."
Alex Light [Thu, 29 Oct 2015 00:00:06 +0000 (17:00 -0700)]
Make things generally quieter.
* Give run-test a --quiet flag that causes it to only print on errors.
* Give cpplint a --quiet flag that causes it to not print anything
when there are no errors.
* Add a ART_TEST_QUIET flag to build/Android.common_test.mk which
makes run-test targets much quieter when true (the default). With
this flag only failures will be printed.
* Make build/Android.cpplint.mk pass the new cpplint --quiet flag so
that only failures will be printed.
Before:
[ 96% 5715/5906] build test-art-host-run-test-debug-prebuild-interpreter-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-461-get-reference-vreg32
test-art-host-run-test-debug-prebuild-interpreter-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-448-multiple-returns32 RUNNING
/usr/local/google/buildbot/src/googleplex-android/master-art-host/art/test/448-multiple-returns: building...
/usr/local/google/buildbot/src/googleplex-android/master-art-host/art/test/448-multiple-returns: running...
/usr/local/google/buildbot/src/googleplex-android/master-art-host/art/test/448-multiple-returns: succeeded!
test-art-host-run-test-debug-prebuild-interpreter-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-448-multiple-returns32 PASSED
After:
[ 96% 5715/5906] build test-art-host-run-test-debug-prebuild-interpreter-relocate-ntrace-cms-checkjni-image-npictest-ndebuggable-461-get-reference-vreg32
Change-Id: Idf6fce7f48a619f83254b48861dbd7f8eb4ebdbf
Bill Yi [Tue, 3 Nov 2015 17:38:46 +0000 (09:38 -0800)]
Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
Richard Uhler [Tue, 3 Nov 2015 17:00:33 +0000 (17:00 +0000)]
Merge "Limit summary string lengths to 200 characters."
Nicolas Geoffray [Tue, 3 Nov 2015 11:44:24 +0000 (11:44 +0000)]
Fix broken handling of instrumentation lists.
- We cannot copy before iterating, as entries might be deleted.
- We cannot remove entries in the list, as mutators could be
currently iterating over it.
Solution in this change is to never remove list entries, but
put null when a listener is removed. When adding a listener, we
will either put it where there is a null slot, or at the end
of the list if there is no null slot.
Change-Id: Id94582fd971cd56bcb445caff64270d21987f700
Sebastien Hertz [Tue, 3 Nov 2015 16:38:35 +0000 (17:38 +0100)]
JDWP: fix java.lang.String creation
Bug:
25439464
Change-Id: I56f11ed942585e8110dbbba1178cf11ec76e032f
Richard Uhler [Tue, 3 Nov 2015 16:04:47 +0000 (16:04 +0000)]
Merge "Use --oat-fd instead of --oat-file when calling dex2oat."
am:
ea834bbed4
* commit '
ea834bbed4f39d23cb2aafb1aa5cf73f71bcf21a':
Use --oat-fd instead of --oat-file when calling dex2oat.
Richard Uhler [Tue, 3 Nov 2015 16:01:56 +0000 (16:01 +0000)]
Merge "Use --oat-fd instead of --oat-file when calling dex2oat."
Nicolas Geoffray [Tue, 3 Nov 2015 10:30:10 +0000 (10:30 +0000)]
Merge "Fix deadlock with the JIT code cache."
am:
df6dc42ba2
* commit '
df6dc42ba2ca0fa43ba970ba2e60977422105f7e':
Fix deadlock with the JIT code cache.
Nicolas Geoffray [Tue, 3 Nov 2015 10:28:03 +0000 (10:28 +0000)]
Merge "Fix deadlock with the JIT code cache."
Nicolas Geoffray [Wed, 28 Oct 2015 19:15:05 +0000 (19:15 +0000)]
Fix deadlock with the JIT code cache.
Also remove hack done for ThreadStress.
Change-Id: Ie25c3bca08d9f2b8919706fa3fc26c5ab213f4a3
Hiroshi Yamauchi [Mon, 2 Nov 2015 23:34:06 +0000 (23:34 +0000)]
Merge "Minor improvements for the CC collector."
am:
4bbe7807f3
* commit '
4bbe7807f313bb8e59131812c31bf31513094f8f':
Minor improvements for the CC collector.
Hiroshi Yamauchi [Mon, 2 Nov 2015 23:30:47 +0000 (23:30 +0000)]
Merge "Minor improvements for the CC collector."
Igor Murashkin [Tue, 6 Oct 2015 20:59:43 +0000 (13:59 -0700)]
lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.
Change-Id: I64f867d4ed5a5efcac138097f38efe4bb7f1281d
Alex Light [Mon, 2 Nov 2015 20:52:21 +0000 (20:52 +0000)]
Merge "Fix minor problems with interface verification and default methods."
am:
3482c27127
* commit '
3482c271278b30ca7a5c6206b7f80332616f6a84':
Fix minor problems with interface verification and default methods.
Alex Light [Mon, 2 Nov 2015 20:48:52 +0000 (20:48 +0000)]
Merge "Fix minor problems with interface verification and default methods."
David Brazdil [Mon, 2 Nov 2015 20:30:58 +0000 (20:30 +0000)]
Merge "Revert "ART: Update DCE to work with try/catch""
am:
86a8e247e3
* commit '
86a8e247e3cd873c03bb79f79bf88a1b4c4e0597':
Revert "ART: Update DCE to work with try/catch"
David Brazdil [Mon, 2 Nov 2015 20:24:35 +0000 (20:24 +0000)]
Merge "Revert "ART: Update DCE to work with try/catch""
David Brazdil [Mon, 2 Nov 2015 20:24:24 +0000 (20:24 +0000)]
Revert "ART: Update DCE to work with try/catch"
This reverts commit
ce52901e2c8377fc1c331ae0faf7fbcb46b9da97.
Change-Id: I6b3a1f2a3dc036030b089b0df2005ecefa66b949
Hiroshi Yamauchi [Thu, 29 Oct 2015 03:59:47 +0000 (20:59 -0700)]
Minor improvements for the CC collector.
- Split Mark() and inline its first part.
- Make sure some other routines are inlined.
- Add some UNLIKELY's.
- Use VisitConcurrentRoots().
Ritz EAAC GC time decreased from 28.9 -> 27.6s (-4.5%) on N5.
Bug:
12687968
Change-Id: I7bd13f162e7daa2a5853000fb22c5fefc318994f
David Brazdil [Mon, 2 Nov 2015 19:30:51 +0000 (19:30 +0000)]
Merge "ART: Update DCE to work with try/catch"
am:
808e752491
* commit '
808e7524918da5f7f41d2ceaa58dbb381e5708ff':
ART: Update DCE to work with try/catch
David Brazdil [Mon, 2 Nov 2015 19:26:14 +0000 (19:26 +0000)]
Merge "ART: Update DCE to work with try/catch"
David Brazdil [Thu, 29 Oct 2015 00:25:55 +0000 (19:25 -0500)]
ART: Update DCE to work with try/catch
Dead block elimination was previously disabled because it needed
to be updated. With this patch, try/catch blocks can be removed
as a result of a dead if/switch branch.
Change-Id: I3261060bf24fd5fe7bb0f989247f0ef62ec5fd7b
Mathieu Chartier [Mon, 2 Nov 2015 16:53:15 +0000 (16:53 +0000)]
Merge "Add application image dex2oat options"
am:
49560fcce5
* commit '
49560fcce5b9a07108f7cc75a3fb0fa265e5fa0e':
Add application image dex2oat options
Mathieu Chartier [Mon, 2 Nov 2015 16:49:09 +0000 (16:49 +0000)]
Merge "Add application image dex2oat options"
Mathieu Chartier [Thu, 29 Oct 2015 22:41:36 +0000 (15:41 -0700)]
Add application image dex2oat options
Bug:
22858531
Change-Id: Ia6a2a832b20b5bb70672521cd06f679335efbd92
Nicolas Geoffray [Mon, 2 Nov 2015 15:50:41 +0000 (15:50 +0000)]
Merge "Fix tests flakiness with jit when using Proxy classes."
am:
e00197d605
* commit '
e00197d60579838974c02853fd3371ac761922ae':
Fix tests flakiness with jit when using Proxy classes.
Nicolas Geoffray [Mon, 2 Nov 2015 15:48:07 +0000 (15:48 +0000)]
Merge "Fix tests flakiness with jit when using Proxy classes."
Nicolas Geoffray [Mon, 2 Nov 2015 11:57:11 +0000 (11:57 +0000)]
Fix tests flakiness with jit when using Proxy classes.
We cannot copy the entry point between ArtMethod when
the entry point has been JITted. We put the interpreter
bridge instead.
bug:
25334878
Change-Id: I65a50cc1f10a5a152733807f8c85fb3ed81c5829
Nicolas Geoffray [Mon, 2 Nov 2015 14:34:16 +0000 (14:34 +0000)]
Merge "Fix stalled comment from last commit."
am:
78ef3fee3f
* commit '
78ef3fee3fcf0b2cfb68b3e943cd144d389313fd':
Fix stalled comment from last commit.
Nicolas Geoffray [Mon, 2 Nov 2015 14:30:30 +0000 (14:30 +0000)]
Merge "Fix stalled comment from last commit."
Nicolas Geoffray [Mon, 2 Nov 2015 14:27:16 +0000 (14:27 +0000)]
Fix stalled comment from last commit.
Change-Id: Ic54821c80a8c6ab76d44e2a81a6f821b5741dc53
Nicolas Geoffray [Mon, 2 Nov 2015 13:58:07 +0000 (13:58 +0000)]
Merge "Fix inlining and lse bugs with unresolved access."
am:
816b2b3f70
* commit '
816b2b3f704d61ba608ad2c3513d4697e7fb5dfe':
Fix inlining and lse bugs with unresolved access.
Nicolas Geoffray [Mon, 2 Nov 2015 13:52:48 +0000 (13:52 +0000)]
Merge "Fix inlining and lse bugs with unresolved access."
Nicolas Geoffray [Sat, 31 Oct 2015 22:21:31 +0000 (22:21 +0000)]
Fix inlining and lse bugs with unresolved access.
bug:
25414532
Change-Id: I48b6660754774ea3e8a62a74175b1aa3728e0151
Christopher Ferris [Sat, 31 Oct 2015 16:15:10 +0000 (16:15 +0000)]
Merge "Remove extra space at end of line in output."
am:
43c6d31c43
* commit '
43c6d31c43c05d97511bb9658964fd3d2f32b915':
Remove extra space at end of line in output.
Christopher Ferris [Sat, 31 Oct 2015 16:11:30 +0000 (16:11 +0000)]
Merge "Remove extra space at end of line in output."
Nicolas Geoffray [Sat, 31 Oct 2015 15:06:51 +0000 (15:06 +0000)]
Merge "Remove package on which we cannot revert."
am:
f0b308bdba
* commit '
f0b308bdba546081d64d1e593395f8957b3a2e89':
Remove package on which we cannot revert.
Nicolas Geoffray [Sat, 31 Oct 2015 14:49:14 +0000 (14:49 +0000)]
Merge "Remove package on which we cannot revert."
Nicolas Geoffray [Sat, 31 Oct 2015 14:47:36 +0000 (14:47 +0000)]
Remove package on which we cannot revert.
Change-Id: I863176f91747e418bc3365b724970d3354a75971
Christopher Ferris [Fri, 30 Oct 2015 21:21:16 +0000 (14:21 -0700)]
Remove extra space at end of line in output.
The done dumping histograms message in DumpHistogram had an extra
space before the \n, which this CL removes.
Change-Id: I9db3c185cb39fec6cbe78a60699357448bc6e3b0
David Brazdil [Fri, 30 Oct 2015 20:11:12 +0000 (20:11 +0000)]
Merge "ART: Enable inlining under try/catch"
am:
3e0597facd
* commit '
3e0597facd506073fcf91db2d81ae2ffdce6b701':
ART: Enable inlining under try/catch
David Brazdil [Fri, 30 Oct 2015 20:05:29 +0000 (20:05 +0000)]
Merge "ART: Enable inlining under try/catch"
David Brazdil [Fri, 30 Oct 2015 17:56:58 +0000 (12:56 -0500)]
ART: Enable inlining under try/catch
This patch updates the inliner to set try/catch information
when inlining into a method with try/catch. It does not yet
allow inlining of methods with try/catch because that will
require generating catch stack maps with inline info.
Change-Id: I7d57e1454e7da537d75c5c7eda60b22f3a30fa60
Andreas Gampe [Fri, 30 Oct 2015 18:19:41 +0000 (18:19 +0000)]
Merge "ART: Arm32 packed-switch jump tables"
am:
c74e69f831
* commit '
c74e69f831608964f89ac7a641fbcc09156eefaa':
ART: Arm32 packed-switch jump tables
Andreas Gampe [Fri, 30 Oct 2015 18:17:00 +0000 (18:17 +0000)]
Merge "ART: Arm32 packed-switch jump tables"
Andreas Gampe [Tue, 20 Oct 2015 04:31:53 +0000 (21:31 -0700)]
ART: Arm32 packed-switch jump tables
Add jump table support to the thumb2 assembler. Jump tables are
a collection of labels for the case targets, and an anchor label
denoting the position of the jump.
Use the jump table support to implement packed-switch support for
arm32.
Add tests for BindTrackedLabel and JumpTable to the thumb2 assembler
test.
Bug:
24092914
Change-Id: I5c84f193dfebf9e07f48678efc8bd151bb1410dd
Vladimir Marko [Fri, 30 Oct 2015 18:06:29 +0000 (18:06 +0000)]
Merge "Merge test 539 into test 538-checker-embed-constants."
am:
564420bc5b
* commit '
564420bc5b37572d45067fd71ed64d818ef3030d':
Merge test 539 into test 538-checker-embed-constants.
Vladimir Marko [Fri, 30 Oct 2015 18:02:36 +0000 (18:02 +0000)]
Merge "Merge test 539 into test 538-checker-embed-constants."
Nicolas Geoffray [Fri, 30 Oct 2015 16:44:40 +0000 (16:44 +0000)]
Merge "X86: Add support for ucomis[sd] reg/memory form"
am:
34e38c43d4
* commit '
34e38c43d4728fb1d3a011f8c142bff94927f6fb':
X86: Add support for ucomis[sd] reg/memory form
Nicolas Geoffray [Fri, 30 Oct 2015 16:42:15 +0000 (16:42 +0000)]
Merge "X86: Add support for ucomis[sd] reg/memory form"
Vladimir Marko [Fri, 30 Oct 2015 16:30:40 +0000 (16:30 +0000)]
Merge "Keep list of dex files for oat file in CompilerDriver."
am:
469e9c4515
* commit '
469e9c4515cb68509f02def2fe6c0465ffb55628':
Keep list of dex files for oat file in CompilerDriver.
Vladimir Marko [Fri, 30 Oct 2015 16:26:49 +0000 (16:26 +0000)]
Merge "Keep list of dex files for oat file in CompilerDriver."
Vladimir Marko [Thu, 29 Oct 2015 12:18:29 +0000 (12:18 +0000)]
Keep list of dex files for oat file in CompilerDriver.
Use this list to improve invoke-static/-direct dispatch for
intra-oat calls.
Also fix a latent ArmBaseRelativePatcher::ReserveSpaceEnd()
bug exposed by a buggy early version of this CL: when we
have unresolved patches at the end of all code, we need to
emit a final thunk. Though the OatWriter will try to patch
the unresolved call to a trampoline at the beginning of the
oat file, that trampoline may be too far and the relative
patcher doesn't know about it anyway, so it needs to assume
that a thunk is needed.
This reduces the overall size of oat files present in dalvik
cache on Nexus 9 after first boot by over 1MiB, AOSP ToT,
aosp_flounder-userdebug build.
Change-Id: I98604b70cb17377eed057c1c23971865cf344e43
Mark Mendell [Fri, 30 Oct 2015 13:21:37 +0000 (09:21 -0400)]
X86: Add support for ucomis[sd] reg/memory form
Allow an Address as the second operand.
Change-Id: I4940829e2e4bfe0cddef3808265fdb638ac07b7e
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Fri, 30 Oct 2015 12:59:00 +0000 (12:59 +0000)]
Merge "A generic jni method can be instrumented."
am:
289c4e3a10
* commit '
289c4e3a10acb6d0250dc25dd42465ca4d08c762':
A generic jni method can be instrumented.
Nicolas Geoffray [Fri, 30 Oct 2015 12:45:42 +0000 (12:45 +0000)]
Merge "A generic jni method can be instrumented."
Nicolas Geoffray [Fri, 30 Oct 2015 12:25:54 +0000 (12:25 +0000)]
Merge "Add a few instructions to setup-buildbot-devices.sh"
am:
257df4e79a
* commit '
257df4e79a7fc53406fd39f1417611d6e1cac316':
Add a few instructions to setup-buildbot-devices.sh
Nicolas Geoffray [Fri, 30 Oct 2015 12:23:16 +0000 (12:23 +0000)]
A generic jni method can be instrumented.
Fixes tracing 119-noimage-patchoat test.
Change-Id: Ifc9709b714dbad6e087d327fdde7a008e5e731d3
Nicolas Geoffray [Fri, 30 Oct 2015 12:22:04 +0000 (12:22 +0000)]
Merge "Add a few instructions to setup-buildbot-devices.sh"