git.osdn.net Git - android-x86/art.git/log

Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am: 765dee21f3 am: 6449dd7204
am: d2b8a63544

Change-Id: Id3b329a83518a7eb49abf493e125b8f8df5a469d

Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am: 765dee21f3
am: 6449dd7204

Change-Id: I25418a101bbb4fd15a03bbf8e27d08bc63da7e68

Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
am: 765dee21f3

Change-Id: I41b548c0ca1b1f1b412aafadf6dc5d9006d645da

commit | commitdiff | tree

Treehugger Robot [Thu, 6 Oct 2016 01:12:23 +0000 (01:12 +0000)]

Merge "Revert "Revert "Add dex file writer to dexlayout tool."""

commit | commitdiff | tree

Igor Murashkin [Wed, 5 Oct 2016 23:52:03 +0000 (23:52 +0000)]

Merge "jni: Test that pushed handle scopes are popped after JNI transitions" am: 30267ea042 am: 15912e9d0c
am: b64c845769

Change-Id: If585680391d517df8696a55eccb9af499cf77a0d

commit | commitdiff | tree

Igor Murashkin [Wed, 5 Oct 2016 23:49:02 +0000 (23:49 +0000)]

Merge "jni: Test that pushed handle scopes are popped after JNI transitions" am: 30267ea042
am: 15912e9d0c

Change-Id: Ib692e0f5b962cb3a14d1c6a0625288e84ef74510

commit | commitdiff | tree

Igor Murashkin [Wed, 5 Oct 2016 23:46:32 +0000 (23:46 +0000)]

Merge "jni: Test that pushed handle scopes are popped after JNI transitions"
am: 30267ea042

Change-Id: Ic422b92661e7fe4fee9e9c13ae450850c0744548

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 23:43:33 +0000 (23:43 +0000)]

Merge "Change java_lang_reflect_Field.cc to use ObjPtr" am: 6206a5d523 am: d3b604f0c3
am: be06f641f6

Change-Id: I28172097d0ea78d86fa6ca9dc08fa9ad8830a94b

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 23:41:27 +0000 (23:41 +0000)]

Merge "jni: Test that pushed handle scopes are popped after JNI transitions"

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 23:41:02 +0000 (23:41 +0000)]

Merge "Change java_lang_reflect_Field.cc to use ObjPtr" am: 6206a5d523
am: d3b604f0c3

Change-Id: I643c6d38e2bf245cb0a6774db985e6ef334d20fc

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 23:38:01 +0000 (23:38 +0000)]

Merge "Change java_lang_reflect_Field.cc to use ObjPtr"
am: 6206a5d523

Change-Id: I83eac899d4bb2d8230312fdb073fc1779db82265

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 23:32:05 +0000 (23:32 +0000)]

Merge "Change java_lang_reflect_Field.cc to use ObjPtr"

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 20:48:41 +0000 (13:48 -0700)]

Change java_lang_reflect_Field.cc to use ObjPtr

Also deleted some calls to ObjPtr::Ptr and fixed formatting.

Bug: 31113334

Test: test-art-host
Change-Id: I951b80886b723e1beff4783f28ee7c928cb10650

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 22:06:26 +0000 (22:06 +0000)]

Merge "Change indirect reference table to use ObjPtr" am: 463a67dd60 am: 22316a1570
am: e754acb6fd

Change-Id: I973ae20ce1b63c9b44d6da24c1f837db6eef85d0

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 22:03:26 +0000 (22:03 +0000)]

Merge "Change indirect reference table to use ObjPtr" am: 463a67dd60
am: 22316a1570

Change-Id: I7c7b64fa33ff1805627408a821e2ed0c9c25e8b2

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 22:00:55 +0000 (22:00 +0000)]

Merge "Change indirect reference table to use ObjPtr"
am: 463a67dd60

Change-Id: Id1faabb203c6885d873acd0515a1dbaf68915334

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 21:55:20 +0000 (21:55 +0000)]

Merge "Change indirect reference table to use ObjPtr"

commit | commitdiff | tree

Igor Murashkin [Wed, 5 Oct 2016 21:33:30 +0000 (14:33 -0700)]

jni: Test that pushed handle scopes are popped after JNI transitions

There was previously a bug in generic JNI for @CriticalNative where new
handle scopes were pushed, but then not popped after the native call
was done. This caused a bug with stale pointers being found by GC.

