OSDN Git Service
Vladimir Marko [Thu, 12 Nov 2015 10:21:34 +0000 (10:21 +0000)]
Merge "ART: Add comments to Scoped-/ArenaAllocator." am:
9b71e9c702
am:
919df87b28
* commit '
919df87b286dfc315aa3b767b7b02bdf3e7fdb2b':
ART: Add comments to Scoped-/ArenaAllocator.
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:30:25 +0000 (03:30 +0000)]
Merge "Image space cleanup for app images" am:
11a4c96a7f
am:
1ecfcaef5d
* commit '
1ecfcaef5d274d07e3b23c50888845db4f75ede4':
Image space cleanup for app images
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:58:52 +0000 (02:58 +0000)]
Merge "Get class loader to remember interrupts" am:
2abe1f4a8d
am:
02b624cc1a
* commit '
02b624cc1a104f3acb2ab11274ffad6185095578':
Get class loader to remember interrupts
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
Alex Light [Wed, 11 Nov 2015 23:43:55 +0000 (23:43 +0000)]
Merge "Make test 968\'s name shorter" am:
5165b6ba1f
am:
6b37c06146
* commit '
6b37c06146345cf1461b8ae3c31ef3409c11def7':
Make test 968's name shorter
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:46:24 +0000 (22:46 +0000)]
Merge "Revert "lambda: unit test for lambda expressions at Java Language source level."" am:
63e310c5c3
am:
184d9efb7f
* commit '
184d9efb7fec42d743761bfb15a31e17b0d8bb07':
Revert "lambda: unit test for lambda expressions at Java Language source level."
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:48:30 +0000 (21:48 +0000)]
Merge "Move .debug_line before .debug_info." am:
c4b2410947
am:
e65bb405eb
* commit '
e65bb405ebd99175fa11e4b8d4e319120352d304':
Move .debug_line before .debug_info.
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: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:54:15 +0000 (18:54 +0000)]
Merge "ART: Fix arena allocation for valgrind." am:
00bcbcfdc3
am:
1569c08548
* commit '
1569c08548bf77aaca9d840bf3afdcbc95150d8b':
ART: Fix arena allocation for valgrind.
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:36:40 +0000 (18:36 +0000)]
Merge "lambda: unit test for lambda expressions at Java Language source level." am:
a828aadd6d
am:
7dab4da651
* commit '
7dab4da65114686fd6fe459bcd6aa766af7e8409':
lambda: unit test for lambda expressions at Java Language source level.
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."
Alex Light [Wed, 11 Nov 2015 18:16:59 +0000 (18:16 +0000)]
Merge "Correct exception behavior for default methods" am:
d15cd44c90
am:
201f8dd637
* commit '
201f8dd63730b32b673cf2ce06db2f3653eaee04':
Correct exception behavior for default methods
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
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
Calin Juravle [Wed, 11 Nov 2015 14:03:00 +0000 (14:03 +0000)]
Merge "Revert "Revert "Run type propagation after inliner only when needed.""" am:
54af9bd45a
am:
124fa61cc7
* commit '
124fa61cc7d7843a5cb7c32349f5651da1cfcbd1':
Revert "Revert "Run type propagation after inliner only when needed.""
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:46:37 +0000 (12:46 +0000)]
Merge "Ignore failures of WeakHashMapTest#test_keySet in libcore tests." am:
c85f88b4c1
am:
51dc87eae2
* commit '
51dc87eae2d2db5a19046c2f92cd55e327b9952a':
Ignore failures of WeakHashMapTest#test_keySet in libcore tests.
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:31:00 +0000 (11:31 +0000)]
Merge "Optimizing/ARM: Improve shifts of long values by a constant." am:
ea30daef25
am:
cda9700947
* commit '
cda97009475995d176c3b2b710d6719e9a2e29a2':
Optimizing/ARM: Improve shifts of long values by a constant.
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:18:19 +0000 (22:18 +0000)]
Merge "Don\'t use fixed addresses in mem map test" am:
d7c76bd7e8
am:
cdbd3e188d
* commit '
cdbd3e188d98ba9c909598201c8f6f4fa88f44e1':
Don't use fixed addresses in mem map test
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 22:02:07 +0000 (22:02 +0000)]
Merge "ART: Fix leak in Heap" am:
5b1157bf01
am:
6809e3404a
* commit '
6809e3404a8ec5190f3dfcb1a2a029e87bd40c2a':
ART: Fix leak in Heap
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:07:20 +0000 (20:07 +0000)]
Merge "Optimizing: Clean up Equal/NotEqual constant folding for nulls." am:
972c5a6205
am:
a186f7a94b
* commit '
a186f7a94becd10c4865761e483eba366012529f':
Optimizing: Clean up Equal/NotEqual constant folding for nulls.
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 20:01:35 +0000 (20:01 +0000)]
Merge "Rosalloc fast path in assembly for x86_64." am:
688567c06f
am:
219aea2e11
* commit '
219aea2e11ae61f00924c4f7ef07612599e7f531':
Rosalloc fast path in assembly for x86_64.
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
David Brazdil [Tue, 10 Nov 2015 19:12:19 +0000 (19:12 +0000)]
Merge "ART: Remove unnecessary helper method from GraphChecker" am:
5c7c8248e4
am:
4d83251b12
* commit '
4d83251b129146589d64209147d632d58bfde006':
ART: Remove unnecessary helper method from GraphChecker
David Brazdil [Tue, 10 Nov 2015 19:08:48 +0000 (19:08 +0000)]
Merge "ART: Remove unnecessary helper method from GraphChecker"
am:
5c7c8248e4
* commit '
5c7c8248e48857f3a7c98a02d93c6971834d7241':
ART: Remove unnecessary helper method from GraphChecker
David Brazdil [Tue, 10 Nov 2015 19:04:28 +0000 (19:04 +0000)]
Merge "ART: Remove unnecessary helper method from GraphChecker"
David Brazdil [Tue, 10 Nov 2015 18:49:28 +0000 (18:49 +0000)]
ART: Remove unnecessary helper method from GraphChecker
Change-Id: I59f50a559da560033f4c9407d83b68fc5d64bd3c
Vladimir Marko [Tue, 10 Nov 2015 18:39:47 +0000 (18:39 +0000)]
Merge "Optimizing: Improve constant folding + DCE for inlining." am:
feaf26db63
am:
ca7c25ead8
* commit '
ca7c25ead843dfe9eda9af29e2b153331744c4a6':
Optimizing: Improve constant folding + DCE for inlining.
David Brazdil [Tue, 10 Nov 2015 18:39:40 +0000 (18:39 +0000)]
Merge "ART: Refactor iteration over normal/exceptional successors" am:
9696702985
am:
b2d0b1e079
* commit '
b2d0b1e079f548f50969b1aee571130c067be778':
ART: Refactor iteration over normal/exceptional successors
Vladimir Marko [Tue, 10 Nov 2015 18:36:31 +0000 (18:36 +0000)]
Merge "Optimizing: Improve constant folding + DCE for inlining."
am:
feaf26db63
* commit '
feaf26db63a62bce5a80550f500efa67ff64424f':
Optimizing: Improve constant folding + DCE for inlining.
David Brazdil [Tue, 10 Nov 2015 18:36:22 +0000 (18:36 +0000)]
Merge "ART: Refactor iteration over normal/exceptional successors"
am:
9696702985
* commit '
969670298516b9316b36270fcc4c21bfcd499595':
ART: Refactor iteration over normal/exceptional successors
Vladimir Marko [Tue, 10 Nov 2015 18:31:55 +0000 (18:31 +0000)]
Merge "Optimizing: Improve constant folding + DCE for inlining."
David Brazdil [Tue, 10 Nov 2015 18:30:18 +0000 (18:30 +0000)]
Merge "ART: Refactor iteration over normal/exceptional successors"
David Brazdil [Tue, 10 Nov 2015 11:07:31 +0000 (11:07 +0000)]
ART: Refactor iteration over normal/exceptional successors
Add helper methods on HBasicBlock which return ArrayRef with the
suitable sub-array of the `successors_` list.
Change-Id: I66c83bb56f2984d7550bf77c48110af4087515a8
Vladimir Marko [Tue, 10 Nov 2015 17:14:35 +0000 (17:14 +0000)]
Optimizing: Improve constant folding + DCE for inlining.
Run constant folding before DCE in inliner to eliminate more
code that can prevent inlining. Improve the constant folding
to evaluate Equals and NotEquals for null inputs.
Change-Id: I876ffb903ef39484370b6c8793f0f8467a977362
David Brazdil [Tue, 10 Nov 2015 13:15:05 +0000 (13:15 +0000)]
Merge "ART: Improve comment about inlining into try/catch" am:
8a6463a705
am:
c9ada22900
* commit '
c9ada22900979399d28db5a53854354da8f1b8e5':
ART: Improve comment about inlining into try/catch
David Brazdil [Tue, 10 Nov 2015 13:12:09 +0000 (13:12 +0000)]
Merge "ART: Improve comment about inlining into try/catch"
am:
8a6463a705
* commit '
8a6463a7052ec69e7c0b94a65b26807f570e6359':
ART: Improve comment about inlining into try/catch
David Brazdil [Tue, 10 Nov 2015 13:10:08 +0000 (13:10 +0000)]
Merge "ART: Improve comment about inlining into try/catch"
David Brazdil [Tue, 10 Nov 2015 13:09:11 +0000 (13:09 +0000)]
Merge "ART: Fix critical edge checks in GraphChecker" am:
ee57104951
am:
761f7ca241
* commit '
761f7ca2415c6888b0d38184af13b2a9ddf0e1f9':
ART: Fix critical edge checks in GraphChecker
David Brazdil [Tue, 10 Nov 2015 13:09:03 +0000 (13:09 +0000)]
Merge "Revert "Revert "ART: Update DCE to work with try/catch""" am:
83dcccb96f
am:
a20ff4bd51
* commit '
a20ff4bd5118e75316822c424f53a9572a499f8c':
Revert "Revert "ART: Update DCE to work with try/catch""
David Brazdil [Tue, 10 Nov 2015 13:04:30 +0000 (13:04 +0000)]
ART: Improve comment about inlining into try/catch
Change-Id: I66a4fd3206847c8d5bb57b1678d9d3dc94331294
David Brazdil [Tue, 10 Nov 2015 13:06:14 +0000 (13:06 +0000)]
Merge "ART: Fix critical edge checks in GraphChecker"
am:
ee57104951
* commit '
ee57104951acf3dc5f6343f1d3022e3cd73016f5':
ART: Fix critical edge checks in GraphChecker
David Brazdil [Tue, 10 Nov 2015 13:06:06 +0000 (13:06 +0000)]
Merge "Revert "Revert "ART: Update DCE to work with try/catch"""
am:
83dcccb96f
* commit '
83dcccb96ff8424fb4ab46bcda7c422d59a8c135':
Revert "Revert "ART: Update DCE to work with try/catch""
David Brazdil [Tue, 10 Nov 2015 13:01:50 +0000 (13:01 +0000)]
Merge "ART: Fix critical edge checks in GraphChecker"
David Brazdil [Tue, 10 Nov 2015 13:01:28 +0000 (13:01 +0000)]
Merge "Revert "Revert "ART: Update DCE to work with try/catch"""
David Brazdil [Tue, 10 Nov 2015 10:12:41 +0000 (10:12 +0000)]
ART: Fix critical edge checks in GraphChecker
Previous CL I5a13b8bb74509b48f5d628906f7158af007f99ae fixed logic for
splitting critical edges. The same logic is used in GraphChecker when
testing critical edges weren't introduced by a pass. This patch updates
it too.
Bug:
25493695
Bug:
25454012
Change-Id: I56226c82324ee55ae2fbe7262608dd2868d930f1
David Brazdil [Tue, 10 Nov 2015 09:50:23 +0000 (09:50 +0000)]
Merge "ART: Add clarifying comment" am:
1963759e84
am:
b2318ed3ee
* commit '
b2318ed3ee45a756d8c211de3b5275bf1ba24ca2':
ART: Add clarifying comment
David Brazdil [Tue, 10 Nov 2015 09:48:17 +0000 (09:48 +0000)]
Merge "ART: Add clarifying comment"
am:
1963759e84
* commit '
1963759e84664b51b617b00e15728f439895033b':
ART: Add clarifying comment
David Brazdil [Tue, 10 Nov 2015 09:46:41 +0000 (09:46 +0000)]
Merge "ART: Add clarifying comment"
David Brazdil [Tue, 10 Nov 2015 09:43:28 +0000 (09:43 +0000)]
ART: Add clarifying comment
Change-Id: I189ec4cae0aa1a5245a79e86d1ec0592e38eac4a
David Brazdil [Mon, 2 Nov 2015 20:24:55 +0000 (20:24 +0000)]
Revert "Revert "ART: Update DCE to work with try/catch""
The previous CL failed because it did not update inputs of catch phis.
Since phi input indices cannot be easily mapped back to throwing
instructions, this new implementation at least removes catch phi uses
of values defined in the removed blocks to preserve graph consistency.
This reverts commit
fb552d7061746f7a90fdd5002696e255e2e15c35.
Change-Id: I63d95915d1ef50e71d3bcf0cd10aaded554035b4
Mathieu Chartier [Tue, 10 Nov 2015 03:09:42 +0000 (03:09 +0000)]
Merge "Delete flaky DCHECK" am:
1b87033ed8
am:
9a9a25bca4
* commit '
9a9a25bca4bcba80f2c8311ca62c7038f88b5c9b':
Delete flaky DCHECK
Mathieu Chartier [Tue, 10 Nov 2015 03:06:40 +0000 (03:06 +0000)]
Merge "Delete flaky DCHECK"
am:
1b87033ed8
* commit '
1b87033ed83ba03983b49237da89ce36d319b68e':
Delete flaky DCHECK
Mathieu Chartier [Tue, 10 Nov 2015 03:02:58 +0000 (03:02 +0000)]
Merge "Delete flaky DCHECK"
Mathieu Chartier [Tue, 10 Nov 2015 03:01:00 +0000 (19:01 -0800)]
Delete flaky DCHECK
Fixes mips build
Change-Id: I738b41f09f3c926f21640e358cf0bd5557167b0e
Mathieu Chartier [Tue, 10 Nov 2015 02:56:53 +0000 (02:56 +0000)]
Mathieu Chartier [Tue, 10 Nov 2015 02:54:25 +0000 (02:54 +0000)]
Merge "Fix mac build"
am:
a5c3e44663
* commit '
a5c3e44663c3b9c97fe350b4191cec079738fca3':
Fix mac build
Mathieu Chartier [Tue, 10 Nov 2015 02:51:37 +0000 (02:51 +0000)]
Merge "Fix mac build"
Mathieu Chartier [Tue, 10 Nov 2015 02:50:49 +0000 (18:50 -0800)]
Fix mac build
Change-Id: I22bf169f15483e54b97d77ff0887cd1fde428af9
Mathieu Chartier [Tue, 10 Nov 2015 02:35:09 +0000 (02:35 +0000)]
Merge "Add low_4gb support to MapFile and MapFileAtAddress" am:
ff12923229
am:
9aa8913485
* commit '
9aa8913485499b9c736addefe288ba5bd884d368':
Add low_4gb support to MapFile and MapFileAtAddress
OSDN Git Service
