OSDN Git Service
Mingyao Yang [Fri, 11 Dec 2015 01:05:51 +0000 (17:05 -0800)]
Merge "For LSE, add a few non-aliasing cases due to pre-existence."
am:
84623e1802
* commit '
84623e18021451375248af7be44dd0717e681c1f':
For LSE, add a few non-aliasing cases due to pre-existence.
Mingyao Yang [Fri, 11 Dec 2015 00:57:24 +0000 (00:57 +0000)]
Merge "For LSE, add a few non-aliasing cases due to pre-existence."
Mingyao Yang [Thu, 3 Dec 2015 22:11:15 +0000 (14:11 -0800)]
For LSE, add a few non-aliasing cases due to pre-existence.
Create reference info for a few instructions that can return a reference.
So they will be treated as not-aliasing with future allocations.
Change-Id: Ided3db790b95f8d6f1468bbf4b7f3e6d71d81eb2
Andreas Gampe [Thu, 10 Dec 2015 23:58:19 +0000 (15:58 -0800)]
Merge "ART: Stash a resolved method late in the verifier"
am:
748047de83
* commit '
748047de833061466e230baf374480a147568f73':
ART: Stash a resolved method late in the verifier
Shinichiro Hamaji [Thu, 10 Dec 2015 23:52:14 +0000 (15:52 -0800)]
Merge "Output static field values in dexdump"
am:
1a74dc4209
* commit '
1a74dc42099bd1ea4583edabef42b5a4d6f70389':
Output static field values in dexdump
Andreas Gampe [Thu, 10 Dec 2015 23:50:11 +0000 (23:50 +0000)]
Merge "ART: Stash a resolved method late in the verifier"
Shinichiro Hamaji [Thu, 10 Dec 2015 23:45:02 +0000 (23:45 +0000)]
Merge "Output static field values in dexdump"
Andreas Gampe [Fri, 4 Dec 2015 01:27:32 +0000 (17:27 -0800)]
ART: Stash a resolved method late in the verifier
Invoke-interface should only be called on an interface method.
We cannot move the check earlier, as there are other checks
that must be done that can fail a class hard. So postpone
a push to the dex cache.
Clean up the test a bit.
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: I94cbb23339cbbb3cb6be9995775e4dcefacce7fd
Andreas Gampe [Thu, 10 Dec 2015 21:37:39 +0000 (13:37 -0800)]
Merge "Revert "ART: Check invoke-interface earlier in verifier""
am:
170e01a6b5
* commit '
170e01a6b59b3242a5afc76c3a03c00ce288150f':
Revert "ART: Check invoke-interface earlier in verifier"
Andreas Gampe [Thu, 10 Dec 2015 21:28:58 +0000 (21:28 +0000)]
Merge "Revert "ART: Check invoke-interface earlier in verifier""
Andreas Gampe [Thu, 10 Dec 2015 21:25:27 +0000 (13:25 -0800)]
Revert "ART: Check invoke-interface earlier in verifier"
This reverts commit
dae24142127c64551142a50423085aabdb0a6060.
It is important to check the name of the method being called.
Bug:
21869691
Andreas Gampe [Thu, 10 Dec 2015 20:57:56 +0000 (12:57 -0800)]
Merge "ART: Refactor verifier callbacks"
am:
34760f9a97
* commit '
34760f9a97e6a1733edfca1b13199f749106a30f':
ART: Refactor verifier callbacks
Andreas Gampe [Thu, 10 Dec 2015 20:50:26 +0000 (20:50 +0000)]
Merge "ART: Refactor verifier callbacks"
Vladimir Marko [Thu, 10 Dec 2015 20:36:44 +0000 (12:36 -0800)]
Merge "Refactor and clean up OatWriter and Dex2Oat."
am:
a1b21219db
* commit '
a1b21219dbed80f8812611968b624ba8644781e3':
Refactor and clean up OatWriter and Dex2Oat.
Vladimir Marko [Thu, 10 Dec 2015 20:29:25 +0000 (20:29 +0000)]
Merge "Refactor and clean up OatWriter and Dex2Oat."
Vladimir Marko [Thu, 10 Dec 2015 13:49:19 +0000 (13:49 +0000)]
Refactor and clean up OatWriter and Dex2Oat.
This is in preparation for early writing of dex files
to oat file.
Change-Id: I31195f3c94eb8ff676c600c60bd35ae531f457b4
Mathieu Chartier [Thu, 10 Dec 2015 19:24:38 +0000 (11:24 -0800)]
Merge "Revert "Revert "Add support for LZ4 compressed image files"""
am:
840d22928c
* commit '
840d22928c09bf373c8f559171fdba3f7448345e':
Revert "Revert "Add support for LZ4 compressed image files""
Mathieu Chartier [Thu, 10 Dec 2015 19:16:31 +0000 (19:16 +0000)]
Merge "Revert "Revert "Add support for LZ4 compressed image files"""
Mathieu Chartier [Thu, 10 Dec 2015 17:33:21 +0000 (09:33 -0800)]
Revert "Revert "Add support for LZ4 compressed image files""
Needed to call compiler_driver_->SetSupportBootImageFixup(false).
Bug:
22858531
This reverts commit
83d4d72aa0e4170209ab50c67ba22e46b71352c1.
Change-Id: Iaed6a810a0c088f1f2c57cf2f12087f3978a3de1
David Srbecky [Thu, 10 Dec 2015 16:48:24 +0000 (16:48 +0000)]
Merge "Get source mapping table from stack maps."
am:
836ee764c8
* commit '
836ee764c86892aff1dca6b0f8b27e32c7374cc7':
Get source mapping table from stack maps.
David Srbecky [Thu, 10 Dec 2015 16:42:55 +0000 (16:42 +0000)]
Merge "Get source mapping table from stack maps."
David Srbecky [Tue, 8 Dec 2015 15:05:08 +0000 (15:05 +0000)]
Get source mapping table from stack maps.
Stack maps contain pc to dex mapping.
Reuse them instead of maintaining separate map.
Change-Id: Iaaec9a6bd2603eace1dfc8f4344087883d88cce3
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: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: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 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: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: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 05:03:23 +0000 (21:03 -0800)]
ART: Refactor verifier callbacks
Change the return type of MethodVerified to void. It was never
used anyways.
Remove the callbacks calls from the core of the verifier (Verify()).
Instead, make the convenience functions do the work, and add a
parameter to supply the callback so that the verifier becomes
independent of the Runtime-stored one.
Fix up calls that now need to provide a callback, but leave places
that only run the verifier to get metadata (e.g., register type data,
lock state) without callback. This avoids callback calls when in JIT
mode.
Bug:
26075442
Change-Id: I2c270f01e4de088771d4d4b19dae4f07d77640f0
Shinichiro Hamaji [Thu, 5 Nov 2015 07:51:33 +0000 (16:51 +0900)]
Output static field values in dexdump
This is necessary to generate table-of-contents of .dex files
to prevent unnecessary rebuilds for implementation-only
changes because these values can be used while compiling other
modules.
Also modify EncodedStaticFieldValueIterator so it can be used
without ClassLoader/Linker.
Bug:
24597504
Change-Id: Ida0c839f9dd6961e1c1b3a380e2092042fad03bb
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
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: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: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: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 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: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
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: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: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: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: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: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: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
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.
Andreas Gampe [Mon, 7 Dec 2015 23:20:18 +0000 (23:20 +0000)]
Merge "ART: Fix PACKED size of tls_ptr_size."
Mathieu Chartier [Mon, 7 Dec 2015 23:19:19 +0000 (23:19 +0000)]
Merge "Combine class sets when writing a class table"
am:
3cf8583a2f
* commit '
3cf8583a2fe1a2793b4c67098df62f4362b47f0c':
Combine class sets when writing a class table
Richard Uhler [Mon, 7 Dec 2015 23:18:40 +0000 (23:18 +0000)]
Merge "Annotate root objects and show their types."
am:
0e72abfae7
* commit '
0e72abfae75e0072679c425b7a4fb6344e1de550':
Annotate root objects and show their types.
Roland Levillain [Mon, 7 Dec 2015 23:11:33 +0000 (23:11 +0000)]
Merge "Revert "Fix the ART Buildbots using the master-art manifest.""
am:
526377fe8d
* commit '
526377fe8d49803654966887be08140dbed2acd8':
Revert "Fix the ART Buildbots using the master-art manifest."
Roland Levillain [Mon, 7 Dec 2015 23:11:26 +0000 (23:11 +0000)]
Merge "Fix the ART Buildbots using the master-art manifest."
am:
a2964d5ab5
* commit '
a2964d5ab5c1a7158a15bb899bc99d59236b3ac5':
Fix the ART Buildbots using the master-art manifest.
Roland Levillain [Mon, 7 Dec 2015 23:11:17 +0000 (23:11 +0000)]
Merge "Annotate Boolean literals more uniformly in Optimizing\'s intrinsics."
am:
a6756069c4
* commit '
a6756069c4363a231928b040ff0c86c80acdb9b9':
Annotate Boolean literals more uniformly in Optimizing's intrinsics.