OSDN Git Service
Andreas Gampe [Thu, 18 Dec 2014 21:50:12 +0000 (21:50 +0000)]
am
a1c6288c: am
55b752a8: Merge "ART: Punt to the interpreter for VerifiedMethod errors"
* commit '
a1c6288cbffdc4564b39cfea91f5e172f7b141a1':
ART: Punt to the interpreter for VerifiedMethod errors
Sebastien Hertz [Thu, 18 Dec 2014 07:08:57 +0000 (07:08 +0000)]
am
48713ecd: am
15ff1a86: Merge "JDWP: fix setting multiple breakpoints in the same method" into lmp-mr1-dev
* commit '
48713ecd519b1c0ba9009eb50e87e04428922b8a':
JDWP: fix setting multiple breakpoints in the same method
Sebastien Hertz [Thu, 18 Dec 2014 07:03:29 +0000 (07:03 +0000)]
am
15ff1a86: Merge "JDWP: fix setting multiple breakpoints in the same method" into lmp-mr1-dev
* commit '
15ff1a8642fbbe3fb29273f35005ccc7524bb942':
JDWP: fix setting multiple breakpoints in the same method
Sebastien Hertz [Thu, 18 Dec 2014 06:57:03 +0000 (06:57 +0000)]
Merge "JDWP: fix setting multiple breakpoints in the same method" into lmp-mr1-dev
Andreas Gampe [Thu, 18 Dec 2014 03:02:28 +0000 (03:02 +0000)]
am
55b752a8: Merge "ART: Punt to the interpreter for VerifiedMethod errors"
* commit '
55b752a817a08be46b167e07d7fee3d20a8e6a9c':
ART: Punt to the interpreter for VerifiedMethod errors
Andreas Gampe [Thu, 18 Dec 2014 03:00:32 +0000 (03:00 +0000)]
am
bc2a8456: (-s ours) am
f535c69f: ART: Punt to the interpreter for VerifiedMethod errors
* commit '
bc2a8456af6a7072292436ea76ba8d165c2bffc4':
ART: Punt to the interpreter for VerifiedMethod errors
Andreas Gampe [Thu, 18 Dec 2014 02:57:43 +0000 (02:57 +0000)]
Merge "ART: Punt to the interpreter for VerifiedMethod errors"
Andreas Gampe [Wed, 17 Dec 2014 22:35:46 +0000 (14:35 -0800)]
ART: Punt to the interpreter for VerifiedMethod errors
In case that the GC map can't be created (because of size restrictions),
do not fail the class. Instead punt to the interpreter.
Bug:
17791183
(cherry picked from commit
f535c69f115c61ffadca1bd2706244d0aa30f9aa)
Change-Id: I348bb306dbfc85c235fa93c0c527fba6627551fe
Andreas Gampe [Thu, 18 Dec 2014 02:47:25 +0000 (02:47 +0000)]
am
f535c69f: ART: Punt to the interpreter for VerifiedMethod errors
* commit '
f535c69f115c61ffadca1bd2706244d0aa30f9aa':
ART: Punt to the interpreter for VerifiedMethod errors
Mathieu Chartier [Thu, 18 Dec 2014 00:28:36 +0000 (00:28 +0000)]
am
0e079d93: am
a6f5fd0e: Merge "Add thread suspend histogram"
* commit '
0e079d93333fe116ec8a1887eaf01805ab428b57':
Add thread suspend histogram
Andreas Gampe [Wed, 17 Dec 2014 22:35:46 +0000 (14:35 -0800)]
ART: Punt to the interpreter for VerifiedMethod errors
In case that the GC map can't be created (because of size restrictions),
do not fail the class. Instead punt to the interpreter.
Bug:
17791183
Change-Id: I348bb306dbfc85c235fa93c0c527fba6627551fe
Mathieu Chartier [Thu, 18 Dec 2014 00:22:14 +0000 (00:22 +0000)]
am
a6f5fd0e: Merge "Add thread suspend histogram"
* commit '
a6f5fd0e0cbe8873c802c34569dc02a4fe31b519':
Add thread suspend histogram
Mathieu Chartier [Thu, 18 Dec 2014 00:17:22 +0000 (00:17 +0000)]
Merge "Add thread suspend histogram"
Mathieu Chartier [Wed, 17 Dec 2014 22:56:47 +0000 (14:56 -0800)]
Add thread suspend histogram
Helps measure time to suspend.
Example output (maps after a few seconds):
suspend all histogram: Sum: 2.806ms 99% C.I. 2us-1090.560us Avg: 43.843us Max: 1126us
Change-Id: I7bd9dd3b401fb3e3059e8718556d60910e541611
Igor Murashkin [Wed, 17 Dec 2014 22:13:56 +0000 (22:13 +0000)]
am
452e6a0a: am
e9231c0a: Merge "Add a new imgdiag tool to diff boot.art/core.art against a process"
* commit '
452e6a0a86d76a24dd860267de63a7e386a9ae19':
Add a new imgdiag tool to diff boot.art/core.art against a process
Igor Murashkin [Wed, 17 Dec 2014 22:08:40 +0000 (22:08 +0000)]
am
e9231c0a: Merge "Add a new imgdiag tool to diff boot.art/core.art against a process"
* commit '
e9231c0aecc013c61b6cf7f88a228204651d4d41':
Add a new imgdiag tool to diff boot.art/core.art against a process
Igor Murashkin [Wed, 17 Dec 2014 22:04:19 +0000 (22:04 +0000)]
Merge "Add a new imgdiag tool to diff boot.art/core.art against a process"
Sebastien Hertz [Wed, 17 Dec 2014 15:35:50 +0000 (16:35 +0100)]
JDWP: fix setting multiple breakpoints in the same method
When setting multiple breakpoints in the same method, we were
incorrectly setting the deoptimization kind of all the breakpoints
set after a first breakpoint. This resulted in incorrect
deoptimization/undeoptimization and even an abort. This was caught
by running the debugger with sanity checks enabled with libartd.so.
We now set next breakpoints with the deoptimization kind of the first
existing breakpoint (if any) so we trigger right [un]deoptimization
when adding or removing a breakpoint.
Bug:
18782753
Bug:
18651686
(cherry picked from commit
abe93e0098a2648fa286cfea01954737e32c7be9)
Change-Id: I95424e361dc04df0adb54b5afac5b4da2b8b2731
Mathieu Chartier [Wed, 17 Dec 2014 19:47:38 +0000 (19:47 +0000)]
am
9646450d: am
d457b9ce: Merge "Add systrace events to monitors and thread suspension"
* commit '
9646450d0e33e6c77b4a48f00a2fd4f66cadea16':
Add systrace events to monitors and thread suspension
Sebastien Hertz [Wed, 17 Dec 2014 19:42:27 +0000 (19:42 +0000)]
am
532101ce: am
28d6b6c0: Merge "JDWP: fix setting multiple breakpoints in the same method"
* commit '
532101ce26009d4d3bdbae47dd829e72b3673e52':
JDWP: fix setting multiple breakpoints in the same method
Nicolas Geoffray [Wed, 17 Dec 2014 19:42:02 +0000 (19:42 +0000)]
am
82d0df8e: am
7587082c: Merge "Now that GraphChecker has a state, don\'t re-use it."
* commit '
82d0df8e43b8e0796466596ead89fcc435b0f769':
Now that GraphChecker has a state, don't re-use it.
Nicolas Geoffray [Wed, 17 Dec 2014 19:41:59 +0000 (19:41 +0000)]
am
d158a108: am
8012102d: Merge "Fix ids and remove invoke when inlining."
* commit '
d158a1083f329d70f1be45648cc71604a9a4b5f5':
Fix ids and remove invoke when inlining.
David Brazdil [Wed, 17 Dec 2014 19:41:58 +0000 (19:41 +0000)]
am
0b0d2748: am
44a7f89c: Merge "ART: Added Checker, a pattern matching test engine"
* commit '
0b0d274853371a11b61ea2dc7908dfdc78c0d387':
ART: Added Checker, a pattern matching test engine
Nicolas Geoffray [Wed, 17 Dec 2014 19:41:56 +0000 (19:41 +0000)]
am
a62ae509: am
c8a0a055: Merge "Test sometimes timeouts with vogar."
* commit '
a62ae5091743cab7242b4cb97a511ef6527abc23':
Test sometimes timeouts with vogar.
Nicolas Geoffray [Wed, 17 Dec 2014 19:41:49 +0000 (19:41 +0000)]
am
23c2ba19: am
3fea27b5: Merge "Revert "Small optimization for recursive calls: avoid dex cache.""
* commit '
23c2ba1975c768485a008028d03f87d8465e382a':
Revert "Small optimization for recursive calls: avoid dex cache."
Nicolas Geoffray [Wed, 17 Dec 2014 19:41:48 +0000 (19:41 +0000)]
am
709bb6fa: am
4acdae34: Merge "Small optimization for recursive calls: avoid dex cache."
* commit '
709bb6fac23ab804129f2bd0e40a3750b3a39784':
Small optimization for recursive calls: avoid dex cache.
Mathieu Chartier [Wed, 17 Dec 2014 19:41:00 +0000 (19:41 +0000)]
am
d457b9ce: Merge "Add systrace events to monitors and thread suspension"
* commit '
d457b9cebceecc9d54fb569ea76509341153bf5c':
Add systrace events to monitors and thread suspension
Mathieu Chartier [Wed, 17 Dec 2014 19:13:39 +0000 (19:13 +0000)]
Merge "Add systrace events to monitors and thread suspension"
Mathieu Chartier [Wed, 17 Dec 2014 18:13:30 +0000 (10:13 -0800)]
Add systrace events to monitors and thread suspension
Added systrace events to SuspendThreadByPeer, SuspendThreadByThreadId
and monitor contention.
Bug:
18379850
Bug:
17470248
Change-Id: I29eaf97c67361a6c6b437940b8729600d78696df
Sebastien Hertz [Wed, 17 Dec 2014 19:04:58 +0000 (19:04 +0000)]
am
28d6b6c0: Merge "JDWP: fix setting multiple breakpoints in the same method"
* commit '
28d6b6c06fdb6c3dc30beb7883fa64f2b693d9ab':
JDWP: fix setting multiple breakpoints in the same method
Sebastien Hertz [Wed, 17 Dec 2014 18:59:44 +0000 (18:59 +0000)]
Merge "JDWP: fix setting multiple breakpoints in the same method"
Nicolas Geoffray [Wed, 17 Dec 2014 17:17:35 +0000 (17:17 +0000)]
am
7587082c: Merge "Now that GraphChecker has a state, don\'t re-use it."
* commit '
7587082c370ef1a90797baf2371ee8e472b2adb8':
Now that GraphChecker has a state, don't re-use it.
Nicolas Geoffray [Wed, 17 Dec 2014 17:13:35 +0000 (17:13 +0000)]
Merge "Now that GraphChecker has a state, don't re-use it."
Nicolas Geoffray [Wed, 17 Dec 2014 17:10:47 +0000 (17:10 +0000)]
Now that GraphChecker has a state, don't re-use it.
Otherwise, we'll see the same ids twice.
Change-Id: Ic9bb801629ff90cc788248528d5260aaaff73675
Sebastien Hertz [Wed, 17 Dec 2014 15:35:50 +0000 (16:35 +0100)]
JDWP: fix setting multiple breakpoints in the same method
When setting multiple breakpoints in the same method, we were
incorrectly setting the deoptimization kind of all the breakpoints
set after a first breakpoint. This resulted in incorrect
deoptimization/undeoptimization and even an abort. This was caught
by running the debugger with sanity checks enabled with libartd.so.
We now set next breakpoints with the deoptimization kind of the first
existing breakpoint (if any) so we trigger right [un]deoptimization
when adding or removing a breakpoint.
Bug:
18782753
Bug:
18651686
Change-Id: Idf36ede73302fba83a154052bef701bedc8bc726
Nicolas Geoffray [Wed, 17 Dec 2014 16:24:03 +0000 (16:24 +0000)]
am
8012102d: Merge "Fix ids and remove invoke when inlining."
* commit '
8012102dea15e62fce94f6ac32e301aa0cb3f52d':
Fix ids and remove invoke when inlining.
Nicolas Geoffray [Wed, 17 Dec 2014 16:18:23 +0000 (16:18 +0000)]
Merge "Fix ids and remove invoke when inlining."
David Brazdil [Wed, 17 Dec 2014 16:11:33 +0000 (16:11 +0000)]
am
44a7f89c: Merge "ART: Added Checker, a pattern matching test engine"
* commit '
44a7f89cff6c93f5a900a02e9fa92613ea2f3f8e':
ART: Added Checker, a pattern matching test engine
David Brazdil [Wed, 17 Dec 2014 16:05:08 +0000 (16:05 +0000)]
Merge "ART: Added Checker, a pattern matching test engine"
David Brazdil [Mon, 1 Dec 2014 17:04:16 +0000 (17:04 +0000)]
ART: Added Checker, a pattern matching test engine
This patch adds a Python script which implements a domain-specific
mini-language similar to that of LLVM's FileCheck. It is primarily
intended for writing tests for the optimizing compiler but could be
configured for other use cases too. It is implemented from scratch in
order to avoid dependency on LLVM.
Checker tests are written in Java and dex2oat is invoked with a flag
which dumps the CFG before and after each pass of the optimizing
compiler. The output is then compared against assertions in the
test's comments parsed by Checker. See comments in tools/checker.py
for more details about the currently supported language features.
This initial CL implements only one type of assertion - whether the
output contains lines matching a desired pattern in the given order -
but supports both plain text and regex matching and allows for
equivalency testing by matching for the outcome of a previous match.
See the tests in compiler/optimizing/test/ConstantFolding.java for
examples.
Change-Id: I1ad7431b399c38dc0391ccee74d2c643ba0b0675
Nicolas Geoffray [Wed, 17 Dec 2014 15:39:18 +0000 (15:39 +0000)]
am
c8a0a055: Merge "Test sometimes timeouts with vogar."
* commit '
c8a0a055b65a73004a1cd5dfe5beb20eab6307e4':
Test sometimes timeouts with vogar.
Nicolas Geoffray [Wed, 17 Dec 2014 15:33:21 +0000 (15:33 +0000)]
Merge "Test sometimes timeouts with vogar."
Nicolas Geoffray [Wed, 17 Dec 2014 15:27:14 +0000 (15:27 +0000)]
Test sometimes timeouts with vogar.
Change-Id: I9091a2a86c82173fa45ff9e3d1770d3891375546
Nicolas Geoffray [Wed, 17 Dec 2014 10:13:46 +0000 (10:13 +0000)]
Fix ids and remove invoke when inlining.
Bugs found by Razvan Lupusoru.
Change-Id: I3a5a9af280d8700d18f52abb4a2cff0e3a9aac74
Nicolas Geoffray [Wed, 17 Dec 2014 12:29:58 +0000 (12:29 +0000)]
am
3fea27b5: Merge "Revert "Small optimization for recursive calls: avoid dex cache.""
* commit '
3fea27b5f956a08b5b01f873b807fac98a5cc1f6':
Revert "Small optimization for recursive calls: avoid dex cache."
Nicolas Geoffray [Wed, 17 Dec 2014 12:25:25 +0000 (12:25 +0000)]
Merge "Revert "Small optimization for recursive calls: avoid dex cache.""
Nicolas Geoffray [Wed, 17 Dec 2014 12:25:12 +0000 (12:25 +0000)]
Revert "Small optimization for recursive calls: avoid dex cache."
Fails on target.
This reverts commit
390f59f9bec64fd81b05e796dfaeb03ab6d4cc81.
Change-Id: Ic3865b8897068ba20df0fbc2bcf561faf6c290c1
Nicolas Geoffray [Wed, 17 Dec 2014 11:58:23 +0000 (11:58 +0000)]
am
4acdae34: Merge "Small optimization for recursive calls: avoid dex cache."
* commit '
4acdae34d7529dcd757cc62ef18b75021dbc2cb0':
Small optimization for recursive calls: avoid dex cache.
Nicolas Geoffray [Wed, 17 Dec 2014 11:55:20 +0000 (11:55 +0000)]
Merge "Small optimization for recursive calls: avoid dex cache."
Nicolas Geoffray [Fri, 12 Dec 2014 19:22:03 +0000 (19:22 +0000)]
Small optimization for recursive calls: avoid dex cache.
Change-Id: Ic4054b6c38f0a2a530ba6ef747647f86cee0b1b8
Andreas Gampe [Wed, 17 Dec 2014 04:30:18 +0000 (04:30 +0000)]
am
38ad3f8b: am
240016da: Merge "Fix typo bug for Mips32."
* commit '
38ad3f8b5eb595d3100dcde86717d80711d7e549':
Fix typo bug for Mips32.
Andreas Gampe [Wed, 17 Dec 2014 04:25:57 +0000 (04:25 +0000)]
am
240016da: Merge "Fix typo bug for Mips32."
* commit '
240016da1d6615b26c8342bdeb4bae381570ac47':
Fix typo bug for Mips32.
Andreas Gampe [Wed, 17 Dec 2014 04:18:28 +0000 (04:18 +0000)]
Merge "Fix typo bug for Mips32."
Douglas Leung [Wed, 17 Dec 2014 04:15:41 +0000 (20:15 -0800)]
Fix typo bug for Mips32.
Change-Id: I429038ee6748d538fa03da819777f3456a4fd9a5
Mathieu Chartier [Wed, 17 Dec 2014 00:10:27 +0000 (00:10 +0000)]
am
a403be16: am
3e2f0fc5: Merge "Delete gc request lock"
* commit '
a403be16c10584d111194fb22c30af1d96ad39b0':
Delete gc request lock
Mathieu Chartier [Wed, 17 Dec 2014 00:05:19 +0000 (00:05 +0000)]
am
3e2f0fc5: Merge "Delete gc request lock"
* commit '
3e2f0fc584463e9da1142a5011ac3f7bcf083e0f':
Delete gc request lock
Mathieu Chartier [Wed, 17 Dec 2014 00:00:56 +0000 (00:00 +0000)]
Merge "Delete gc request lock"
Mathieu Chartier [Tue, 16 Dec 2014 23:23:00 +0000 (15:23 -0800)]
Delete gc request lock
Fixes valgrind tests.
Change-Id: I763e5709fffb002b14615ed5d08236970643e520
Ying Wang [Tue, 16 Dec 2014 21:52:09 +0000 (21:52 +0000)]
am
bdb91f43: am
d76a0c79: Merge "Revert "Fix VM-less builds.""
* commit '
bdb91f4339a465f6ce89473866938062282ea0a3':
Revert "Fix VM-less builds."
Ying Wang [Tue, 16 Dec 2014 21:45:30 +0000 (21:45 +0000)]
am
d76a0c79: Merge "Revert "Fix VM-less builds.""
* commit '
d76a0c791b8b7411e7ce7b2046f6af1e3d7bb00a':
Revert "Fix VM-less builds."
Ying Wang [Tue, 16 Dec 2014 21:38:48 +0000 (21:38 +0000)]
Merge "Revert "Fix VM-less builds.""
Brian Carlstrom [Tue, 16 Dec 2014 20:35:24 +0000 (20:35 +0000)]
am
f09d5147: am
03c45ccf: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '
f09d5147216654355c5b0fc674edc0651ab8889c':
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Nicolas Geoffray [Tue, 16 Dec 2014 20:35:10 +0000 (20:35 +0000)]
am
7763eed4: am
beb0a4e8: Merge "Fix crash in x86 disassembler."
* commit '
7763eed4afb9818df3a8a0a5b0cff8c1fccc05cf':
Fix crash in x86 disassembler.
Andreas Gampe [Tue, 16 Dec 2014 20:34:59 +0000 (20:34 +0000)]
am
9a517024: am
08c7ac66: Merge "[MIPSR6] Adjust assembly routines for MIPS R6 isa"
* commit '
9a517024f0c9802a18448dca386261a84c339043':
[MIPSR6] Adjust assembly routines for MIPS R6 isa
Mathieu Chartier [Tue, 16 Dec 2014 20:34:43 +0000 (20:34 +0000)]
am
604406b2: am
f610c059: Merge "Don\'t add or remove verifiers if aborting"
* commit '
604406b2b88d40150cdc1d6e956ae47125d980c0':
Don't add or remove verifiers if aborting
Mathieu Chartier [Tue, 16 Dec 2014 20:33:47 +0000 (20:33 +0000)]
am
2a2ad56d: am
50d55c65: Merge "Add more logging to Mutex::ExclusiveUnlock"
* commit '
2a2ad56dc68eea88e7ca1b9594449463cecf57d2':
Add more logging to Mutex::ExclusiveUnlock
Mathieu Chartier [Tue, 16 Dec 2014 20:33:46 +0000 (20:33 +0000)]
am
34de72bc: am
5b6912e4: Merge "Decrement suspend count if thread is shutting down"
* commit '
34de72bcab406d52d417ab49ff1e57132c1d0f25':
Decrement suspend count if thread is shutting down
Mathieu Chartier [Tue, 16 Dec 2014 20:33:36 +0000 (20:33 +0000)]
am
a3c1cacd: am
5dd24d89: Merge "Move GC daemon locking logic into heap"
* commit '
a3c1cacd379a2d0a2b9793c575bb64e1ad782b94':
Move GC daemon locking logic into heap
Igor Murashkin [Thu, 13 Nov 2014 22:38:00 +0000 (14:38 -0800)]
Add a new imgdiag tool to diff boot.art/core.art against a process
Analyze the dirty memory pages of a running process per-object,
this allows is to to fine-tune the dirty object binning algorithm in
image writer.
Also:
* Factor out oatdump command line parsing code into cmdline.h
* Factor out common build rules for building variations of binaries
* Add a gtest for imgdiag
Bug:
17611661
Change-Id: I3ac852a0d223af66f6d59ae5dbc3df101475e3d0
Brian Carlstrom [Tue, 16 Dec 2014 19:01:09 +0000 (19:01 +0000)]
am
03c45ccf: Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
* commit '
03c45ccf104fade857cb01a2b760b08fad5e304a':
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Brian Carlstrom [Tue, 16 Dec 2014 18:53:36 +0000 (18:53 +0000)]
Merge "Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA"
Nicolas Geoffray [Tue, 16 Dec 2014 18:09:26 +0000 (18:09 +0000)]
am
beb0a4e8: Merge "Fix crash in x86 disassembler."
* commit '
beb0a4e897a40201202436af290f77db036760a4':
Fix crash in x86 disassembler.
Nicolas Geoffray [Tue, 16 Dec 2014 18:04:15 +0000 (18:04 +0000)]
Merge "Fix crash in x86 disassembler."
Andreas Gampe [Tue, 16 Dec 2014 16:58:31 +0000 (16:58 +0000)]
am
08c7ac66: Merge "[MIPSR6] Adjust assembly routines for MIPS R6 isa"
* commit '
08c7ac664bdf9f471b54e3894a6d16d08d5e5c7c':
[MIPSR6] Adjust assembly routines for MIPS R6 isa
Andreas Gampe [Tue, 16 Dec 2014 16:53:04 +0000 (16:53 +0000)]
Merge "[MIPSR6] Adjust assembly routines for MIPS R6 isa"
Duane Sand [Tue, 4 Nov 2014 19:09:36 +0000 (11:09 -0800)]
[MIPSR6] Adjust assembly routines for MIPS R6 isa
Change-Id: I771b58b9e8054bb99cd01a7f713ff8e29a9ae5d3
Brian Carlstrom [Tue, 16 Dec 2014 06:10:04 +0000 (22:10 -0800)]
Remove obsolete PRODUCT_DEX_PREOPT_.*_IN_DATA
Bug:
18673991
Change-Id: I8be2f997005611b791755c8d7fa44974f1816d6b
Nicolas Geoffray [Tue, 16 Dec 2014 14:54:18 +0000 (14:54 +0000)]
Fix crash in x86 disassembler.
Probably a typo from last refactoring.
Change-Id: I086a87120ca0f0dfddbe803573b0e0f79cc6d945
Mathieu Chartier [Tue, 16 Dec 2014 03:37:43 +0000 (03:37 +0000)]
am
f610c059: Merge "Don\'t add or remove verifiers if aborting"
* commit '
f610c0597e001cb1043aa4074afe25ae79a800e3':
Don't add or remove verifiers if aborting
Mathieu Chartier [Tue, 16 Dec 2014 03:32:17 +0000 (03:32 +0000)]
Merge "Don't add or remove verifiers if aborting"
Mathieu Chartier [Tue, 16 Dec 2014 03:26:29 +0000 (19:26 -0800)]
Don't add or remove verifiers if aborting
Prevents deadlock if marking verifier roots fails when we attempt to
dump the stack traces. The deadlock occurs from FindLocksAtDexPC
since this allocates a new verifier then adds / removes it from the
method_verifiers_ array.
Bug:
18651054
Change-Id: Ia9b9470ce5e4ac20bfbb39bef0283974cf487765
Mathieu Chartier [Tue, 16 Dec 2014 01:39:23 +0000 (01:39 +0000)]
am
50d55c65: Merge "Add more logging to Mutex::ExclusiveUnlock"
* commit '
50d55c65f3096bccbccddef3aa734ee15647cbe5':
Add more logging to Mutex::ExclusiveUnlock
Mathieu Chartier [Tue, 16 Dec 2014 01:33:07 +0000 (01:33 +0000)]
Merge "Add more logging to Mutex::ExclusiveUnlock"
Mathieu Chartier [Tue, 16 Dec 2014 01:23:45 +0000 (17:23 -0800)]
Add more logging to Mutex::ExclusiveUnlock
Bug:
18713034
Change-Id: I9db5ca0a25592714ac9e292a2b8d46ef73779c8b
Mathieu Chartier [Tue, 16 Dec 2014 01:25:39 +0000 (01:25 +0000)]
am
5b6912e4: Merge "Decrement suspend count if thread is shutting down"
* commit '
5b6912e455da798a79a4bb3235e276351b38ab58':
Decrement suspend count if thread is shutting down
Mathieu Chartier [Tue, 16 Dec 2014 01:17:42 +0000 (01:17 +0000)]
Merge "Decrement suspend count if thread is shutting down"
Mathieu Chartier [Mon, 15 Dec 2014 23:59:49 +0000 (15:59 -0800)]
Decrement suspend count if thread is shutting down
Prevents deadlock caused by incrementing suspend count in
SuspendThreadByPeer, then getting a cleared nativePeer field. This
resulted in us not decrementing the suspend count which caused a
deadlock in WaitForOtherNonDaemonThreadsToExit.
Bug:
18739541
Change-Id: I4a63f1823993a0f99f32025cd479072be49ba8d5
Mathieu Chartier [Mon, 15 Dec 2014 23:51:44 +0000 (23:51 +0000)]
am
5dd24d89: Merge "Move GC daemon locking logic into heap"
* commit '
5dd24d89714aeca69a3a06561d5a3687d54cf43b':
Move GC daemon locking logic into heap
Mathieu Chartier [Mon, 15 Dec 2014 23:46:59 +0000 (23:46 +0000)]
Merge "Move GC daemon locking logic into heap"
Mathieu Chartier [Mon, 15 Dec 2014 22:23:10 +0000 (14:23 -0800)]
Move GC daemon locking logic into heap
Fixes deadlock caused by acquirng the mutator lock while
synchronizing on the daemon thread.
Bug:
18739541
Change-Id: I925b8f0f3b58178da6eff17b9c073f655c39597b
Nicolas Geoffray [Mon, 15 Dec 2014 23:07:32 +0000 (23:07 +0000)]
am
03f5e1a0: am
f7f687bb: Merge "Inlining support in optimizing."
* commit '
03f5e1a0c6330e3e77dcf215fe1bbb3bf4f5eced':
Inlining support in optimizing.
Nicolas Geoffray [Mon, 15 Dec 2014 23:02:03 +0000 (23:02 +0000)]
am
f7f687bb: Merge "Inlining support in optimizing."
* commit '
f7f687bbb14aa7493bbe44d62a9de6fc17dbe542':
Inlining support in optimizing.
Nicolas Geoffray [Mon, 15 Dec 2014 22:59:03 +0000 (22:59 +0000)]
Merge "Inlining support in optimizing."
Nicolas Geoffray [Mon, 1 Dec 2014 10:31:54 +0000 (10:31 +0000)]
Inlining support in optimizing.
Currently only inlines simple things that don't require an
environment, such as:
- Returning a constant.
- Returning a parameter.
- Returning an arithmetic operation.
Change-Id: Ie844950cb44f69e104774a3cf7a8dea66bc85661
Mathieu Chartier [Mon, 15 Dec 2014 21:48:47 +0000 (21:48 +0000)]
am
c5421bcc: am
81d03521: Merge "Clean up debugger"
* commit '
c5421bcc47374312835094d0ee6d94f42ccdf36b':
Clean up debugger
Mathieu Chartier [Mon, 15 Dec 2014 21:32:49 +0000 (21:32 +0000)]
am
81d03521: Merge "Clean up debugger"
* commit '
81d035213b0426ee076cc0d017c895c7833d32e8':
Clean up debugger
Mathieu Chartier [Mon, 15 Dec 2014 19:56:57 +0000 (19:56 +0000)]
Merge "Clean up debugger"
Mathieu Chartier [Mon, 15 Dec 2014 01:01:31 +0000 (17:01 -0800)]
Clean up debugger
Separated logic for native vs java heap, cleaned up lock annotations.
Added missing end of space marker for bump pointer spaces.
Bug:
18730149
Change-Id: I5bc21f0cee83b9cfa357e8a59658885c12cae09c
Andreas Gampe [Mon, 15 Dec 2014 19:27:17 +0000 (19:27 +0000)]
am
e4a1f5fd: am
e6c0cdd1: Merge "ART: Do not inline elf writer debug symbols"
* commit '
e4a1f5fdf596d8ff9e04e99d95879125fd4b0533':
ART: Do not inline elf writer debug symbols
Mathieu Chartier [Mon, 15 Dec 2014 19:27:16 +0000 (19:27 +0000)]
am
02e34ded: am
29045735: Merge "Use WaitHoldingLocks in ReferenceProcessor::MakeCircularListIfUnenqueued."
* commit '
02e34ded64af4fb8104697444153ae2269a574b9':
Use WaitHoldingLocks in ReferenceProcessor::MakeCircularListIfUnenqueued.