OSDN Git Service
Aart Bik [Mon, 16 Nov 2015 16:44:52 +0000 (16:44 +0000)]
Merge "Implemented control of "export only" feature in dexdump."
am:
a445f7afbe
* commit '
a445f7afbe113186de97007891307065109a6b84':
Implemented control of "export only" feature in dexdump.
Aart Bik [Mon, 16 Nov 2015 16:41:21 +0000 (16:41 +0000)]
Merge "Implemented control of "export only" feature in dexdump."
Roland Levillain [Mon, 16 Nov 2015 16:16:09 +0000 (16:16 +0000)]
Merge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS."
am:
72cc929186
* commit '
72cc92918665acb262f69e56be984e24bd15a223':
Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS.
Roland Levillain [Mon, 16 Nov 2015 16:09:48 +0000 (16:09 +0000)]
Merge "Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS."
Roland Levillain [Mon, 16 Nov 2015 15:59:08 +0000 (15:59 +0000)]
Mark kQuickReadBarrierForRootSlow as direct entry point on MIPS.
Change-Id: I35caa32c9773646692706642188ab522237a68ac
Roland Levillain [Mon, 16 Nov 2015 15:42:46 +0000 (15:42 +0000)]
Merge "x86/x86-64 read barrier support for concurrent GC in Optimizing."
am:
3eb242c0c0
* commit '
3eb242c0c0d7e8327d2b1f515b463337e37c64ba':
x86/x86-64 read barrier support for concurrent GC in Optimizing.
Roland Levillain [Mon, 16 Nov 2015 15:34:28 +0000 (15:34 +0000)]
Merge "x86/x86-64 read barrier support for concurrent GC in Optimizing."
Calin Juravle [Mon, 16 Nov 2015 11:12:49 +0000 (11:12 +0000)]
Merge "Move the trace file out of the profiles folder."
am:
3610abea2f
* commit '
3610abea2fe09f519e20fa4212f116d9167b5d51':
Move the trace file out of the profiles folder.
Calin Juravle [Mon, 16 Nov 2015 11:04:13 +0000 (11:04 +0000)]
Merge "Move the trace file out of the profiles folder."
Roland Levillain [Fri, 13 Nov 2015 10:07:31 +0000 (10:07 +0000)]
x86/x86-64 read barrier support for concurrent GC in Optimizing.
This first implementation uses slow paths to instrument heap
reference loads and GC root loads for the concurrent copying
collector, respectively calling the artReadBarrierSlow and
artReadBarrierForRootSlow (new) runtime entry points.
Notes:
- This implementation does not instrument HInvokeVirtual
nor HInvokeInterface instructions (for class reference
loads), as the corresponding read barriers are not stricly
required with the current concurrent copying collector.
- Intrinsics which may eventually call (on slow path) are
disabled when read barriers are enabled, as the current
slow path infrastructure does not support this case.
- When read barriers are enabled, the code generated for a
HArraySet instruction always go into the array set slow
path for object arrays (delegating the operation to the
runtime), as we are lacking a mechanism to keep a
temporary register live accross a runtime call (needed for
the instrumentation of type checking code, which requires
two successive read barriers).
Bug:
12687968
Change-Id: I14cd6107233c326389120336f93955b28ffbb329
Hiroshi Yamauchi [Sat, 14 Nov 2015 02:17:42 +0000 (02:17 +0000)]
Merge "Fix class unloading with the CC collector."
am:
dd4cbcc924
* commit '
dd4cbcc924c8ba2a578914a4a366996693bdcd74':
Fix class unloading with the CC collector.
Hiroshi Yamauchi [Sat, 14 Nov 2015 02:15:09 +0000 (02:15 +0000)]
Merge "Fix class unloading with the CC collector."
Hiroshi Yamauchi [Thu, 12 Nov 2015 07:45:34 +0000 (23:45 -0800)]
Fix class unloading with the CC collector.
Avoid unnecessarily decoding dex cache and class loader weak roots,
which would trigger read barriers.
Re-enable 141-class-unload with the CC collector.
Bug:
12687968
Bug:
24468364
Change-Id: Ib4c19f25000873cab0e06047040442d135285745
Alex Light [Fri, 13 Nov 2015 19:10:26 +0000 (19:10 +0000)]
Merge "Disable test 964 with gcstress since it often times out."
am:
0e06a0989f
* commit '
0e06a0989f4fc53e0d281a5a2cb5b5a17feaea0c':
Disable test 964 with gcstress since it often times out.
Alex Light [Fri, 13 Nov 2015 19:07:37 +0000 (19:07 +0000)]
Merge "Disable test 964 with gcstress since it often times out."
Mathieu Chartier [Fri, 13 Nov 2015 18:39:46 +0000 (18:39 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray"""
am:
f6ebcd099a
* commit '
f6ebcd099aeaa694fada7ce4a77b1698488d8121':
Revert "Revert "Add missing null check to String::ToCharArray""
Alex Light [Fri, 13 Nov 2015 18:39:34 +0000 (10:39 -0800)]
Disable test 964 with gcstress since it often times out.
Change-Id: Ice9b25d373b849d4415f9189fe94d8ccd6d05cbe
Mathieu Chartier [Fri, 13 Nov 2015 18:33:54 +0000 (18:33 +0000)]
Merge "Revert "Revert "Add missing null check to String::ToCharArray"""
Aart Bik [Fri, 13 Nov 2015 18:06:01 +0000 (10:06 -0800)]
Implemented control of "export only" feature in dexdump.
Rationale:
Export only is now under explicit control of a new -e flag, and
can be used to control both -l xml and -l plain. The result is
that, by default, xml output now shows all items (old behavior
can be forced with -e -l xml). This solution feels a bit cleaner
than adding a flag to override export only when -l xml is given
(old dexdump forced this tight relation).
Bug:
25673756 (feature request).
Change-Id: I7cfd48bf91195d2a81d134936719d267fda399f5
Mathieu Chartier [Fri, 13 Nov 2015 16:36:59 +0000 (08:36 -0800)]
Revert "Revert "Add missing null check to String::ToCharArray""
Fix flaky test.
Bug:
25641543
This reverts commit
b52a39c76e0cb0638c92cdcf6b5c5aa551420e1a.
Change-Id: I6b0d3087dba3680252e65af554530e2769cde55c
David Srbecky [Fri, 13 Nov 2015 15:56:39 +0000 (15:56 +0000)]
Merge "Stream DWARF debug section directly to disk."
am:
2f49b0a907
* commit '
2f49b0a90720fe9f4cab040c376aab5f387967e3':
Stream DWARF debug section directly to disk.
David Srbecky [Fri, 13 Nov 2015 15:53:30 +0000 (15:53 +0000)]
Merge "Stream DWARF debug section directly to disk."
Nicolas Geoffray [Fri, 13 Nov 2015 08:20:00 +0000 (08:20 +0000)]
Merge "Revert "Add missing null check to String::ToCharArray""
am:
6aa0735c7b
* commit '
6aa0735c7b84061901a844270d22249cbb01004e':
Revert "Add missing null check to String::ToCharArray"
Nicolas Geoffray [Fri, 13 Nov 2015 08:16:55 +0000 (08:16 +0000)]
Merge "Revert "Add missing null check to String::ToCharArray""
Nicolas Geoffray [Fri, 13 Nov 2015 08:16:23 +0000 (08:16 +0000)]
Revert "Add missing null check to String::ToCharArray"
Does not work with the interpreter.
Bug:
25641543
This reverts commit
952d608062eec2d7f47f9b45dba935ad8b4d23e5.
Change-Id: Ic112fa69c7ddd119cbccc5b65007b5ee4dfccd09
Mathieu Chartier [Fri, 13 Nov 2015 01:34:55 +0000 (01:34 +0000)]
Merge "Add missing null check to String::ToCharArray"
am:
dc9706dcea
* commit '
dc9706dcea7c1384d2b2137485f9579db36ca328':
Add missing null check to String::ToCharArray
Mathieu Chartier [Fri, 13 Nov 2015 01:32:44 +0000 (01:32 +0000)]
Merge "Add missing null check to String::ToCharArray"
Mathieu Chartier [Fri, 13 Nov 2015 00:53:41 +0000 (16:53 -0800)]
Add missing null check to String::ToCharArray
Added test.
Bug:
25641543
Change-Id: Ic9a21ce8bc530dbedf14334ad47f5faa90ae4ddc
Alex Light [Fri, 13 Nov 2015 00:55:39 +0000 (00:55 +0000)]
Merge "Fix bug with test 964."
am:
1227d627e0
* commit '
1227d627e0e0ef8b34a66f94714ed737953098ce':
Fix bug with test 964.
Alex Light [Fri, 13 Nov 2015 00:50:11 +0000 (00:50 +0000)]
Merge "Fix bug with test 964."
Alex Light [Thu, 12 Nov 2015 23:38:24 +0000 (15:38 -0800)]
Fix bug with test 964.
An indentation error meant that some test cases would not be
generated. Also fixed run-test script since fixing this causes the
output to be larger than the default ulimit.
Change-Id: I454f89078f8307f400b66627fdab13feaf492512
Mathieu Chartier [Thu, 12 Nov 2015 19:25:25 +0000 (19:25 +0000)]
Merge "Add class loader argument to openDexFileNative"
am:
efca362e8c
* commit '
efca362e8c67d5b330dd4ebc312cd45cf2585964':
Add class loader argument to openDexFileNative
Mathieu Chartier [Thu, 12 Nov 2015 19:19:36 +0000 (19:19 +0000)]
Merge "Add class loader argument to openDexFileNative"
Mathieu Chartier [Thu, 12 Nov 2015 18:00:58 +0000 (10:00 -0800)]
Add class loader argument to openDexFileNative
Bug:
22858531
Change-Id: I315919d91822db0c73cf16b21d660d5870d5746f
Vladimir Marko [Thu, 12 Nov 2015 15:22:51 +0000 (15:22 +0000)]
Merge "Optimizing/X86: PC-relative dex cache array addressing."
am:
cff81076cb
* commit '
cff81076cbb4bbe3841942f14326f4401fa3c8df':
Optimizing/X86: PC-relative dex cache array addressing.
Vladimir Marko [Thu, 12 Nov 2015 15:20:08 +0000 (15:20 +0000)]
Merge "Optimizing/X86: PC-relative dex cache array addressing."
Vladimir Marko [Thu, 12 Nov 2015 11:59:06 +0000 (11:59 +0000)]
Merge "Optimizing: Clean up constant location handling."
am:
fe0ec35c68
* commit '
fe0ec35c68d57205bd8fe13bd195ae0b5a3ed180':
Optimizing: Clean up constant location handling.
Vladimir Marko [Thu, 12 Nov 2015 11:56:22 +0000 (11:56 +0000)]
Merge "Optimizing: Clean up constant location handling."
Tamas Berghammer [Thu, 12 Nov 2015 11:10:48 +0000 (11:10 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""
am:
7a2f5c9459
* commit '
7a2f5c9459b492bd8550e437087191e52ca6324f':
Revert "Mark __jit_debug_register_code as a unique symbol"
Tamas Berghammer [Thu, 12 Nov 2015 11:06:38 +0000 (11:06 +0000)]
Merge "Revert "Mark __jit_debug_register_code as a unique symbol""
Tamas Berghammer [Thu, 12 Nov 2015 11:05:50 +0000 (11:05 +0000)]
Revert "Mark __jit_debug_register_code as a unique symbol"
This reverts commit
e7132a9a5d98103fa52a750287476b063fa88863.
We are still using ld on some targets instead of gold when compiling for ararch64. Revert until we figure out why.
Change-Id: If09fac8d72485dc8adbc81e44a2af84ed91dcd91
Sebastien Hertz [Thu, 12 Nov 2015 11:02:35 +0000 (11:02 +0000)]
Merge "JDWP: default implementation of Method.IsObsolete"
am:
190c5f9f3b
* commit '
190c5f9f3b8aba5c8c7a26d4cfe0f45297bd875c':
JDWP: default implementation of Method.IsObsolete
Sebastien Hertz [Thu, 12 Nov 2015 11:00:38 +0000 (11:00 +0000)]
Merge "JDWP: default implementation of Method.IsObsolete"
Roland Levillain [Thu, 12 Nov 2015 10:47:58 +0000 (10:47 +0000)]
Merge "MIPS64: fix calling conventions in LoadClass and field accesses"
am:
e542fd0c04
* commit '
e542fd0c04426c45ae6a04bc4ae79ac77b99d8c6':
MIPS64: fix calling conventions in LoadClass and field accesses
Vladimir Marko [Mon, 2 Nov 2015 14:36:43 +0000 (14:36 +0000)]
Optimizing/X86: PC-relative dex cache array addressing.
Add PC-relative dex cache array addressing for X86 and use
it for better invoke-static/-direct dispatch. Also delay
the initialization to the PC-relative base until needed.
Change-Id: Ib8634d5edce4920cd70172fd13211809cf6948d1
Roland Levillain [Thu, 12 Nov 2015 10:43:30 +0000 (10:43 +0000)]
Merge "MIPS64: fix calling conventions in LoadClass and field accesses"
Tamas Berghammer [Thu, 12 Nov 2015 10:42:45 +0000 (10:42 +0000)]
Merge "Mark __jit_debug_register_code as a unique symbol"
am:
772e3ab102
* commit '
772e3ab10292ad3ce4ca5e217c552ded4e26651a':
Mark __jit_debug_register_code as a unique symbol
Tamas Berghammer [Thu, 12 Nov 2015 10:40:23 +0000 (10:40 +0000)]
Merge "Mark __jit_debug_register_code as a unique symbol"
Vladimir Marko [Thu, 12 Nov 2015 10:18:54 +0000 (10:18 +0000)]
Merge "ART: Add comments to Scoped-/ArenaAllocator."
am:
9b71e9c702
* commit '
9b71e9c702df1b65ea658cd5fc856e5a6d80669c':
ART: Add comments to Scoped-/ArenaAllocator.
Vladimir Marko [Thu, 12 Nov 2015 10:16:29 +0000 (10:16 +0000)]
Merge "ART: Add comments to Scoped-/ArenaAllocator."
Mathieu Chartier [Thu, 12 Nov 2015 03:27:49 +0000 (03:27 +0000)]
Merge "Image space cleanup for app images"
am:
11a4c96a7f
* commit '
11a4c96a7f8268a94cbdcbc2771d03bc4f2ce065':
Image space cleanup for app images
Mathieu Chartier [Thu, 12 Nov 2015 03:23:54 +0000 (03:23 +0000)]
Merge "Image space cleanup for app images"
Mathieu Chartier [Tue, 10 Nov 2015 22:13:23 +0000 (14:13 -0800)]
Image space cleanup for app images
Removed Heap::GetImageSpace, added Heap::GetBootImageSpace.
Generalized some logic in the class linker for image spaces.
Bug:
22858531
Change-Id: Ib3e12bb061a247e232d3dc93b0d6b35eb3a34d25
Hans Boehm [Thu, 12 Nov 2015 02:55:46 +0000 (02:55 +0000)]
Merge "Get class loader to remember interrupts"
am:
2abe1f4a8d
* commit '
2abe1f4a8d6b56ed95da0671091e4fe15f651bd6':
Get class loader to remember interrupts
Hans Boehm [Thu, 12 Nov 2015 02:51:20 +0000 (02:51 +0000)]
Merge "Get class loader to remember interrupts"
Hans Boehm [Thu, 12 Nov 2015 00:13:57 +0000 (16:13 -0800)]
Get class loader to remember interrupts
Bug:
25606036
Monitor::Wait should not reset the interrupt flag unless it actually
throws the exception.
Change-Id: Id6a35c888160043831f30055f9bd39e7f0440439
Alexey Frunze [Wed, 11 Nov 2015 21:31:12 +0000 (13:31 -0800)]
MIPS64: fix calling conventions in LoadClass and field accesses
This fixes failures in test 529-checker-unresolved
Change-Id: I6170c22059e9711b2fcc965b00d6e34edd839539
Alex Light [Wed, 11 Nov 2015 23:39:43 +0000 (23:39 +0000)]
Merge "Make test 968\'s name shorter"
am:
5165b6ba1f
* commit '
5165b6ba1fda85d769c5092a65f07bcfffb0b3e7':
Make test 968's name shorter
Alex Light [Wed, 11 Nov 2015 23:36:15 +0000 (23:36 +0000)]
Merge "Make test 968's name shorter"
Alex Light [Wed, 11 Nov 2015 23:32:24 +0000 (15:32 -0800)]
Make test 968's name shorter
It was causing intermittent CI breaks due to the long name of the
generated oat file.
Change-Id: I71b4b3aa1a13df2696b276998cafe40006d54b66
Aart Bik [Wed, 11 Nov 2015 22:42:41 +0000 (22:42 +0000)]
Merge "Revert "lambda: unit test for lambda expressions at Java Language source level.""
am:
63e310c5c3
* commit '
63e310c5c3cd2341c1b2a60d25764c44ee066318':
Revert "lambda: unit test for lambda expressions at Java Language source level."
Aart Bik [Wed, 11 Nov 2015 22:38:10 +0000 (22:38 +0000)]
Merge "Revert "lambda: unit test for lambda expressions at Java Language source level.""
Aart Bik [Wed, 11 Nov 2015 22:36:19 +0000 (22:36 +0000)]
Revert "lambda: unit test for lambda expressions at Java Language source level."
REASON: Buildbots are having jack issues
This reverts commit
152ee552652691ecaec2db420d468cb178647952.
Change-Id: I650fe1a94f1b97c14a689599703498506dd70b23
David Srbecky [Wed, 11 Nov 2015 21:45:17 +0000 (21:45 +0000)]
Merge "Move .debug_line before .debug_info."
am:
c4b2410947
* commit '
c4b24109473d50e4cc829be5d1e7c77fd21527f3':
Move .debug_line before .debug_info.
David Srbecky [Wed, 11 Nov 2015 21:36:22 +0000 (21:36 +0000)]
Merge "Move .debug_line before .debug_info."
David Srbecky [Wed, 11 Nov 2015 20:19:38 +0000 (20:19 +0000)]
Stream DWARF debug section directly to disk.
Change the structure so that the debug sections are written to
disk as we go. There are still some temporary buffers, however,
we no longer hold all of the data in memory before writing it.
We can not avoid buffering of some things (e.g. .debug_str).
Change-Id: Id4940cf10ae5b6f3cac7fb8d20197f0304079b92
David Srbecky [Wed, 11 Nov 2015 20:38:16 +0000 (20:38 +0000)]
Move .debug_line before .debug_info.
Swap the order since .debug_info depends on .debug_line, but
not vice versa. This is for disk streaming convenience.
Change-Id: Iabe18fea97aa5527aedfc55c9bdf66e5587568bc
Vladimir Marko [Wed, 11 Nov 2015 18:50:32 +0000 (18:50 +0000)]
Merge "ART: Fix arena allocation for valgrind."
am:
00bcbcfdc3
* commit '
00bcbcfdc3ba28b4b985d8a8029d677579e902ff':
ART: Fix arena allocation for valgrind.
Vladimir Marko [Wed, 11 Nov 2015 18:45:50 +0000 (18:45 +0000)]
ART: Add comments to Scoped-/ArenaAllocator.
Change-Id: Iba7350114fb998ac9ee1466ef12f4a5024a18e8e
Vladimir Marko [Wed, 11 Nov 2015 18:44:25 +0000 (18:44 +0000)]
Merge "ART: Fix arena allocation for valgrind."
Aart Bik [Wed, 11 Nov 2015 18:33:32 +0000 (18:33 +0000)]
Merge "lambda: unit test for lambda expressions at Java Language source level."
am:
a828aadd6d
* commit '
a828aadd6dd9a5e73daf9a167b71c88bc2bdfbd7':
lambda: unit test for lambda expressions at Java Language source level.
Aart Bik [Wed, 11 Nov 2015 18:30:36 +0000 (18:30 +0000)]
Merge "lambda: unit test for lambda expressions at Java Language source level."
Aart Bik [Wed, 11 Nov 2015 00:49:45 +0000 (16:49 -0800)]
lambda: unit test for lambda expressions at Java Language source level.
Rationale: having a checkers-flavored unit test will enable testing
both if the correct HIR is generated using the checker
as well as the correctness of execution (interpreter for now,
but native code later).
Change-Id: I588e9955efaaf53e5c5e3398399e009041cd65f0
Calin Juravle [Wed, 4 Nov 2015 16:16:47 +0000 (16:16 +0000)]
Move the trace file out of the profiles folder.
/dalvik-cache/profiles/ is going away. Create the trace file under
/data/misc/trace.
This enable tracing without forcing SElinux into permissive mode.
Bug:
24698874
Bug:
25612377
Change-Id: I78d09ef629bebe635c3baabaf88f01996d3333e5
Alex Light [Wed, 11 Nov 2015 18:12:08 +0000 (18:12 +0000)]
Merge "Correct exception behavior for default methods"
am:
d15cd44c90
* commit '
d15cd44c905e055d2d60b847ba4b221edda5e119':
Correct exception behavior for default methods
Alex Light [Wed, 11 Nov 2015 18:07:14 +0000 (18:07 +0000)]
Merge "Correct exception behavior for default methods"
Vladimir Marko [Tue, 10 Nov 2015 20:54:22 +0000 (20:54 +0000)]
ART: Fix arena allocation for valgrind.
Move the zero-initialization check after marking the newly
allocated chunk as defined and check only the allocated
space without the red zone. Also mark unallocated space as
inaccessible instead of just undefined.
Change-Id: I74fc65f5b53acb74cec4e5a0146f41dacf4a1470
Vladimir Marko [Wed, 11 Nov 2015 12:37:46 +0000 (12:37 +0000)]
Optimizing: Clean up constant location handling.
Locations builder should use ConstantLocation() when the
code generator relies on a location to be constant. Code
generator should interrogate locations, not inputs, about
being const.
Change-Id: Ic35bb84aa9f83e0977b151a0430aca6c88f19cf0
Tamas Berghammer [Wed, 2 Sep 2015 10:24:33 +0000 (11:24 +0100)]
Mark __jit_debug_register_code as a unique symbol
This symbol is used to notify the debugger about JIT library load/unload
events. Because of ICF, several functions with the same body put to the
same adress by the linker what causes the debugger to get notifictaion
about JIT load/unload events in several case where it isn't really happened.
This change disable ICF for the __jit_debug_register_code symbol to prevent
this behavior with keeping the symbol unique in the object file.
This is the recommit of
5caf652d7bfb43bdd2f3addfe8021a5fb8e3f796 after
fixing the compilation issue on sdk_phone_armv7-sdk (mac) target.
Change-Id: I027d2c7964098d47ed350ee6b7c74d82c88a5d1f
Calin Juravle [Wed, 11 Nov 2015 13:59:20 +0000 (13:59 +0000)]
Merge "Revert "Revert "Run type propagation after inliner only when needed."""
am:
54af9bd45a
* commit '
54af9bd45a482376b5fe8d4ac291afb5bc950065':
Revert "Revert "Run type propagation after inliner only when needed.""
Calin Juravle [Wed, 11 Nov 2015 13:55:39 +0000 (13:55 +0000)]
Merge "Revert "Revert "Run type propagation after inliner only when needed."""
Calin Juravle [Mon, 26 Oct 2015 14:05:01 +0000 (14:05 +0000)]
Revert "Revert "Run type propagation after inliner only when needed.""
This reverts commit
271743601650308c7ac5c7a3ec35025d8130a298.
Change-Id: I173e27a0a4d7d54f90ca459eb48d280d1d40ab70
Roland Levillain [Wed, 11 Nov 2015 12:44:10 +0000 (12:44 +0000)]
Merge "Ignore failures of WeakHashMapTest#test_keySet in libcore tests."
am:
c85f88b4c1
* commit '
c85f88b4c145015401d6849c83d9061bd998861f':
Ignore failures of WeakHashMapTest#test_keySet in libcore tests.
Roland Levillain [Wed, 11 Nov 2015 12:40:26 +0000 (12:40 +0000)]
Merge "Ignore failures of WeakHashMapTest#test_keySet in libcore tests."
Roland Levillain [Wed, 11 Nov 2015 12:16:52 +0000 (12:16 +0000)]
Ignore failures of WeakHashMapTest#test_keySet in libcore tests.
The outcome of this test depends on a weak reference being
collected before a timeout, which sometimes fails. This
test used to pass, but recent changes have made this
non-determinism more frequent. Until we rewrite this
properly (if ever), just ignore these failures.
Bug:
25437292
Change-Id: I1f041f6dfc1318026bce966575477486207f5351
Vladimir Marko [Wed, 11 Nov 2015 11:28:36 +0000 (11:28 +0000)]
Merge "Optimizing/ARM: Improve shifts of long values by a constant."
am:
ea30daef25
* commit '
ea30daef253f4b616ec7c9d4c7e134f33454d19d':
Optimizing/ARM: Improve shifts of long values by a constant.
Vladimir Marko [Wed, 11 Nov 2015 11:27:03 +0000 (11:27 +0000)]
Merge "Optimizing/ARM: Improve shifts of long values by a constant."
Vladimir Marko [Tue, 10 Nov 2015 19:31:26 +0000 (19:31 +0000)]
Optimizing/ARM: Improve shifts of long values by a constant.
Change-Id: Id66ef8cdb9e64306f2be547370b90cc100a3e086
Alex Light [Fri, 9 Oct 2015 22:59:48 +0000 (15:59 -0700)]
Correct exception behavior for default methods
Default methods are defined to throw an IncompatibleClassChangeError
(ICCE) when they are called and there is no "best" implementation.
Previously we would simply throw an ICCE during class loading as soon
as we noticed that this would happen if called. This makes us wait
until we actually attempt to execute the method. Furthermore, this
allows us to use other, non-conflicting, methods on the object as
normal.
Furthermore, this makes us correctly throw AbstractMethodErrors in
cases where all default implementations of a method are overridden by
abstract declarations.
Adds 3 tests for this new behavior.
Bug:
24618811
Change-Id: Id891958a81f9b3862b2ce5919636aabef7d3422e
Mathieu Chartier [Tue, 10 Nov 2015 22:14:40 +0000 (22:14 +0000)]
Merge "Don\'t use fixed addresses in mem map test"
am:
d7c76bd7e8
* commit '
d7c76bd7e867b151ac81ef41810614c7b4cc898e':
Don't use fixed addresses in mem map test
Mathieu Chartier [Tue, 10 Nov 2015 22:09:40 +0000 (22:09 +0000)]
Merge "Don't use fixed addresses in mem map test"
Andreas Gampe [Tue, 10 Nov 2015 21:58:29 +0000 (21:58 +0000)]
Merge "ART: Fix leak in Heap"
am:
5b1157bf01
* commit '
5b1157bf01fa1f9ca3dca57fc874d857d4083aca':
ART: Fix leak in Heap
Mathieu Chartier [Tue, 10 Nov 2015 18:32:52 +0000 (10:32 -0800)]
Don't use fixed addresses in mem map test
We obtain a valid address instead of assuming there won't be a map
there.
These checks used to be OK when we didn't start the runtime.
Change-Id: Ie636ed3773d2c0c62d87e57623ee4ce380c64db0
Andreas Gampe [Tue, 10 Nov 2015 21:55:08 +0000 (21:55 +0000)]
Merge "ART: Fix leak in Heap"
Andreas Gampe [Tue, 10 Nov 2015 21:34:17 +0000 (13:34 -0800)]
ART: Fix leak in Heap
Delete a mutex in the destructor.
Change-Id: I7fb8f3f9e7a30baf352f384f38520eb0dd4906eb
Vladimir Marko [Tue, 10 Nov 2015 20:05:23 +0000 (20:05 +0000)]
Merge "Optimizing: Clean up Equal/NotEqual constant folding for nulls."
am:
972c5a6205
* commit '
972c5a62051ccd4558bc8956262183fe3ec466a4':
Optimizing: Clean up Equal/NotEqual constant folding for nulls.
Vladimir Marko [Tue, 10 Nov 2015 20:04:08 +0000 (20:04 +0000)]
Merge "Optimizing: Clean up Equal/NotEqual constant folding for nulls."
Hiroshi Yamauchi [Tue, 10 Nov 2015 19:58:10 +0000 (19:58 +0000)]
Merge "Rosalloc fast path in assembly for x86_64."
am:
688567c06f
* commit '
688567c06f9da553eb3c766a13a4cd32ca31ddce':
Rosalloc fast path in assembly for x86_64.
Hiroshi Yamauchi [Tue, 10 Nov 2015 19:55:05 +0000 (19:55 +0000)]
Merge "Rosalloc fast path in assembly for x86_64."
Vladimir Marko [Tue, 10 Nov 2015 19:53:01 +0000 (19:53 +0000)]
Optimizing: Clean up Equal/NotEqual constant folding for nulls.
Change-Id: I17766395092ec61df61ef0b9ae4c37fd38164a3b