Bug: 31933313
Change-Id: I423f9e7a7d391ba3a4771c830691931f0025b354

Merge "Refactoring of graph linearization and linear order." am: 78c6fefdb9 am: ac2065c9a3
am: 969bd3b2d8

Change-Id: Ia92cf80d1bf9460006866e42932bf043b4cbd163

Merge "Refactoring of graph linearization and linear order." am: 78c6fefdb9
am: ac2065c9a3

Change-Id: Ic2fc38ace9dcb4c0ac0c1e27ba79f34611c98373

Merge "Refactoring of graph linearization and linear order."
am: 78c6fefdb9

Change-Id: I15ebff4861446000918e11a85972708b9a47ab09

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 20:29:58 +0000 (20:29 +0000)]

Merge "Refactoring of graph linearization and linear order."

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 20:09:20 +0000 (20:09 +0000)]

Merge "Initialize dex cache while holding dex_lock" am: 7638651be2 am: 0a881d4341
am: ac2bdd75b2

Change-Id: Id28b8512324e1b808e2179a1a12df62ea9848e48

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 20:06:20 +0000 (20:06 +0000)]

Merge "Initialize dex cache while holding dex_lock" am: 7638651be2
am: 0a881d4341

Change-Id: I4c89b4d7c6db27dcb26d376609a7867e68fe8305

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 20:03:47 +0000 (20:03 +0000)]

Merge "Initialize dex cache while holding dex_lock"
am: 7638651be2

Change-Id: I067b023de98cc6d559437f01339ef814ca9fadde

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 02:06:30 +0000 (19:06 -0700)]

Change indirect reference table to use ObjPtr

Bug: 31113334

Test: test-art-host

Change-Id: I340fdf430897ebd790ea4e35f94bcee776e98445

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 19:59:08 +0000 (19:59 +0000)]

Merge "Initialize dex cache while holding dex_lock"

Refactoring of graph linearization and linear order.

Rationale:
Ownership of graph's linear order and iterators was
a bit unclear now that other phases are using it.
New approach allows phases to compute their own
order, while ssa_liveness is sole owner for graph
(since it is not mutated afterwards).

Also shortens lifetime of loop's arena.

Test: test-art-host
Change-Id: Ib7137d1203a1e0a12db49868f4117d48a4277f30

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 18:30:42 +0000 (18:30 +0000)]

Merge "Don't push handle scope for critical native generic JNI" am: cf42ad62df am: 2b5f912538
am: 9a6731e789

Change-Id: I7550dd05b499a679918f596c51d1f9c8e5a484ff

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 18:27:40 +0000 (18:27 +0000)]

Merge "Don't push handle scope for critical native generic JNI" am: cf42ad62df
am: 2b5f912538

Change-Id: Ia2ce952cae1f906fe75e99cb5316a1f519366a5b

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 18:25:10 +0000 (18:25 +0000)]

Merge "Don't push handle scope for critical native generic JNI"
am: cf42ad62df

Change-Id: Icc0c28b73311cd864204d955e2dce209d3232288

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 18:19:36 +0000 (18:19 +0000)]

Merge "Don't push handle scope for critical native generic JNI"

commit | commitdiff | tree

Vladimir Marko [Wed, 5 Oct 2016 17:10:06 +0000 (17:10 +0000)]

Merge "Remove #include "oat_file.h" from class_linker.h ." am: 2f61867045 am: 6622934a0a
am: 40de464417

Change-Id: I6769b1b2c6f28314d096bf9c4fd17fe8987c8dd5

commit | commitdiff | tree

Vladimir Marko [Wed, 5 Oct 2016 17:07:07 +0000 (17:07 +0000)]

Merge "Remove #include "oat_file.h" from class_linker.h ." am: 2f61867045
am: 6622934a0a

Change-Id: Ifd187a18923c661a47570cb45c205dab712bc060

commit | commitdiff | tree

Vladimir Marko [Wed, 5 Oct 2016 17:04:05 +0000 (17:04 +0000)]

Merge "Remove #include "oat_file.h" from class_linker.h ."
am: 2f61867045

Change-Id: Ieb002dddb7408806db914e7c81f521a45e1452f3

commit | commitdiff | tree

Vladimir Marko [Wed, 5 Oct 2016 17:00:41 +0000 (17:00 +0000)]

