OSDN Git Service
Nicolas Geoffray [Thu, 10 Dec 2015 15:47:45 +0000 (15:47 +0000)]
Merge "Fix braino when resolving an invoke-super." am:
d48015603a
am:
0fc16a2702
* commit '
0fc16a2702bc5193fb61320be79f513cf0c64838':
Fix braino when resolving an invoke-super.
Nicolas Geoffray [Thu, 10 Dec 2015 15:44:55 +0000 (07:44 -0800)]
Merge "Fix braino when resolving an invoke-super."
am:
d48015603a
* commit '
d48015603a54b820d287d92709825765159615f0':
Fix braino when resolving an invoke-super.
Nicolas Geoffray [Thu, 10 Dec 2015 15:40:55 +0000 (15:40 +0000)]
Merge "Fix braino when resolving an invoke-super."
Nicolas Geoffray [Thu, 10 Dec 2015 15:06:15 +0000 (15:06 +0000)]
Fix braino when resolving an invoke-super.
We should check the actual_method, and not the resolved_method,
on whether it is in the same dex file.
bug:
26022686
Change-Id: I8a9b0c68e162015e0aec397545d0607482949967
David Brazdil [Thu, 10 Dec 2015 15:18:24 +0000 (15:18 +0000)]
Merge "ART: Fix bug in DCE not removing phis from catch phi uses" am:
4a34064d9c
am:
cfa3810104
* commit '
cfa3810104d1debd3b13e7ad76442765e234da06':
ART: Fix bug in DCE not removing phis from catch phi uses
David Brazdil [Thu, 10 Dec 2015 15:16:07 +0000 (15:16 +0000)]
Merge "ART: Fix bug in DCE not removing phis from catch phi uses"
am:
4a34064d9c
* commit '
4a34064d9ca437c5168d7c00c456155ea8339dec':
ART: Fix bug in DCE not removing phis from catch phi uses
David Brazdil [Thu, 10 Dec 2015 15:12:19 +0000 (15:12 +0000)]
Merge "ART: Fix bug in DCE not removing phis from catch phi uses"
David Brazdil [Thu, 10 Dec 2015 13:54:52 +0000 (13:54 +0000)]
ART: Fix bug in DCE not removing phis from catch phi uses
Due to the missing edges between throwing instructions and catch phis
DCE needs to manually remove dead instructions from catch phi users,
being overly conservative if the inputs are not in the dead blocks.
DCE used to do this for normal instructions, but it needs to do the
same for phis.
Change-Id: I7edfcb84ec6ff7303945d5d5cd436b1d1e95df2a
Roland Levillain [Thu, 10 Dec 2015 11:18:18 +0000 (11:18 +0000)]
Merge "Fix the build-art-multi-executable Make function." am:
a10a0750cf
am:
fc41516ef5
* commit '
fc41516ef5198b14aeb0fe9a85f7b4e7c842b5ef':
Fix the build-art-multi-executable Make function.
Roland Levillain [Thu, 10 Dec 2015 11:15:57 +0000 (03:15 -0800)]
Merge "Fix the build-art-multi-executable Make function."
am:
a10a0750cf
* commit '
a10a0750cf8a916080067997eedfb80c03d74b51':
Fix the build-art-multi-executable Make function.
Roland Levillain [Thu, 10 Dec 2015 11:11:43 +0000 (11:11 +0000)]
Merge "Fix the build-art-multi-executable Make function."
Roland Levillain [Thu, 10 Dec 2015 11:04:25 +0000 (11:04 +0000)]
Fix the build-art-multi-executable Make function.
Follow-up fix to
https://android-review.googlesource.com/#/c/185537.
Bug:
26051370
Change-Id: I891abe5ec2a2eae775b9791050654602861798f4
Nicolas Geoffray [Thu, 10 Dec 2015 11:01:28 +0000 (11:01 +0000)]
Merge "MIPS32: Improve integer division by constants" am:
6d0aefdc1f
am:
e31102e26d
* commit '
e31102e26d16514e82e6d725c6886fa9701b4694':
MIPS32: Improve integer division by constants
Nicolas Geoffray [Thu, 10 Dec 2015 10:59:02 +0000 (02:59 -0800)]
Merge "MIPS32: Improve integer division by constants"
am:
6d0aefdc1f
* commit '
6d0aefdc1f536e093305e29770cf749acb3247e2':
MIPS32: Improve integer division by constants
Nicolas Geoffray [Thu, 10 Dec 2015 10:54:24 +0000 (10:54 +0000)]
Merge "MIPS32: Improve integer division by constants"
Roland Levillain [Thu, 10 Dec 2015 10:33:20 +0000 (02:33 -0800)]
Merge "Fix imgdiag build rules." am:
6247556fb9
am:
81558dc34a
* commit '
81558dc34ace8b5d911f97a065c3089792eb99fc':
Fix imgdiag build rules.
Roland Levillain [Thu, 10 Dec 2015 10:30:31 +0000 (10:30 +0000)]
Merge "Fix imgdiag build rules."
am:
6247556fb9
* commit '
6247556fb980c5122fc2dd5c431c2b2c0281606d':
Fix imgdiag build rules.
Roland Levillain [Thu, 10 Dec 2015 10:24:10 +0000 (10:24 +0000)]
Merge "Fix imgdiag build rules."
Roland Levillain [Thu, 10 Dec 2015 10:17:43 +0000 (10:17 +0000)]
Fix imgdiag build rules.
Adjust build rules to avoid building a 64-bit imgdiag
executable on host when HOST_PREFER_32_BIT is true.
This CL addresses an imgdiag related build issue that
appeared on the ART Buildbot after system/core was unpinned
from the master-art manifest
(https://android-review.googlesource.com/#/c/185580), used
by some of our Buildbot configurations:
ninja: error: 'out/host/linux-x86/obj/SHARED_LIBRARIES/libbacktrace_intermediates/export_includes', needed by 'out/host/linux-x86/obj/EXECUTABLES/imgdiag_intermediates/import_includes', missing and no known rule to make it
Bug:
26051370
Change-Id: I8f3b3c89fb8da0c37a1ffb21b6d835e7ede1e71a
Nicolas Geoffray [Thu, 10 Dec 2015 08:33:51 +0000 (00:33 -0800)]
Merge "Revert "Add support for LZ4 compressed image files"" am:
70a33905e9
am:
d7447f9420
* commit '
d7447f9420c977fbff4ccb7870dfbf6ddfd4de65':
Revert "Add support for LZ4 compressed image files"
Nicolas Geoffray [Thu, 10 Dec 2015 08:31:24 +0000 (00:31 -0800)]
Merge "Revert "Add support for LZ4 compressed image files""
am:
70a33905e9
* commit '
70a33905e90c655cb17303b238bace2a2f4d5bf9':
Revert "Add support for LZ4 compressed image files"
Nicolas Geoffray [Thu, 10 Dec 2015 08:27:00 +0000 (08:27 +0000)]
Merge "Revert "Add support for LZ4 compressed image files""
Nicolas Geoffray [Thu, 10 Dec 2015 08:26:32 +0000 (08:26 +0000)]
Revert "Add support for LZ4 compressed image files"
Tentative. Looks like it breaks image_test for hammerhead:
art/compiler/linker/arm/relative_patcher_thumb2.cc:36] Check failed: target_offset & 1u == 1u (target_offset & 1u=0, 1u=1)
Bug:
22858531
This reverts commit
c6f41b5b3ca3d7ac3c12ad3995ffef4e831973a0.
Change-Id: I9bc5738a8b5c8f8bc8b73309f9420fd691bc79a9
Andreas Gampe [Thu, 10 Dec 2015 00:41:15 +0000 (00:41 +0000)]
Merge "ART: Make trampoline compiler pointer-size-safe" am:
1d97f949e8
am:
b40dcf9cb6
* commit '
b40dcf9cb6c706c324f43efabc573c8f7a146ae1':
ART: Make trampoline compiler pointer-size-safe
Andreas Gampe [Thu, 10 Dec 2015 00:39:21 +0000 (16:39 -0800)]
Merge "ART: Make trampoline compiler pointer-size-safe"
am:
1d97f949e8
* commit '
1d97f949e807e963dd92dcf9ac38def5301d555a':
ART: Make trampoline compiler pointer-size-safe
Andreas Gampe [Thu, 10 Dec 2015 00:34:23 +0000 (00:34 +0000)]
Merge "ART: Make trampoline compiler pointer-size-safe"
Andreas Gampe [Wed, 9 Dec 2015 23:14:04 +0000 (15:14 -0800)]
ART: Make trampoline compiler pointer-size-safe
The trampoline compiler uses offsets of runtime structures which
may change with the pointer size.
Add offset tests to jni_internal_test.
Bug:
26071368
(cherry picked from commit
da9b763abc712fd6d1e24170a194abfbe795b8cd)
Change-Id: I01d1a3727f46b3015ac677afb5427337c3093402
Andreas Gampe [Wed, 9 Dec 2015 23:39:41 +0000 (23:39 +0000)]
Merge "ART: Make trampoline compiler pointer-size-safe"
Andreas Gampe [Wed, 9 Dec 2015 23:14:04 +0000 (15:14 -0800)]
ART: Make trampoline compiler pointer-size-safe
The trampoline compiler uses offsets of runtime structures which
may change with the pointer size.
Add offset tests to jni_internal_test.
Bug:
26071368
Change-Id: I01d1a3727f46b3015ac677afb5427337c3093402
Mingyao Yang [Wed, 9 Dec 2015 20:46:50 +0000 (12:46 -0800)]
Merge "Simplify and rename IsLoopInvariant() test." am:
f1975e4328
am:
6ca9f51e2c
* commit '
6ca9f51e2c0f730cc2fb43720f159deb572eb388':
Simplify and rename IsLoopInvariant() test.
Mingyao Yang [Wed, 9 Dec 2015 20:43:06 +0000 (20:43 +0000)]
Merge "Simplify and rename IsLoopInvariant() test."
am:
f1975e4328
* commit '
f1975e432859101bf8e7b0fd33f6052cafb0f9b2':
Simplify and rename IsLoopInvariant() test.
Mingyao Yang [Wed, 9 Dec 2015 20:35:32 +0000 (20:35 +0000)]
Merge "Simplify and rename IsLoopInvariant() test."
Mathieu Chartier [Wed, 9 Dec 2015 20:09:18 +0000 (20:09 +0000)]
Merge "Add support for LZ4 compressed image files" am:
7cbd95c2fb
am:
3dafd53ff9
* commit '
3dafd53ff90fc845c09b7206600ba9ff45e3fcbd':
Add support for LZ4 compressed image files
Mathieu Chartier [Wed, 9 Dec 2015 20:06:27 +0000 (20:06 +0000)]
Merge "Add support for LZ4 compressed image files"
am:
7cbd95c2fb
* commit '
7cbd95c2fb7ca3d1391ec92d1be2d81863e63dd2':
Add support for LZ4 compressed image files
Mathieu Chartier [Wed, 9 Dec 2015 20:01:11 +0000 (20:01 +0000)]
Merge "Add support for LZ4 compressed image files"
Mathieu Chartier [Fri, 4 Dec 2015 23:38:50 +0000 (15:38 -0800)]
Add support for LZ4 compressed image files
Added dex2oat option --image-format=(store|lz4). Using lz4 means
that the main image section (all data other than header and bitmap)
are stored in a compressed state.
N5 results:
Boot image size:
8067128 ->
2827605
Decompression time 18.93ms
Decompression rate: 426MB/s
Patchoat is not currently supported since it maps the source image
directly. In order to support compressed images we would need to
recompress the output image and then write it back out to a file.
Also there are not many cases where we would want to patch a
compressed image since they are going to be dirty memory when
uncompressed anyways. Might as well just patch as we are loading.
Bug:
22858531
Change-Id: I8c54ccf73408273011161a61bb891736735074d9
David Srbecky [Wed, 9 Dec 2015 17:10:32 +0000 (17:10 +0000)]
Merge "Add local variables to DWARF." am:
d7d23eec77
am:
863b80062e
* commit '
863b80062eef25cc4f7d30436a5a144411187590':
Add local variables to DWARF.
David Srbecky [Wed, 9 Dec 2015 17:06:54 +0000 (09:06 -0800)]
Merge "Add local variables to DWARF."
am:
d7d23eec77
* commit '
d7d23eec777a8b84909f3364700fc1e8a075e5a2':
Add local variables to DWARF.
David Srbecky [Wed, 9 Dec 2015 16:59:36 +0000 (16:59 +0000)]
Merge "Add local variables to DWARF."
David Srbecky [Fri, 27 Nov 2015 10:27:11 +0000 (10:27 +0000)]
Add local variables to DWARF.
Change-Id: Ic915643a898e45380710de86a7944cc27403bd7f
Vladimir Marko [Wed, 9 Dec 2015 16:28:45 +0000 (16:28 +0000)]
Merge "Clarify --boot-image help message" am:
f9a9f2bba7
am:
53b93389d1
* commit '
53b93389d189f39ce33b82c01f5cc527d591b507':
Clarify --boot-image help message
Vladimir Marko [Wed, 9 Dec 2015 16:26:30 +0000 (16:26 +0000)]
Merge "Clarify --boot-image help message"
am:
f9a9f2bba7
* commit '
f9a9f2bba730a4f47aa84d2b97d3f52f6a73ac1f':
Clarify --boot-image help message
Vladimir Marko [Wed, 9 Dec 2015 16:20:34 +0000 (16:20 +0000)]
Merge "Clarify --boot-image help message"
Vladimir Marko [Wed, 9 Dec 2015 16:00:33 +0000 (16:00 +0000)]
Merge "ART: Reduce the instructions generated by packed switch." am:
2c1164c2ae
am:
917ec0f541
* commit '
917ec0f541eb802cdbf13b5a86e1cb8098d2eb06':
ART: Reduce the instructions generated by packed switch.
Vladimir Marko [Wed, 9 Dec 2015 15:58:12 +0000 (15:58 +0000)]
Merge "ART: Reduce the instructions generated by packed switch."
am:
2c1164c2ae
* commit '
2c1164c2aea94e4dfc5bf21785557240c832bcd2':
ART: Reduce the instructions generated by packed switch.
Vladimir Marko [Wed, 9 Dec 2015 15:53:42 +0000 (15:53 +0000)]
Merge "ART: Reduce the instructions generated by packed switch."
Vladimir Marko [Wed, 9 Dec 2015 15:50:57 +0000 (07:50 -0800)]
Merge "ART: Add FdFile::Copy() to copy data from another file." am:
976af0a291
am:
7678a1a060
* commit '
7678a1a0609cc9e0ed25cea5b473d3f098c09338':
ART: Add FdFile::Copy() to copy data from another file.
Vladimir Marko [Wed, 9 Dec 2015 15:48:07 +0000 (15:48 +0000)]
Merge "ART: Add FdFile::Copy() to copy data from another file."
am:
976af0a291
* commit '
976af0a2914f20b65830b1ed9ac8ab45055f35a5':
ART: Add FdFile::Copy() to copy data from another file.
Vladimir Marko [Wed, 9 Dec 2015 15:43:50 +0000 (15:43 +0000)]
Merge "ART: Add FdFile::Copy() to copy data from another file."
Vladimir Marko [Tue, 8 Dec 2015 19:25:49 +0000 (19:25 +0000)]
ART: Add FdFile::Copy() to copy data from another file.
Also move utilities for inspecting file magic numbers to
base/file_magic.{h,cc} and drop the unused IsOatMagic().
Change-Id: I2cc4dd18a5e8b9738fb386c8057faad3722bdd68
Kevin Brodsky [Tue, 24 Nov 2015 14:24:34 +0000 (14:24 +0000)]
Clarify --boot-image help message
Make dex2oat print the same help as e.g. oatdump regarding
--boot-image and clarify the example, this is particularly important
as the automatic addition of the arch to the path is quite
counterintuitive.
Change-Id: I234b498d5deca99bb988a9c24ff9febc6349eb9e
Przemyslaw Szczepaniak [Wed, 9 Dec 2015 09:57:36 +0000 (09:57 +0000)]
New regression test in 042-new-instance
Test that Constructor#newInstance uses its caller
frame for the accessibility check.
Bug:
25817515
Change-Id: If8743ac39281db3378da93f793489c1e8f7ea15a
(cherry picked from commit
7a980a2f6af2f0cd83c1ab223a7736a18a8ccde3)
Andreas Gampe [Wed, 9 Dec 2015 03:28:07 +0000 (03:28 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests" am:
533ffe5369
am:
93f39f4226
* commit '
93f39f42268b5bcdf4e034644b90089a2f730f88':
MIPS64: Enable StringCompareTo and StringIndexOf stub tests
Andreas Gampe [Wed, 9 Dec 2015 03:25:09 +0000 (03:25 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests"
am:
533ffe5369
* commit '
533ffe5369cdaeb8ab7986b1fefece32351c0366':
MIPS64: Enable StringCompareTo and StringIndexOf stub tests
Andreas Gampe [Wed, 9 Dec 2015 03:19:33 +0000 (03:19 +0000)]
Merge "MIPS64: Enable StringCompareTo and StringIndexOf stub tests"
Mingyao Yang [Fri, 20 Nov 2015 01:04:22 +0000 (17:04 -0800)]
Simplify and rename IsLoopInvariant() test.
Simplify IsLoopInvariant() test. Also rename it to IsDefinedOutOfTheLoop()
so there is no ambiguity for example whether a instruction after the loop counts
as a loop invariant. It's up to the caller to make the interpretation.
Change-Id: I999139032b0e4d815dd1e2276f2bd428cf558686
Andreas Gampe [Tue, 8 Dec 2015 22:44:57 +0000 (22:44 +0000)]
Merge "ART: Check invoke-interface earlier in verifier" am:
eb5ddd7b02
am:
782ffa9f4f
* commit '
782ffa9f4fda3f8c9f23aef798d25703d02015a4':
ART: Check invoke-interface earlier in verifier
Andreas Gampe [Tue, 8 Dec 2015 22:42:10 +0000 (22:42 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
am:
eb5ddd7b02
* commit '
eb5ddd7b02ce2d25d4f28f85a13aac628526e1c1':
ART: Check invoke-interface earlier in verifier
Andreas Gampe [Tue, 8 Dec 2015 22:33:23 +0000 (22:33 +0000)]
Merge "ART: Check invoke-interface earlier in verifier"
Zheng Xu [Mon, 7 Dec 2015 09:17:03 +0000 (17:17 +0800)]
ART: Reduce the instructions generated by packed switch.
Implement Vladimir Marko's suggestion. The new compare/jump series
reduce the number of instructions from (2*n+1) to (1.5*n+3).
Generate normal compare/jump series when numEntries <= 3.
Generate optimal compare/jump series when numEntries <= threshold.
Generate jump tables otherwise.
Change-Id: I425547b6787057c7fa84e71f17c145b63b208633
Andreas Gampe [Fri, 4 Dec 2015 01:27:32 +0000 (17:27 -0800)]
ART: Check invoke-interface earlier in verifier
Invoke-interface should only be called on an interface method.
Move the check earlier, as otherwise we'll try to resolve and
potentially inject a method into the dex cache.
Also templatize ResolveMethod with a version always checking
the invoke type, and on a cache miss check whether type target
type is an interface when an interface invoke type was given.
Bug:
21869691
Change-Id: Ica27158f675b5aa223d9229248189612f4706832
Vladimir Marko [Tue, 8 Dec 2015 16:25:47 +0000 (16:25 +0000)]
Merge "Allow initializing runtime with parsed options." am:
e0d25b156e am:
2433d4e17c
am:
0b81f1715d
* commit '
0b81f1715d6af9f98f982d6511e48973aa5a836a':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:22:45 +0000 (08:22 -0800)]
Merge "Allow initializing runtime with parsed options." am:
e0d25b156e
am:
2433d4e17c
* commit '
2433d4e17c3006b8262a0d9421e201fc84777208':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:19:20 +0000 (16:19 +0000)]
Merge "Allow initializing runtime with parsed options."
am:
e0d25b156e
* commit '
e0d25b156ef12b23afa2a6493ae703ec82e23475':
Allow initializing runtime with parsed options.
Vladimir Marko [Tue, 8 Dec 2015 16:15:24 +0000 (16:15 +0000)]
Merge "Allow initializing runtime with parsed options."
Roland Levillain [Tue, 8 Dec 2015 14:05:28 +0000 (06:05 -0800)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am:
763fd2d3d1 am:
74af075f11
am:
641c83a864
* commit '
641c83a8645ef9fd99dca06ec30bae8449b959c7':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 14:02:32 +0000 (14:02 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used." am:
763fd2d3d1
am:
74af075f11
* commit '
74af075f11e23918edc25c86fb2f1d8209cf94fc':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:59:35 +0000 (13:59 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
am:
763fd2d3d1
* commit '
763fd2d3d131898cad6295a19ae9a30e22ce5f2a':
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
Roland Levillain [Tue, 8 Dec 2015 13:55:39 +0000 (13:55 +0000)]
Merge "Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used."
Roland Levillain [Tue, 8 Dec 2015 11:23:02 +0000 (11:23 +0000)]
Fix test-art-target-sync when ART_TEST_ANDROID_ROOT is used.
The semantics of "adb push" have changed since the time
system/core was pinned in the master-art manifest.
Bug:
26051370
Change-Id: I3ee6f2694168b0cdc8c8ac37f77fd443879275dc
Vladimir Marko [Tue, 8 Dec 2015 13:53:11 +0000 (05:53 -0800)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string" am:
8dd7165745 am:
436abf7c1b
am:
0121555032
* commit '
0121555032ff156fb96e957517cb92416ec2af69':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:49:45 +0000 (13:49 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string" am:
8dd7165745
am:
436abf7c1b
* commit '
436abf7c1baad0ee38203cabd4f9deba71b949e5':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:46:52 +0000 (05:46 -0800)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
am:
8dd7165745
* commit '
8dd7165745520e339b60d2ae5631894819790f7d':
ART: Instruction dumper should handle out-of-bound index for const-string
Vladimir Marko [Tue, 8 Dec 2015 13:42:52 +0000 (13:42 +0000)]
Merge "ART: Instruction dumper should handle out-of-bound index for const-string"
David Brazdil [Tue, 8 Dec 2015 13:16:00 +0000 (13:16 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch" am:
95f05a89a6 am:
17f715c0bd
am:
da44a389fb
* commit '
da44a389fbf5794ef2a6da445e80f92e0d6878f3':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:13:05 +0000 (05:13 -0800)]
Merge "ART: Enable all optimizations except LSE under try/catch" am:
95f05a89a6
am:
17f715c0bd
* commit '
17f715c0bd89fe6565ba2e3a7270990488c7049e':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:09:45 +0000 (13:09 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
am:
95f05a89a6
* commit '
95f05a89a682f40151cd843f2110b02c35434635':
ART: Enable all optimizations except LSE under try/catch
David Brazdil [Tue, 8 Dec 2015 13:05:22 +0000 (13:05 +0000)]
Merge "ART: Enable all optimizations except LSE under try/catch"
David Brazdil [Mon, 7 Dec 2015 10:04:40 +0000 (10:04 +0000)]
ART: Enable all optimizations except LSE under try/catch
Dynamic BCE now updates try/catch information during basic block
manipulation and can be enabled. The last missing optimization is LSE.
This patch removes all special-casing from optimizing_compiler.cc and
bails inside LSE instead.
Change-Id: Ie0c6fde7295880ea55d35571455a617fce2b7580
Serdjuk, Nikolay Y [Mon, 7 Dec 2015 08:45:44 +0000 (14:45 +0600)]
ART: Instruction dumper should handle out-of-bound index for const-string
If const-string refers to out-of-bound index then we should handle it
similarly to PrettyField, PrettyMethod and PrettyType.
Change-Id: Ib6b1e20169e4b47c1cdb7dda80320ed21d61cfe3
Signed-off-by: Serdjuk, Nikolay Y <nikolay.y.serdjuk@intel.com>
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:20:43 +0000 (18:20 -0800)]
Merge "Replace proxy class names with deterministic ones for test output." am:
e8be90a673 am:
6df522ec3d
am:
b81df0fab3
* commit '
b81df0fab343821c0cb3f6e627fd0f65ded8ffee':
Replace proxy class names with deterministic ones for test output.
Andreas Gampe [Tue, 8 Dec 2015 02:19:34 +0000 (18:19 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size." am:
9f62af0e1c am:
96c37a70b6
am:
9edaaa4cdf
* commit '
9edaaa4cdfd4a9765e67807bb82edd4c2ded4ae0':
ART: Fix PACKED size of tls_ptr_size.
Mathieu Chartier [Tue, 8 Dec 2015 02:19:26 +0000 (18:19 -0800)]
Merge "Combine class sets when writing a class table" am:
3cf8583a2f am:
781a197c45
am:
97947a81d5
* commit '
97947a81d5ad0cccfeec080ba3d0497b066cd296':
Combine class sets when writing a class table
Richard Uhler [Tue, 8 Dec 2015 02:19:19 +0000 (18:19 -0800)]
Merge "Annotate root objects and show their types." am:
0e72abfae7 am:
ec698a4bb9
am:
70192c5bee
* commit '
70192c5beefaa60efbc74d1b3178dfe41694ae91':
Annotate root objects and show their types.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:13:04 +0000 (02:13 +0000)]
Merge "Replace proxy class names with deterministic ones for test output." am:
e8be90a673
am:
6df522ec3d
* commit '
6df522ec3d4a2c7ff57d28d3802ec46263c3f2fa':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:08:36 +0000 (02:08 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
am:
e8be90a673
* commit '
e8be90a673feb573d53277f42282955cbf7f58e9':
Replace proxy class names with deterministic ones for test output.
Hiroshi Yamauchi [Tue, 8 Dec 2015 02:02:40 +0000 (02:02 +0000)]
Merge "Replace proxy class names with deterministic ones for test output."
Hiroshi Yamauchi [Sat, 5 Dec 2015 00:18:49 +0000 (16:18 -0800)]
Replace proxy class names with deterministic ones for test output.
This should avoid potentially flaky test failures in 005-annotations
and 044-proxy.
(cherrypick commit
bc7f8080d1f5d0138cb83cba73a747d43d62c23c)
Bug:
25838574
Bug:
12687968
Change-Id: I08765abd82e41258ce4d1d8bb9dffce70c8b6689
Roland Levillain [Tue, 8 Dec 2015 00:06:27 +0000 (00:06 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest."" am:
526377fe8d am:
867c60b2a1
am:
50f37073f8
* commit '
50f37073f8b198476373197a9dbaf4adda2402ff':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Tue, 8 Dec 2015 00:06:14 +0000 (00:06 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest." am:
a2964d5ab5 am:
0be457fd49
am:
42061a6e4f
* commit '
42061a6e4f1e6b9e7f1ef94281f45e888b32545a':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Tue, 8 Dec 2015 00:00:55 +0000 (00:00 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics." am:
a6756069c4 am:
c78124a016
am:
f502fad8de
* commit '
f502fad8dee335d74b3695cdc551efd6cea29484':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Tue, 8 Dec 2015 00:00:48 +0000 (00:00 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong." am:
038f4f2f4d am:
daff07a8ab
am:
4168253fdb
* commit '
4168253fdb0099a16dde2104e470014d97469689':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Andreas Gampe [Mon, 7 Dec 2015 23:34:47 +0000 (15:34 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size." am:
9f62af0e1c
am:
96c37a70b6
* commit '
96c37a70b61360ec0e4aeb9d67b6de08cf131021':
ART: Fix PACKED size of tls_ptr_size.
Mathieu Chartier [Mon, 7 Dec 2015 23:34:38 +0000 (15:34 -0800)]
Merge "Combine class sets when writing a class table" am:
3cf8583a2f
am:
781a197c45
* commit '
781a197c4585f1c61662066e7c937133bf7e0d07':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:34:24 +0000 (15:34 -0800)]
Merge "Annotate root objects and show their types." am:
0e72abfae7
am:
ec698a4bb9
* commit '
ec698a4bb94298aa5b6d0d66f31a42d1a5674abb':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:33:58 +0000 (23:33 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest."" am:
526377fe8d
am:
867c60b2a1
* commit '
867c60b2a1c1470ba999207cd0ba426a1e28ceee':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:33:44 +0000 (23:33 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest." am:
a2964d5ab5
am:
0be457fd49
* commit '
0be457fd498a47d34a2ad00d53b72898f497afa4':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:33:34 +0000 (23:33 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics." am:
a6756069c4
am:
c78124a016
* commit '
c78124a016326f9d4bf98e0464df62ffbf8b1a0f':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.
Roland Levillain [Mon, 7 Dec 2015 23:33:21 +0000 (23:33 +0000)]
Merge "Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong." am:
038f4f2f4d
am:
daff07a8ab
* commit '
daff07a8ab3fd3fc93db4865ac7eb7bbd7dcf282':
Fix art::x86::IntrinsicLocationsBuilderX86::VisitUnsafeGetLong.
Andreas Gampe [Mon, 7 Dec 2015 23:27:19 +0000 (15:27 -0800)]
Merge "ART: Fix PACKED size of tls_ptr_size."
am:
9f62af0e1c
* commit '
9f62af0e1cd770ec3e98f0d1a83a1193e2493cac':
ART: Fix PACKED size of tls_ptr_size.