OSDN Git Service
Aart Bik [Fri, 21 Apr 2017 20:19:06 +0000 (20:19 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am:
2d4d161f26 am:
fc5558cacf am:
536a476fdf
am:
990cc18eab
Change-Id: Iba68ccb2f9a8fde6bb304ef16ec51045435caa6d
Aart Bik [Fri, 21 Apr 2017 20:18:45 +0000 (20:18 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am:
1cd51da49c am:
f099e8b163 am:
0d3c9756e2
am:
c8505291b9
Change-Id: I5c69a4ab32748da18af4e90d3406fb508fd3159d
Aart Bik [Fri, 21 Apr 2017 20:15:09 +0000 (20:15 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am:
2d4d161f26 am:
fc5558cacf
am:
536a476fdf
Change-Id: I0623de61695750f37e72f33fc6629e52c1522d81
Aart Bik [Fri, 21 Apr 2017 20:14:48 +0000 (20:14 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am:
1cd51da49c am:
f099e8b163
am:
0d3c9756e2
Change-Id: I49f5fc8aa753c3ef65cb1f3815a38489674cc5e4
Aart Bik [Fri, 21 Apr 2017 20:11:38 +0000 (20:11 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am:
2d4d161f26
am:
fc5558cacf
Change-Id: I66c66a79cacf7a69a5609b696bcd31eff7c0cb15
Aart Bik [Fri, 21 Apr 2017 20:11:17 +0000 (20:11 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am:
1cd51da49c
am:
f099e8b163
Change-Id: I9a7f77ddbc8734b7109c9478cd441b7c150c8af2
Aart Bik [Fri, 21 Apr 2017 20:08:45 +0000 (20:08 +0000)]
Merge "Factor vector unary/binary shared code out into superclass."
am:
2d4d161f26
Change-Id: Id8d7c292409c83bc6c6fa578da90ad44f5af6708
Aart Bik [Fri, 21 Apr 2017 20:08:16 +0000 (20:08 +0000)]
Merge "ARM64: Improve SIMD LDR/STR."
am:
1cd51da49c
Change-Id: I66328344fa4346c5a30f8f4f0a0b036bf726becb
Treehugger Robot [Fri, 21 Apr 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Factor vector unary/binary shared code out into superclass."
Aart Bik [Fri, 21 Apr 2017 20:00:37 +0000 (20:00 +0000)]
Merge "ARM64: Improve SIMD LDR/STR."
Andreas Gampe [Fri, 21 Apr 2017 19:15:39 +0000 (19:15 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am:
6b8b075211 am:
37c1413ab2 am:
f7fc407e3e
am:
3aed257fb5
Change-Id: I1719981cfd3f852277894ba20d70e2406f2568a6
Andreas Gampe [Fri, 21 Apr 2017 19:15:17 +0000 (19:15 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am:
e0ffd22714 am:
5337d69ccb am:
9693638da4
am:
039694619e
Change-Id: I1f45ced6f36559b7e8535ee898d8e255c68ff252
Andreas Gampe [Fri, 21 Apr 2017 19:10:31 +0000 (19:10 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am:
6b8b075211 am:
37c1413ab2
am:
f7fc407e3e
Change-Id: I8941f7ba1cd29db6d3466e5cb340862c43a234c1
Andreas Gampe [Fri, 21 Apr 2017 19:10:12 +0000 (19:10 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am:
e0ffd22714 am:
5337d69ccb
am:
9693638da4
Change-Id: I16405d02cae958d7a1c3947032e0b8946606bc53
Andreas Gampe [Fri, 21 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am:
6b8b075211
am:
37c1413ab2
Change-Id: I8c69f9afc9d51aa838f0541794962240602913e5
Andreas Gampe [Fri, 21 Apr 2017 19:05:44 +0000 (19:05 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am:
e0ffd22714
am:
5337d69ccb
Change-Id: I888c2e85e950222f8c75df6648b181163fa1b2ba
Andreas Gampe [Fri, 21 Apr 2017 19:02:10 +0000 (19:02 +0000)]
Merge changes I6ff2d6f8,I8f60f116
am:
6b8b075211
Change-Id: Iec665a5733bb2da0a926317e732382f7993489f9
Calin Juravle [Fri, 21 Apr 2017 19:01:51 +0000 (19:01 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am:
2a9dc4dcc5 am:
90a9c1d00a am:
93f8b836f3
am:
3c0f9e3595
Change-Id: Idfaf073fdbb8396d235962ebfe1eb1c06e7e89c6
Andreas Gampe [Fri, 21 Apr 2017 19:01:43 +0000 (19:01 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler'
am:
e0ffd22714
Change-Id: I697f4a9bb76b30c76af15fa1da20dc222c9bf12c
Treehugger Robot [Fri, 21 Apr 2017 18:57:25 +0000 (18:57 +0000)]
Merge changes I6ff2d6f8,I8f60f116
* changes:
ART: Clean up art_field.h
ART: Clean up art_method.h
Treehugger Robot [Fri, 21 Apr 2017 18:56:17 +0000 (18:56 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler'
* changes:
ART: Clean up InlineMethodAnalyzer
ART: Move InlineMethodAnalyzer into compiler
Calin Juravle [Fri, 21 Apr 2017 18:53:11 +0000 (18:53 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am:
2a9dc4dcc5 am:
90a9c1d00a
am:
93f8b836f3
Change-Id: Iab1ad5a0565aec1faf722111a5566b3c104d97fc
Calin Juravle [Fri, 21 Apr 2017 18:50:42 +0000 (18:50 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am:
2a9dc4dcc5
am:
90a9c1d00a
Change-Id: I47ccd8953c4f1dd783325de612e3074322df7559
Calin Juravle [Fri, 21 Apr 2017 18:48:12 +0000 (18:48 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()"
am:
2a9dc4dcc5
Change-Id: I1bfa09f8fb6718f83d928eb85088e0231fccfc3e
Calin Juravle [Fri, 21 Apr 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()"
Aart Bik [Fri, 21 Apr 2017 16:42:01 +0000 (09:42 -0700)]
Factor vector unary/binary shared code out into superclass.
Test: test-art-target, test-art-host
Change-Id: I42770d9a9142f2e53d3b5bd60bd25593b2154a7c
Mathieu Chartier [Fri, 21 Apr 2017 17:04:34 +0000 (17:04 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am:
9bb7ab6750 am:
20e7d03d7d am:
dbf3538483
am:
a6f265a503
Change-Id: I5f0852f5062fc773d1a384344733b407867aa596
Mathieu Chartier [Fri, 21 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am:
9bb7ab6750 am:
20e7d03d7d
am:
dbf3538483
Change-Id: I90825e185e8f877684dc3b8a8757e7c2236889bc
Mathieu Chartier [Fri, 21 Apr 2017 16:46:01 +0000 (16:46 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am:
9bb7ab6750
am:
20e7d03d7d
Change-Id: Ic5b74f775ea34b5ccfd5b98bbf11ca8da546787c
Mathieu Chartier [Fri, 21 Apr 2017 16:42:30 +0000 (16:42 +0000)]
Merge "Store java_lang_Object_ in the flip callback"
am:
9bb7ab6750
Change-Id: Ib86a5c6905f8bfe9a5453ee187ab14dc842a0f5f
Artem Serov [Wed, 19 Apr 2017 14:43:53 +0000 (15:43 +0100)]
ARM64: Improve SIMD LDR/STR.
Test: 640-checker-*-simd
Test: test-art-target, test-art-host
Change-Id: I2bcdef3f5cb7c0e7d1b3d02910fbf89ac694d89a
Andreas Gampe [Fri, 21 Apr 2017 03:07:21 +0000 (20:07 -0700)]
ART: Clean up InlineMethodAnalyzer
Remove dead code.
Test: m test-art-host
Change-Id: If86503fde2a77279a3169144bcae700101d81784
Andreas Gampe [Fri, 21 Apr 2017 02:43:21 +0000 (19:43 -0700)]
ART: Move InlineMethodAnalyzer into compiler
Move the infrastructure, which is now only used by the compiler.
Test: mmma art
Change-Id: I4a61e35f23736b226523d7349f49208ad852ad2f
Mathieu Chartier [Fri, 21 Apr 2017 16:34:44 +0000 (16:34 +0000)]
Merge "Store java_lang_Object_ in the flip callback"
Mathieu Chartier [Fri, 21 Apr 2017 02:28:54 +0000 (19:28 -0700)]
Store java_lang_Object_ in the flip callback
There was a race where the GC thread would not have is_marking =
true, and call
WellKnownClasses::ToClass(WellKnownClasses::java_lang_Object). This
meant that the returned class was maybe in the from-space for the
no image case. The fix was to move this decoding into the flip
callback since this callback is called before flipping any thread
roots.
Bug:
37531237
Bug:
12687968
Test: test-art-host
Change-Id: I9a09249e9c6ea2b3b124e957a9e4b61017869306
Andreas Gampe [Fri, 21 Apr 2017 05:53:58 +0000 (22:53 -0700)]
ART: Clean up art_field.h
Clean up the header. Fix up other headers including the -inl file,
in an effort to prune the include graph. Fix broken transitive
includes by making includes explicit.
Test: m
Change-Id: I6ff2d6f89b741d8188e19426eccf4743fec688fc
Andreas Gampe [Thu, 2 Feb 2017 00:46:28 +0000 (16:46 -0800)]
ART: Clean up art_method.h
Clean up the header. Fix up other headers including the -inl file,
in an effort to prune the include graph. Fix broken transitive
includes by making includes explicit. Introduce new -inl files
for method handles and reference visiting.
Test: source build/envsetup.sh && lunch aosp_angler-userdebug && mmma art
Test: source build/envsetup.sh && lunch aosp_mips64-userdebug && mmma art
Change-Id: I8f60f1160c2a702fdf3598149dae38f6fa6bc851
Vladimir Marko [Fri, 21 Apr 2017 14:39:55 +0000 (14:39 +0000)]
Merge "Fix verifier crash on abstract final class." am:
d68677c5fd am:
4d32c69622 am:
9fdd729158
am:
0d5f222b73
Change-Id: I462637c2d9bf0720c788d9374479de0f2c6304bb
Vladimir Marko [Fri, 21 Apr 2017 14:36:24 +0000 (14:36 +0000)]
Merge "Fix verifier crash on abstract final class." am:
d68677c5fd am:
4d32c69622
am:
9fdd729158
Change-Id: Id9932a219d9dbfdbd839d325ca02fd391834024a
Vladimir Marko [Fri, 21 Apr 2017 14:33:25 +0000 (14:33 +0000)]
Merge "Fix verifier crash on abstract final class." am:
d68677c5fd
am:
4d32c69622
Change-Id: Ia92526ea0cbeee6738cf07b5c620ffa7007214af
Vladimir Marko [Fri, 21 Apr 2017 14:29:24 +0000 (14:29 +0000)]
Merge "Fix verifier crash on abstract final class."
am:
d68677c5fd
Change-Id: I8a6c1791532318a96844cc49c708a99b7283bb8c
Treehugger Robot [Fri, 21 Apr 2017 14:24:57 +0000 (14:24 +0000)]
Merge "Fix verifier crash on abstract final class."
Vladimir Marko [Fri, 21 Apr 2017 12:31:41 +0000 (13:31 +0100)]
Fix verifier crash on abstract final class.
Remove a check for erroneous class. It should not matter to
the verifier whether the class is just resolved, initialized
or resolved erroneous. The check was also inherently racy
and could yield different behavior based on the timing of
the verification.
Test: 161-final-abstract-class
Test: testrunner.py --host
Bug:
37248840
Change-Id: Ic4d964050bbe52e3de4438ada9e75676956cb6b4
Vladimir Marko [Fri, 21 Apr 2017 11:32:13 +0000 (11:32 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am:
6d3c61d8c6 am:
786a563287 am:
9252b98c00
am:
0ce1b704f6
Change-Id: I58f830d7fe49e520d4f915a7280edd6d8d997e34
Vladimir Marko [Fri, 21 Apr 2017 11:29:13 +0000 (11:29 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am:
6d3c61d8c6 am:
786a563287
am:
9252b98c00
Change-Id: I987e32eb975a034003054623716cfd3d491fbd83
Vladimir Marko [Fri, 21 Apr 2017 11:26:12 +0000 (11:26 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am:
6d3c61d8c6
am:
786a563287
Change-Id: I743e63c0c00946fa354686ec13d072c30dd66370
Vladimir Marko [Fri, 21 Apr 2017 11:23:41 +0000 (11:23 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner."
am:
6d3c61d8c6
Change-Id: I2815484428676b663bc53bc45c5818ab19e3eab2
Treehugger Robot [Fri, 21 Apr 2017 11:17:46 +0000 (11:17 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner."
Vladimir Marko [Thu, 20 Apr 2017 18:50:32 +0000 (19:50 +0100)]
Reuse DexCache and ClassLoader handles in inliner.
Measured memory usage with heaptrack for a large app:
Before:
bytes allocated in total (ignoring deallocations): 3.14GB
calls to allocation functions:
8130596
After:
bytes allocated in total (ignoring deallocations): 3.12GB
calls to allocation functions:
7750377
Test: testrunner.py --host
Bug:
34053922
Change-Id: I1ad7aaffccc6527cd4f409ca8fca75bab8d7439a
Nicolas Geoffray [Fri, 21 Apr 2017 08:14:01 +0000 (08:14 +0000)]
Merge "Handle catch phis in code sinking." am:
d1a05c9088 am:
7a717284ab am:
0ac60fee7a
am:
b3763272cd
Change-Id: I25abcd0378d178778688a5c5e495d98e5df21e01
Nicolas Geoffray [Fri, 21 Apr 2017 08:11:02 +0000 (08:11 +0000)]
Merge "Handle catch phis in code sinking." am:
d1a05c9088 am:
7a717284ab
am:
0ac60fee7a
Change-Id: I302165f06e65ad94a96a5d80d6fa5df499aea44a
Nicolas Geoffray [Fri, 21 Apr 2017 08:08:00 +0000 (08:08 +0000)]
Merge "Handle catch phis in code sinking." am:
d1a05c9088
am:
7a717284ab
Change-Id: I8169f02159771093821441cf774eb75ec107a77f
Nicolas Geoffray [Fri, 21 Apr 2017 08:05:31 +0000 (08:05 +0000)]
Merge "Handle catch phis in code sinking."
am:
d1a05c9088
Change-Id: Ic74f2072db754e34874cc30efa1b086db9e8d411
Nicolas Geoffray [Fri, 21 Apr 2017 07:59:53 +0000 (07:59 +0000)]
Merge "Handle catch phis in code sinking."
Alex Light [Fri, 21 Apr 2017 01:03:01 +0000 (01:03 +0000)]
Merge changes If234ff55,I2d83fc46,I5ad78a15 am:
bdbc63b892 am:
8f06eed516 am:
bad5a66669
am:
d7706984d5
Change-Id: Ib25ddc3246ac19255bd65dd8bdcb8bbb68470213
Alex Light [Fri, 21 Apr 2017 01:00:33 +0000 (01:00 +0000)]
Merge changes If234ff55,I2d83fc46,I5ad78a15 am:
bdbc63b892 am:
8f06eed516
am:
bad5a66669
Change-Id: Ib735cc9c9beb2354598ea4b86a9b44b9fa8fa7f1
Alex Light [Fri, 21 Apr 2017 00:57:30 +0000 (00:57 +0000)]
Merge changes If234ff55,I2d83fc46,I5ad78a15 am:
bdbc63b892
am:
8f06eed516
Change-Id: If6bb63d301c977b42762945827daa1befca85611
Alex Light [Fri, 21 Apr 2017 00:54:32 +0000 (00:54 +0000)]
Merge changes If234ff55,I2d83fc46,I5ad78a15
am:
bdbc63b892
Change-Id: Ibeb3ccf9a0d902206b7f5e979eb48df572ec259f
Treehugger Robot [Fri, 21 Apr 2017 00:49:23 +0000 (00:49 +0000)]
Merge changes If234ff55,I2d83fc46,I5ad78a15
* changes:
Be able to run jvmti-stress on RI
Do native method bind in jvmti-stress
Agent libraries need to be searched for JNI functions
Alex Light [Thu, 20 Apr 2017 22:54:25 +0000 (15:54 -0700)]
Be able to run jvmti-stress on RI
This is useful for testing.
When running on RI no class redefinition is performed.
Test: ./test/run-test --dev --jvm --jvmti-stress 001-HelloWorld
Test: ./test/run-test --dev --jvm --jvmti-stress 902
Test: ./test/run-test --dev --jvm --jvmti-stress 986
Change-Id: If234ff553bf136312c5128d03b02b28f4ff94e3d
Mathieu Chartier [Thu, 20 Apr 2017 23:09:24 +0000 (23:09 +0000)]
Merge "Improve VerifyNoFromSpaceRefsObjectVisitor logging" am:
4e34bd1902 am:
d87b7c4797 am:
a94b2718a1
am:
cadca02427
Change-Id: If0e3e5e036dcfb84412056f1440d829d36d1e308
Mathieu Chartier [Thu, 20 Apr 2017 23:03:24 +0000 (23:03 +0000)]
Merge "Improve VerifyNoFromSpaceRefsObjectVisitor logging" am:
4e34bd1902 am:
d87b7c4797
am:
a94b2718a1
Change-Id: Iec12f0ce0bb959386e99df1e78b164200a918f89
Mathieu Chartier [Thu, 20 Apr 2017 22:57:53 +0000 (22:57 +0000)]
Merge "Improve VerifyNoFromSpaceRefsObjectVisitor logging" am:
4e34bd1902
am:
d87b7c4797
Change-Id: I6733095249d8ab66492c081d341c143525ddaa2b
Mathieu Chartier [Thu, 20 Apr 2017 22:52:23 +0000 (22:52 +0000)]
Merge "Improve VerifyNoFromSpaceRefsObjectVisitor logging"
am:
4e34bd1902
Change-Id: I448235c47699e613748300e6f42ab36ed56d1fa4
Alex Light [Thu, 20 Apr 2017 20:35:05 +0000 (13:35 -0700)]
Do native method bind in jvmti-stress
Extend the jvmti-stress test suite to intercept the NativeMethodBind
event for every method.
Also fix small issue where we tried to add a local reference to a null
thread in ti_method.cc if we had an event trigger before VMInit.
Test: ./test/testrunner/testrunner.py --host --jvmti-stress -j40
Bug:
37432636
Change-Id: I2d83fc460b18edf035ed7296b8e2b06cff3671e5
Alex Light [Thu, 20 Apr 2017 16:15:08 +0000 (09:15 -0700)]
Agent libraries need to be searched for JNI functions
This makes agent libraries the option of last resort for native
method implementations. This will allow one to not need to manually
link all native methods in an agent library.
Bug:
37522517
Bug:
37432636
Test: ./test.py --host -j40
Change-Id: I5ad78a15e7e2799d2a877c5d603342899e2a1bd1
Treehugger Robot [Thu, 20 Apr 2017 22:43:05 +0000 (22:43 +0000)]
Merge "Improve VerifyNoFromSpaceRefsObjectVisitor logging"
Mathieu Chartier [Thu, 20 Apr 2017 20:31:39 +0000 (13:31 -0700)]
Improve VerifyNoFromSpaceRefsObjectVisitor logging
Remove read barriers in PrettyTypeOf to prevent recursive failures.
Pass down holder and offset information to
VerifyNoFromSpaceRefsFieldVisitor.
Test: test-art-host
Bug:
37531237
Change-Id: I704ec18ebecfc1ca2982b38f67a2f0788e59dfe9
Aart Bik [Thu, 20 Apr 2017 18:20:37 +0000 (18:20 +0000)]
Merge "ARM64: Support MultiplyAccumulate for SIMD." am:
f99f62f8e0 am:
1750304d47 am:
befba00ec3
am:
4f15d5f49d
Change-Id: Ib1997a1ac2ca24e39d2cb09c1d625b3e24ab6888
Aart Bik [Thu, 20 Apr 2017 17:44:33 +0000 (17:44 +0000)]
Merge "ARM64: Support MultiplyAccumulate for SIMD." am:
f99f62f8e0 am:
1750304d47
am:
befba00ec3
Change-Id: I52eba872a6e851303b5536cd985f12563b729439
Aart Bik [Thu, 20 Apr 2017 17:41:03 +0000 (17:41 +0000)]
Merge "ARM64: Support MultiplyAccumulate for SIMD." am:
f99f62f8e0
am:
1750304d47
Change-Id: Ibf3de88a36811109bafe5cd9810f5ecff2a593ce
Aart Bik [Thu, 20 Apr 2017 17:37:00 +0000 (17:37 +0000)]
Merge "ARM64: Support MultiplyAccumulate for SIMD."
am:
f99f62f8e0
Change-Id: I581cb93c050d5e0344a2613e81836d57a6665c70
Aart Bik [Thu, 20 Apr 2017 17:28:00 +0000 (17:28 +0000)]
Merge "ARM64: Support MultiplyAccumulate for SIMD."
Mathieu Chartier [Thu, 20 Apr 2017 17:17:29 +0000 (17:17 +0000)]
Merge changes from topic 'partial_tlab' am:
4c408ca726 am:
db1ee01c9b am:
d15ec3f8dc
am:
235a1b5908
Change-Id: I275b819f877ac67aa3f3ea782b7ec7818ffb115b
Mathieu Chartier [Thu, 20 Apr 2017 17:06:58 +0000 (17:06 +0000)]
Merge changes from topic 'partial_tlab' am:
4c408ca726 am:
db1ee01c9b
am:
d15ec3f8dc
Change-Id: I91ec4a4cbfc2fbb3e84c3f1c6baa007ef77af936
Mathieu Chartier [Thu, 20 Apr 2017 17:01:57 +0000 (17:01 +0000)]
Merge changes from topic 'partial_tlab' am:
4c408ca726
am:
db1ee01c9b
Change-Id: I5314c4fbd25aa1f6b223c2aa56a9724730a5123d
Mathieu Chartier [Thu, 20 Apr 2017 16:56:58 +0000 (16:56 +0000)]
Merge changes from topic 'partial_tlab'
am:
4c408ca726
Change-Id: I7af86c0bedb0f3c4babd8bba3bd46acf8225d63f
Mathieu Chartier [Thu, 20 Apr 2017 16:47:51 +0000 (16:47 +0000)]
Merge changes from topic 'partial_tlab'
* changes:
Fix some gtests
Use partial TLAB regions
Nicolas Geoffray [Thu, 20 Apr 2017 14:19:46 +0000 (15:19 +0100)]
Handle catch phis in code sinking.
When the user of an instruction we want to sink is a catch
phi, we should not look at predecessors (which don't map 1-1
for catch phis), but can only look at its dominator.
bug:
37247890
Test: 647-sinking-catch
Change-Id: Ib64bd6f95d3ef45c394137e76819fa8d7d3d960a
Vladimir Marko [Thu, 20 Apr 2017 15:32:21 +0000 (15:32 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()." am:
38870a8a27 am:
404d562547 am:
c5877aceb3
am:
2ffc7d1ba7
Change-Id: I53b2e37f38937372c01c3b73d3f849e2ac6339a3
Vladimir Marko [Thu, 20 Apr 2017 15:28:20 +0000 (15:28 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()." am:
38870a8a27 am:
404d562547
am:
c5877aceb3
Change-Id: Id7b0a83ab9701b7e1fcd9fd2455302d023002b9a
Vladimir Marko [Thu, 20 Apr 2017 15:25:50 +0000 (15:25 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()." am:
38870a8a27
am:
404d562547
Change-Id: I36f5c055a894abae61682ac123a186132d7a5c1a
Vladimir Marko [Thu, 20 Apr 2017 15:23:21 +0000 (15:23 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()."
am:
38870a8a27
Change-Id: Iffc3aed0a5fc54dac5a36518faf416724a03266f
Treehugger Robot [Thu, 20 Apr 2017 15:16:44 +0000 (15:16 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()."
Nicolas Geoffray [Thu, 20 Apr 2017 14:23:05 +0000 (14:23 +0000)]
Merge "Fix fault_handler with heap poisoning." am:
aa03f6fa38 am:
92f47fb522 am:
dd59e55e1a
am:
94c7f5f1a9
Change-Id: If531999160323e2e2f7840e861ce94f91c5008e5
Nicolas Geoffray [Thu, 20 Apr 2017 14:22:45 +0000 (14:22 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type." am:
de9e54abcf am:
a629563348 am:
f9e1109b2d
am:
394c20c773
Change-Id: I3d0d9eb342d937a24a36088c8b15429a0efff297
Mathieu Chartier [Thu, 20 Apr 2017 14:22:27 +0000 (14:22 +0000)]
Merge "Use partial TLAB regions" into oc-dev am:
acf8c9e0b0 -s ours
am:
f2953a4b0b
Change-Id: I30609d7690f299975d0428bd8ee6bac5c5d4483e
Josh Gao [Thu, 20 Apr 2017 14:22:08 +0000 (14:22 +0000)]
Merge "base: make SafeCopy work on older Linux kernels." am:
8d0f3aaf28 am:
f97911fa01 am:
4bb445a75e
am:
f7177813c4
Change-Id: Icfcb36c0a968aea7ddcaf6877e54b29a9b51a6dc
Colin Cross [Thu, 20 Apr 2017 14:21:45 +0000 (14:21 +0000)]
Merge "Remove obsolete rules to build runtests" am:
6c99499c8a am:
c55ed0c843 am:
e54f778f66
am:
4ba05dfef2
Change-Id: I2e9881c1c7da643d764f3f3fc82015a735761517
Andreas Gampe [Thu, 20 Apr 2017 14:21:24 +0000 (14:21 +0000)]
Merge changes from topic 'art_run_test_912_cts_refactor' am:
afcec28403 am:
ccaac1364d am:
4d52ebf7d1
am:
e501989c29
Change-Id: I92c2713c904793af0f296ab8f04da69e86b8991d
Vladimir Marko [Thu, 20 Apr 2017 10:26:03 +0000 (11:26 +0100)]
Add descriptor validation to ClassLinker::FindClass().
And add tests for odd signatures passed to JNI GetFieldID().
Previously, passing the signature "java/lang/String" instead
of "Ljava/lang/String;" would call the class loader with the
dot name java.lang.String and the class loader would find
that class only to fail the DescriptorEquals() check back
in ClassLinker::FindClass().
Test: 647-jni-get-field-id
Bug:
33577836
Bug:
37156832
Change-Id: I6612a272ec24b0d54b728fd35003e9c24a7e2e95
Nicolas Geoffray [Thu, 20 Apr 2017 12:44:40 +0000 (12:44 +0000)]
Merge "Fix fault_handler with heap poisoning." am:
aa03f6fa38 am:
92f47fb522
am:
dd59e55e1a
Change-Id: Iaf9b1744ab6fac8d7360d511e41149fab77148ee
Nicolas Geoffray [Thu, 20 Apr 2017 12:39:08 +0000 (12:39 +0000)]
Merge "Fix fault_handler with heap poisoning." am:
aa03f6fa38
am:
92f47fb522
Change-Id: I4ea97ec3c2ba52dd274e1e3e85738d0bb7b740c3
Jeff Hao [Thu, 20 Apr 2017 12:36:48 +0000 (12:36 +0000)]
Allow dex2oat to handle relative paths. am:
e681bf7685
am:
507a2b6110
Change-Id: I173387b4f7be0a874c4f0f957d299313e28ebb9f
Nicolas Geoffray [Thu, 20 Apr 2017 12:36:09 +0000 (12:36 +0000)]
Merge "Fix fault_handler with heap poisoning."
am:
aa03f6fa38
Change-Id: I8acd9d6f7129c1034c34e1722ac35e5a14d3f3df
Nicolas Geoffray [Thu, 20 Apr 2017 12:32:48 +0000 (12:32 +0000)]
Merge "Fix fault_handler with heap poisoning."
Nicolas Geoffray [Thu, 20 Apr 2017 11:50:13 +0000 (12:50 +0100)]
Fix fault_handler with heap poisoning.
test: test-art-host
Change-Id: Ifeb3d5ff4cfdcb703d5874bca90c9c1438d86f08
Nicolas Geoffray [Thu, 20 Apr 2017 11:18:05 +0000 (11:18 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type." am:
de9e54abcf am:
a629563348
am:
f9e1109b2d
Change-Id: Idde6fac45488a91d867bbeadd036eba82ee3d647
Nicolas Geoffray [Thu, 20 Apr 2017 11:10:33 +0000 (11:10 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type." am:
de9e54abcf
am:
a629563348
Change-Id: I7d1021243fe0f45cb9428976bee077cc85925ccc
Nicolas Geoffray [Thu, 20 Apr 2017 11:08:03 +0000 (11:08 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type."
am:
de9e54abcf
Change-Id: Ide0f8c117fc1f7406966bea73e88009eca21bc3d
OSDN Git Service