Merge "Remove #include "oat_file.h" from class_linker.h ."

commit | commitdiff | tree

Mathieu Chartier [Tue, 4 Oct 2016 22:41:42 +0000 (15:41 -0700)]

Don't push handle scope for critical native generic JNI

Leaving a stale handle scope causes problems for the GC the next
time roots are visited. At this point the stack will have other
contents and the GC will attempt to mark many invalid roots.

Bug: 31933313

Test: non preopt eng build booting.
Test: test-art-host

(cherry picked from commit 92879f9bbcfc034660ed1ff5ef741d7f2bcb116f)

Change-Id: I7d57964ccd2b59a05bb06f67062f646362ce1204

commit | commitdiff | tree

Mathieu Chartier [Thu, 15 Sep 2016 17:24:43 +0000 (10:24 -0700)]

Initialize dex cache while holding dex_lock

Fixes multiple threads calling RegisterDexFile occasionally getting
DCHECK failures due to the arrays not being null since the BSS ones
is per dex file.

Bug: 31369621

Test: test-art-host, no DCHECK failure during debug booting

Change-Id: I7b6e4cd03460dd1213eb4e044bdcf5f6103fd5f9

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 16:14:02 +0000 (16:14 +0000)]

Merge "Make it possible to pass an arena allocator to HLoopOptimization." am: 4aa6a93c46 am: cb4ea84388
am: 614fb1d255

Change-Id: I4a21dc8c49c6c91cc7e91ca828621a345c9f2ed2

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 16:11:00 +0000 (16:11 +0000)]

Merge "Make it possible to pass an arena allocator to HLoopOptimization." am: 4aa6a93c46
am: cb4ea84388

Change-Id: Ib13aebaed943217800ee0f22e675a23df70fba7b

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 16:08:01 +0000 (16:08 +0000)]

Merge "Make it possible to pass an arena allocator to HLoopOptimization."
am: 4aa6a93c46

Change-Id: I8dbf05c57f04e10a1578c405ee6a02659667a82d

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 16:03:30 +0000 (16:03 +0000)]

Merge "Make it possible to pass an arena allocator to HLoopOptimization."

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 13:57:24 +0000 (13:57 +0000)]

Merge "Temporarily blacklist 955-method-handles-smali." am: 99ce62c347 am: 08d85bf8bd
am: 52f4057431

Change-Id: I52bf4e7f1065b11bf208aa86859b91dcc1ddadda

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 13:54:52 +0000 (13:54 +0000)]

Merge "Temporarily blacklist 955-method-handles-smali." am: 99ce62c347
am: 08d85bf8bd

Change-Id: I84c2b0773cd7b06804771bfae5a65390aa239fb6

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 13:52:23 +0000 (13:52 +0000)]

Merge "Temporarily blacklist 955-method-handles-smali."
am: 99ce62c347

Change-Id: I5873a5f978a0d387faa2f9d3460e04ee7a990916

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 13:46:49 +0000 (13:46 +0000)]

Merge "Temporarily blacklist 955-method-handles-smali."

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 13:15:01 +0000 (14:15 +0100)]

Temporarily blacklist 955-method-handles-smali.

Needs a companion smali change 7b348e4f323f44a7c44282.

Test: make test-art-host

Change-Id: Id245d9ead8467315c97cfe07103da2b406b08c49

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 12:49:44 +0000 (13:49 +0100)]

Make it possible to pass an arena allocator to HLoopOptimization.

loop_optimization_test uses memory from HLoopOptimization's
allocator, which is scoped by the Run method.

Fix is to pass custom allocator.

test: m test-art-host-gtest
Change-Id: I359330e22202519f400a26da5403eeb00f0b2db4

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 12:28:48 +0000 (12:28 +0000)]

Merge "Basic implementation of invoke / invoke-polymorphic." am: 8ee0b085be am: c150534c9b
am: 6330020715

Change-Id: If9029788087ff16baa2b93b1230490d52232c06e

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 12:26:17 +0000 (12:26 +0000)]

Merge "Basic implementation of invoke / invoke-polymorphic." am: 8ee0b085be
am: c150534c9b

Change-Id: I8b7358aaf3e14589bdd7a60edfbc2ea8f7b54c37

commit | commitdiff | tree

Narayan Kamath [Wed, 5 Oct 2016 12:23:47 +0000 (12:23 +0000)]

