OSDN Git Service
Nicolas Geoffray [Thu, 5 Nov 2015 14:48:09 +0000 (14:48 +0000)]
Merge "Fix flake around instrumentation." am:
55a77ef5f9
am:
653e7d770a
* commit '
653e7d770a1f8c5ef710276997babd09c483bb48':
Fix flake around instrumentation.
Nicolas Geoffray [Thu, 5 Nov 2015 14:46:04 +0000 (14:46 +0000)]
Merge "Fix flake around instrumentation."
am:
55a77ef5f9
* commit '
55a77ef5f99c2b056eb5f2820c1ff3b29c0ec270':
Fix flake around instrumentation.
Nicolas Geoffray [Thu, 5 Nov 2015 14:43:33 +0000 (14:43 +0000)]
Merge "Fix flake around instrumentation."
Nicolas Geoffray [Thu, 5 Nov 2015 13:26:17 +0000 (13:26 +0000)]
Fix flake around instrumentation.
bug:
25492507
Change-Id: Ia4de07ecaf33c3153f5d93473671d2c93593f52d
Nicolas Geoffray [Thu, 5 Nov 2015 13:00:19 +0000 (13:00 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT." am:
b24301b06b
am:
6ec2986ea8
* commit '
6ec2986ea8213a60ec341969e7eaf1b7dbaa0a58':
Code cleanup to avoid CompilerDriver abstractions in JIT.
Nicolas Geoffray [Thu, 5 Nov 2015 12:57:39 +0000 (12:57 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT."
am:
b24301b06b
* commit '
b24301b06b31b463f7e92ebc9a8f75839e54b746':
Code cleanup to avoid CompilerDriver abstractions in JIT.
Nicolas Geoffray [Thu, 5 Nov 2015 12:53:57 +0000 (12:53 +0000)]
Merge "Code cleanup to avoid CompilerDriver abstractions in JIT."
Nicolas Geoffray [Thu, 5 Nov 2015 12:21:07 +0000 (12:21 +0000)]
Merge "Properly delete the jit thread pool." am:
2b13eaa500
am:
db1d1dec24
* commit '
db1d1dec24f78768d4a828d1542e41458e1b8138':
Properly delete the jit thread pool.
Nicolas Geoffray [Thu, 5 Nov 2015 12:18:32 +0000 (12:18 +0000)]
Merge "Properly delete the jit thread pool."
am:
2b13eaa500
* commit '
2b13eaa50065346d4a1345b05fe2e1455df6d71d':
Properly delete the jit thread pool.
Nicolas Geoffray [Thu, 5 Nov 2015 12:16:09 +0000 (12:16 +0000)]
Merge "Properly delete the jit thread pool."
Nicolas Geoffray [Wed, 4 Nov 2015 17:22:16 +0000 (17:22 +0000)]
Properly delete the jit thread pool.
bug:
25461989
bug:
25462600
Change-Id: I273cf256285d01c085e4dea1d997955d029361b9
Nicolas Geoffray [Wed, 4 Nov 2015 14:36:55 +0000 (14:36 +0000)]
Code cleanup to avoid CompilerDriver abstractions in JIT.
Avoids allocating a CompiledMethod.
Change-Id: I35b4aa0d7c74daba68e827a01e71c300fce3b3bf
Nicolas Geoffray [Thu, 5 Nov 2015 09:24:17 +0000 (09:24 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests"" am:
ad15539f5a
am:
6ceb9dfb87
* commit '
6ceb9dfb87085d9693b4b2aeb9e141d48af71cee':
Revert "Use Jack lang dev version for compiling art tests"
Nicolas Geoffray [Thu, 5 Nov 2015 09:22:31 +0000 (09:22 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests""
am:
ad15539f5a
* commit '
ad15539f5a1135d82439c5eb3ed4bb80c422a734':
Revert "Use Jack lang dev version for compiling art tests"
Nicolas Geoffray [Thu, 5 Nov 2015 09:20:42 +0000 (09:20 +0000)]
Merge "Revert "Use Jack lang dev version for compiling art tests""
Nicolas Geoffray [Thu, 5 Nov 2015 09:18:55 +0000 (09:18 +0000)]
Revert "Use Jack lang dev version for compiling art tests"
Tests fail.
This reverts commit
55fed87ff8b60d55589ee7df75b5080b17bce541.
Change-Id: I02c064c6774d72bc1349dbaab4d05ef69c537952
Nicolas Geoffray [Thu, 5 Nov 2015 08:52:22 +0000 (08:52 +0000)]
Merge "Revert "Add basic image writer support for app images"" am:
c09b334456
am:
38db676ebe
* commit '
38db676ebe56938fc6994831576815d4bb7f2ef6':
Revert "Add basic image writer support for app images"
Nicolas Geoffray [Thu, 5 Nov 2015 08:50:13 +0000 (08:50 +0000)]
Merge "Revert "Add basic image writer support for app images""
am:
c09b334456
* commit '
c09b3344568f9533a0954f5dfba20d65d05ec4c1':
Revert "Add basic image writer support for app images"
Nicolas Geoffray [Thu, 5 Nov 2015 08:49:07 +0000 (08:49 +0000)]
Merge "Revert "Add basic image writer support for app images""
Nicolas Geoffray [Thu, 5 Nov 2015 08:47:52 +0000 (08:47 +0000)]
Revert "Add basic image writer support for app images"
interpreter and jit tests fail.
Bug:
22858531
This reverts commit
c033474cfbfe1e963c07fa5c38aed02e35ed6f91.
Change-Id: Ic12a3e2a1908ac0db52d21a0b44b2508c88b2585
Yohann Roussel [Thu, 5 Nov 2015 08:13:39 +0000 (08:13 +0000)]
Merge "Use Jack lang dev version for compiling art tests" am:
f97ad8115d
am:
1a01dc6eb6
* commit '
1a01dc6eb68e8f9794f3f21077b1f9c7edc34d89':
Use Jack lang dev version for compiling art tests
Yohann Roussel [Thu, 5 Nov 2015 08:11:54 +0000 (08:11 +0000)]
Merge "Use Jack lang dev version for compiling art tests"
am:
f97ad8115d
* commit '
f97ad8115d00d5bd9bbd9c485a7a4b8107f620a2':
Use Jack lang dev version for compiling art tests
Yohann Roussel [Thu, 5 Nov 2015 08:09:50 +0000 (08:09 +0000)]
Merge "Use Jack lang dev version for compiling art tests"
Sebastien Hertz [Thu, 5 Nov 2015 07:42:47 +0000 (07:42 +0000)]
Merge "Fix continuous build" am:
e597d59771
am:
475dea46d7
* commit '
475dea46d7fe5706cae4d55a17038421f737ef65':
Fix continuous build
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:15:03 +0000 (02:15 +0000)]
Merge "Add basic image writer support for app images" am:
a930832a4e
am:
baca8c1203
* commit '
baca8c1203d8f460ef8ecc6a083c477c98354ad4':
Add basic image writer support for app images
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:46:30 +0000 (23:46 +0000)]
Merge "ART: Change behavior for rethrowing init failures" am:
accc24985c
am:
6e1f6aab91
* commit '
6e1f6aab91a49d7657b947ea21386637afb04867':
ART: Change behavior for rethrowing init failures
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:54:42 +0000 (22:54 +0000)]
Merge "Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"" am:
3c60103948
am:
1dfc279504
* commit '
1dfc27950451930f706d212555f1c0299aeeed27':
Revert "ART: Implement DeadPhiHandling in PrimitiveTypePropagation"
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 19:02:19 +0000 (19:02 +0000)]
Merge "ART: Implement DeadPhiHandling in PrimitiveTypePropagation" am:
26bfcec526
am:
ef46e648df
* commit '
ef46e648df8b753c0995063e6e5065d64cce813e':
ART: Implement DeadPhiHandling in PrimitiveTypePropagation
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
Yohann Roussel [Wed, 4 Nov 2015 16:13:05 +0000 (17:13 +0100)]
Use Jack lang dev version for compiling art tests
Change-Id: Iada2d3919d5c5b5b4d32a607d9cddb89dad49648
Vladimir Marko [Wed, 4 Nov 2015 16:35:02 +0000 (16:35 +0000)]
Merge "Delay emitting CFI PC adjustments until after Thumb2/Mips fixup." am:
c8894ab502
am:
84a8f3912f
* commit '
84a8f3912f863dee2636019a7473da28e2bc12c7':
Delay emitting CFI PC adjustments until after Thumb2/Mips fixup.
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:04:50 +0000 (11:04 +0000)]
Merge "Fix test in case we run the ART_TEST_TRACE tests." am:
b178e11d9e
am:
4c08c8822b
* commit '
4c08c8822bffdd898a9c1dee3dfba72767821f0b':
Fix test in case we run the ART_TEST_TRACE tests.
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:15:47 +0000 (10:15 +0000)]
Merge "JDWP: fix java.lang.String creation" am:
6bf6e438cd
am:
e3ada4cea5
* commit '
e3ada4cea5bde61f26c0c844db571179a863da11':
JDWP: fix java.lang.String creation
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:36:16 +0000 (09:36 +0000)]
Merge "Fix TODO on instrumentation and add some more DCHECKs." am:
12cbc87247
am:
15240ce411
* commit '
15240ce41187e8780596e611ea684b57bedbfe53':
Fix TODO on instrumentation and add some more DCHECKs.
Nicolas Geoffray [Wed, 4 Nov 2015 09:36:06 +0000 (09:36 +0000)]
Merge "Fix mips32oc ArraySet null constant assignment" am:
147bc832ca
am:
c0de3ca625
* commit '
c0de3ca625eb617ce8f51533ce0bcbab97a33b44':
Fix mips32oc ArraySet null constant assignment
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 23:31:23 +0000 (23:31 +0000)]
Bill Yi [Tue, 3 Nov 2015 22:28:55 +0000 (14:28 -0800)]
Igor Murashkin [Tue, 3 Nov 2015 21:25:04 +0000 (21:25 +0000)]
Merge "lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews." am:
f33ea7911d
am:
a18f1ae906
* commit '
a18f1ae9063e17d59b536a70a805e7a761462025':
lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews.
Richard Uhler [Tue, 3 Nov 2015 21:24:58 +0000 (21:24 +0000)]
Merge "Annotate References with their referent." am:
530dcc8b74
am:
d47b6a36a1
* commit '
d47b6a36a110fcd5be2e93149e7e8d63502b5ce7':
Annotate References with their referent.
Nicolas Geoffray [Tue, 3 Nov 2015 21:24:50 +0000 (21:24 +0000)]
Merge "Fix broken handling of instrumentation lists." am:
fb4b605612
am:
3322c61736
* commit '
3322c617368874c852050910ba9683ef1464c5b3':
Fix broken handling of instrumentation lists.
Alex Light [Tue, 3 Nov 2015 21:24:43 +0000 (21:24 +0000)]
Merge "Make things generally quieter." am:
3f922d1f3c
am:
f55011470a
* commit '
f55011470a12a1c46c2f8647082ceb007bc8b97b':
Make things generally quieter.
Bill Yi [Tue, 3 Nov 2015 21:24:36 +0000 (21:24 +0000)]
Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD am:
243a468c11
am:
25b9be1dc0
* commit '
25b9be1dc0e65580edc0a1741357fa4c341d7b43':
Richard Uhler [Tue, 3 Nov 2015 21:24:29 +0000 (21:24 +0000)]
Merge "Limit summary string lengths to 200 characters." am:
7727ea62d0
am:
8060d88bb2
* commit '
8060d88bb2f22c4d36ce8d2bb69918beed1d0d12':
Limit summary string lengths to 200 characters.
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:07:06 +0000 (16:07 +0000)]
Merge "Use --oat-fd instead of --oat-file when calling dex2oat." am:
ea834bbed4
am:
ca0e1f13dd
* commit '
ca0e1f13ddde4e087fc98a67d3d286c08f0d1243':
Use --oat-fd instead of --oat-file when calling dex2oat.
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:32:25 +0000 (10:32 +0000)]
Merge "Fix deadlock with the JIT code cache." am:
df6dc42ba2
am:
f7542d8c8a
* commit '
f7542d8c8ab53c4324493f576d8e82164a1c16be':
Fix deadlock with the JIT code cache.
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:36:49 +0000 (23:36 +0000)]
Merge "Minor improvements for the CC collector." am:
4bbe7807f3
am:
210077c2b5
* commit '
210077c2b5c28c4ae768de3b77c21cb2c3e7cf74':
Minor improvements for the CC collector.
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:55:15 +0000 (20:55 +0000)]
Merge "Fix minor problems with interface verification and default methods." am:
3482c27127
am:
c798654738
* commit '
c79865473816d790d62f8f1f422b5d34632b8229':
Fix minor problems with interface verification and default methods.
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.
OSDN Git Service