Merge "Basic implementation of invoke / invoke-polymorphic."
am: 8ee0b085be

Change-Id: Ia59c4669734575f6cf0bd426a89fd4fc3caa6462

commit | commitdiff | tree

Vladimir Marko [Tue, 4 Oct 2016 13:44:28 +0000 (14:44 +0100)]

Remove #include "oat_file.h" from class_linker.h .

Refactor the OatClass and OatMethod related functions from
ClassLinker to OatFile and ArtMethod, respectively. Refactor
the remaining ClassLinker dependencies on OatFile to break
the #include dependency and reduce incremental build times.

Test: m test-art-host
Change-Id: Iebc5b9f81b48fbcf79821cc827a5d7c4a0261bf6

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 12:19:30 +0000 (12:19 +0000)]

Merge "Basic implementation of invoke / invoke-polymorphic."

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 10:39:12 +0000 (10:39 +0000)]

Merge "Properly scope HLoopOptimization's allocator." am: d3a9ce9d30 am: 6f72ae011e
am: 3c2c501aaa

Change-Id: Id5971c5ceb68ab3b5a5c72d1655b7a61d8852742

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 10:36:39 +0000 (10:36 +0000)]

Merge "Properly scope HLoopOptimization's allocator." am: d3a9ce9d30
am: 6f72ae011e

Change-Id: I2dccb5fefa34fe34a567acb662123b62d4b9fab5

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 10:34:10 +0000 (10:34 +0000)]

Merge "Properly scope HLoopOptimization's allocator."
am: d3a9ce9d30

Change-Id: I5fc6d2bfafdbe59862d5e572ad439d66b496cbfa

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 10:30:14 +0000 (10:30 +0000)]

Merge "Properly scope HLoopOptimization's allocator."

commit | commitdiff | tree

Narayan Kamath [Wed, 3 Aug 2016 11:46:58 +0000 (12:46 +0100)]

Basic implementation of invoke / invoke-polymorphic.

Basic switch interpreter support for invoke-polymorphic. This change
allows for virtual/interface and static invokes on method handles.

Support for direct invokes (including constructors) and field
getters and setters will be added in follow up changes.

Bug: 30550796
Test: make test-art-host

Change-Id: Ieb3a991d974060d930d56467908d5c7c11d0e38e

commit | commitdiff | tree

Nicolas Geoffray [Wed, 5 Oct 2016 08:55:42 +0000 (09:55 +0100)]

Properly scope HLoopOptimization's allocator.

HOptimization classes do not get their destructor called,
as they are arena objects. So the scope for the optimization
allocator needs to be the Run method.

Also anticipate bisection search breakage by adding
HLoopOptimization to the list of recognized optimizations.

Change-Id: I7770989c39d5700a3b6b0a20af5d4b874dfde111

commit | commitdiff | tree

Goran Jakovljevic [Wed, 5 Oct 2016 04:10:18 +0000 (04:10 +0000)]

Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics" am: 2a5c516077 am: 745297ac7e
am: 35a471c680

Change-Id: I35902cc548f9ec836c771384ad17f317faa63ce6

commit | commitdiff | tree

Goran Jakovljevic [Wed, 5 Oct 2016 04:07:44 +0000 (04:07 +0000)]

Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics" am: 2a5c516077
am: 745297ac7e

Change-Id: Ic14b5319575d95ba0605cb5cbee9a451452eae67

commit | commitdiff | tree

Goran Jakovljevic [Wed, 5 Oct 2016 04:05:44 +0000 (04:05 +0000)]

Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"
am: 2a5c516077

Change-Id: Iec049cc9fc03d2e3d4b05aec7e752ecc680dd5df

commit | commitdiff | tree

Treehugger Robot [Wed, 5 Oct 2016 03:55:28 +0000 (03:55 +0000)]

Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Oct 2016 03:42:16 +0000 (20:42 -0700)]

ART: Fix bad merge

The fix was (incorrectly) skipped, as it was already merged.

Bug: 31893081
Test: m
Change-Id: Ibfdf6a2b09627e6ce9c437ca2a1b5bb531705448

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Oct 2016 02:37:46 +0000 (02:37 +0000)]

ART: Reprint long messages on abort am: 47d522b27f
am: f7fe4ed432 -s ours

Change-Id: I688eb81d96cf266a7d456a40f81876168388a1f6

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Oct 2016 02:37:38 +0000 (02:37 +0000)]

ART: Clean up IRT-related abort messaging am: 15b7c90ab8
am: 96527e3b71

Change-Id: Ie8c56990957374f018263467f2f40db18b1ce052

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Oct 2016 02:31:13 +0000 (02:31 +0000)]

ART: Reprint long messages on abort
am: 47d522b27f

Change-Id: I0b82fa7b714688b9971eae9c7711821a2c0b32b2

commit | commitdiff | tree

Andreas Gampe [Wed, 5 Oct 2016 02:31:06 +0000 (02:31 +0000)]

ART: Clean up IRT-related abort messaging
am: 15b7c90ab8

Change-Id: I9a5f61d7d6952f88ea457e15365e19cc13071844

Merge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5 am: 84a7962b88
am: c907acaad1

Change-Id: Ia7abad05d7150a5df0f49acfeb28e94a1340b83c

Merge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5
am: 84a7962b88

Change-Id: I57b37702b9138714a474b1e2a3d1e32bed4e6eec

Merge "Revert "Compute PPID at ninja time""
am: 3601e4a5c5

Change-Id: Ifb341ffc0ee82d95bff904367baac78f0e23ebc0

Merge "Revert "Compute PPID at ninja time""

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 01:01:32 +0000 (01:01 +0000)]

Merge "Fix build break from merge conflict" am: c13fbeb220 am: dfd6e355c9
am: 9d2b9cb0e8

Change-Id: Iccbf744b226ce67194c6dc7afa42e09e44e3e7a4

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:59:31 +0000 (00:59 +0000)]

Merge "Fix build break from merge conflict" am: c13fbeb220
am: dfd6e355c9

Change-Id: I9c545e3851b8d83807ce11774cfbf7efa833a653

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:57:31 +0000 (00:57 +0000)]

Merge "Fix build break from merge conflict"
am: c13fbeb220

Change-Id: Id3efe319a6c75dd1d8fafc92104caf2f2c956a75

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:54:38 +0000 (00:54 +0000)]

Merge "Fix build break from merge conflict"

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:48:45 +0000 (17:48 -0700)]

Fix build break from merge conflict

Bug: 31113334

Test: mm -j32

Change-Id: I5643a0ec22cf03a54671a5c7fa0ebda41cc9a8c3

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:47:31 +0000 (00:47 +0000)]

Merge "Rename ObjPtr::Decode to ObjPtr::Ptr" am: 556c9a2f18 am: a386275651
am: 12238c82cb

Change-Id: I46792cbf272f66af03bf4ad64ce8eaf52d0cc8bd

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:45:30 +0000 (00:45 +0000)]

Merge "Rename ObjPtr::Decode to ObjPtr::Ptr" am: 556c9a2f18
am: a386275651

Change-Id: Iff960bc05c66248914f2e2b522e702e981fefa3f

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:43:31 +0000 (00:43 +0000)]

Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"
am: 556c9a2f18

Change-Id: I2265df5d6748d385d44b76e5e2b8507432a173f4

commit | commitdiff | tree

Mathieu Chartier [Wed, 5 Oct 2016 00:39:07 +0000 (00:39 +0000)]

Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"

commit | commitdiff | tree

Andreas Gampe [Tue, 4 Oct 2016 02:47:08 +0000 (19:47 -0700)]

ART: Reprint long messages on abort

Add an abort message parameter to Runtime::Abort. In case the message
is multiline (and will thus not be completely preserved in the
Android abort reason), reprint the message after all threads have
been dumped.

Bug: 31893081
Test: m test-art-host
Change-Id: I65bc77691fec79f7c868a90d6132805fcc91e473
(cherry picked from commit 90a32b16feb58d4edf932fdcb6a070be3418e365)

commit | commitdiff | tree

Hiroshi Yamauchi [Wed, 5 Oct 2016 00:37:30 +0000 (00:37 +0000)]

Merge "Fix a CC crash with ThreadStress." am: e793bbb4a8 am: ce9fc72373
am: b813eeb028

Change-Id: I2c21a1a869a2cb0d8ecd47830e67331b75a0ad5f

commit | commitdiff | tree

Hiroshi Yamauchi [Wed, 5 Oct 2016 00:35:35 +0000 (00:35 +0000)]

Merge "Fix a CC crash with ThreadStress." am: e793bbb4a8
am: ce9fc72373

Change-Id: I12b77cb0febed5beb72f997f652cc93f62cdaa8a

commit | commitdiff | tree

Hiroshi Yamauchi [Wed, 5 Oct 2016 00:33:30 +0000 (00:33 +0000)]

Merge "Fix a CC crash with ThreadStress."
am: e793bbb4a8

Change-Id: I554f3c1cc37b44ae8537241e235f267733837759

commit | commitdiff | tree

Hiroshi Yamauchi [Wed, 5 Oct 2016 00:27:46 +0000 (00:27 +0000)]

Merge "Fix a CC crash with ThreadStress."

Revert "Compute PPID at ninja time"

This reverts commit b1c17bb080ccf41b30909c0401df59e6f3a1ebb1.

It breaks make test-art-host when /bin/sh is not bash, as
/bin/sh -c /bin/bash -c echo $PPID
returns the pid of /bin/sh, not the pid of ninja.

Test: none
Change-Id: Ia4e5f76ea4c5f5b5c102ce54ae03c3fccb23a49f

commit | commitdiff | tree

Hiroshi Yamauchi [Tue, 4 Oct 2016 22:20:36 +0000 (15:20 -0700)]

Fix a CC crash with ThreadStress.

Add a read barrier on the locked object in Monitor::DescribeWait().

Bug: 31848261
Bug: 12687968
Test: test-art-host with CC and N9 libartd boot.
Change-Id: I569e1499c2aadf54d9074a8a790e5d512c2dad4f

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:18:05 +0000 (22:18 +0000)]

Merge "Fix build breakage." am: 29a7fd300a am: 905d0d2543
am: 5da430359f

Change-Id: I945c60246148e2031c7921010e1b144a32fe2be6

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:17:51 +0000 (22:17 +0000)]

Merge "Revert "Remove dead code from compiler driver."" am: 091f6754c3 am: dc36c19eeb
am: e1151cce10

Change-Id: I09c7249a75a321d1aa9fb60a89f2ab147c2157b1

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:16:05 +0000 (22:16 +0000)]

Merge "Fix build breakage." am: 29a7fd300a
am: 905d0d2543

Change-Id: I11c15a16cd6abb6fa2ef27bae1371bed62a9a3cb

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:15:50 +0000 (22:15 +0000)]

Merge "Revert "Remove dead code from compiler driver."" am: 091f6754c3
am: dc36c19eeb

Change-Id: I5eea715bebb18525e57dd5bea8be07157e4e12d8

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:14:12 +0000 (22:14 +0000)]

Merge "Fix build breakage."
am: 29a7fd300a

Change-Id: Ib410f96a0b73d5fcdfda1002d7f7c1563b6eb634

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 22:13:55 +0000 (22:13 +0000)]

Merge "Revert "Remove dead code from compiler driver.""
am: 091f6754c3

Change-Id: I0b49f1de822ab33685267b382c7892369d554440

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 21:59:14 +0000 (21:59 +0000)]

Merge "Fix build breakage."

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 21:56:35 +0000 (22:56 +0100)]

Fix build breakage.

Revert did not apply cleanly.

test: make test-art-host
Change-Id: Id94d377d19dc80237951ad40fd5e01f8fec67a47

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 21:45:24 +0000 (21:45 +0000)]

Merge "Revert "Remove dead code from compiler driver.""

commit | commitdiff | tree

Nicolas Geoffray [Tue, 4 Oct 2016 21:44:45 +0000 (21:44 +0000)]

Revert "Remove dead code from compiler driver."

This reverts commit 44b3da25191052acc18528d8ade9cf3038505180.

Change-Id: I0cf049ed967bcaf8dfd89fc88288d992c63a4939

Revert "Revert "Add dex file writer to dexlayout tool.""

This reverts commit fd1a6c2a08ca3e2476b7424b9b0fa58e73b29e87.

Fixed output being clobbered during DexLayoutTest.DexFileOutput.
Option added to put dex output file in scratch directory.

Bug: 29921113
Test: mm test-art-host-gtest-dexlayout_test

Change-Id: I9e6b139cf06aaa39c83ad1e74329db266464a8e4

Merge "A first implementation of a loop optimization framework." am: 26705cca46 am: 30a054f826
am: aec67c4781

Change-Id: I7563592cede9a870a3efdcea27f2027930d6625f