OSDN Git Service

android-x86/art.git
7 years agoMerge "Revert "Revert "Add dex file writer to dexlayout tool.""" am: 765dee21f3
Jeff Hao [Thu, 6 Oct 2016 01:21:10 +0000 (01:21 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool.""" am: 765dee21f3
am: 6449dd7204

Change-Id: I25418a101bbb4fd15a03bbf8e27d08bc63da7e68

7 years agoMerge "Revert "Revert "Add dex file writer to dexlayout tool."""
Jeff Hao [Thu, 6 Oct 2016 01:17:38 +0000 (01:17 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""
am: 765dee21f3

Change-Id: I41b548c0ca1b1f1b412aafadf6dc5d9006d645da

7 years agoMerge "Revert "Revert "Add dex file writer to dexlayout tool."""
Treehugger Robot [Thu, 6 Oct 2016 01:12:23 +0000 (01:12 +0000)]
Merge "Revert "Revert "Add dex file writer to dexlayout tool."""

7 years agoMerge "jni: Test that pushed handle scopes are popped after JNI transitions" am:...
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

7 years agoMerge "jni: Test that pushed handle scopes are popped after JNI transitions"
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

7 years agoMerge "jni: Test that pushed handle scopes are popped after JNI transitions"
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"

7 years agoMerge "Change java_lang_reflect_Field.cc to use ObjPtr" am: 6206a5d523
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

7 years agoMerge "Change java_lang_reflect_Field.cc to use ObjPtr"
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

7 years agoMerge "Change java_lang_reflect_Field.cc to use ObjPtr"
Treehugger Robot [Wed, 5 Oct 2016 23:32:05 +0000 (23:32 +0000)]
Merge "Change java_lang_reflect_Field.cc to use ObjPtr"

7 years agoChange java_lang_reflect_Field.cc to use ObjPtr
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

7 years agoMerge "Change indirect reference table to use ObjPtr" am: 463a67dd60
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

7 years agoMerge "Change indirect reference table to use ObjPtr"
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

7 years agoMerge "Change indirect reference table to use ObjPtr"
Treehugger Robot [Wed, 5 Oct 2016 21:55:20 +0000 (21:55 +0000)]
Merge "Change indirect reference table to use ObjPtr"

7 years agojni: Test that pushed handle scopes are popped after JNI transitions
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

7 years agoMerge "Refactoring of graph linearization and linear order." am: 78c6fefdb9
Aart Bik [Wed, 5 Oct 2016 20:36:50 +0000 (20:36 +0000)]
Merge "Refactoring of graph linearization and linear order." am: 78c6fefdb9
am: ac2065c9a3

Change-Id: Ic2fc38ace9dcb4c0ac0c1e27ba79f34611c98373

7 years agoMerge "Refactoring of graph linearization and linear order."
Aart Bik [Wed, 5 Oct 2016 20:34:20 +0000 (20:34 +0000)]
Merge "Refactoring of graph linearization and linear order."
am: 78c6fefdb9

Change-Id: I15ebff4861446000918e11a85972708b9a47ab09

7 years agoMerge "Refactoring of graph linearization and linear order."
Treehugger Robot [Wed, 5 Oct 2016 20:29:58 +0000 (20:29 +0000)]
Merge "Refactoring of graph linearization and linear order."

7 years agoMerge "Initialize dex cache while holding dex_lock" am: 7638651be2
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

7 years agoMerge "Initialize dex cache while holding dex_lock"
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

7 years agoChange indirect reference table to use ObjPtr
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

7 years agoMerge "Initialize dex cache while holding dex_lock"
Mathieu Chartier [Wed, 5 Oct 2016 19:59:08 +0000 (19:59 +0000)]
Merge "Initialize dex cache while holding dex_lock"

7 years agoRefactoring of graph linearization and linear order.
Aart Bik [Wed, 5 Oct 2016 00:33:56 +0000 (17:33 -0700)]
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

7 years agoMerge "Don't push handle scope for critical native generic JNI" am: cf42ad62df
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

7 years agoMerge "Don't push handle scope for critical native generic JNI"
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

7 years agoMerge "Don't push handle scope for critical native generic JNI"
Treehugger Robot [Wed, 5 Oct 2016 18:19:36 +0000 (18:19 +0000)]
Merge "Don't push handle scope for critical native generic JNI"

7 years agoMerge "Remove #include "oat_file.h" from class_linker.h ." am: 2f61867045
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

7 years agoMerge "Remove #include "oat_file.h" from class_linker.h ."
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

7 years agoMerge "Remove #include "oat_file.h" from class_linker.h ."
Vladimir Marko [Wed, 5 Oct 2016 17:00:41 +0000 (17:00 +0000)]
Merge "Remove #include "oat_file.h" from class_linker.h ."

7 years agoDon't push handle scope for critical native generic JNI
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

7 years agoInitialize dex cache while holding dex_lock
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

7 years agoMerge "Make it possible to pass an arena allocator to HLoopOptimization." am: 4aa6a93c46
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

7 years agoMerge "Make it possible to pass an arena allocator to HLoopOptimization."
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

7 years agoMerge "Make it possible to pass an arena allocator to HLoopOptimization."
Treehugger Robot [Wed, 5 Oct 2016 16:03:30 +0000 (16:03 +0000)]
Merge "Make it possible to pass an arena allocator to HLoopOptimization."

7 years agoMerge "Temporarily blacklist 955-method-handles-smali." am: 99ce62c347
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

7 years agoMerge "Temporarily blacklist 955-method-handles-smali."
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

7 years agoMerge "Temporarily blacklist 955-method-handles-smali."
Narayan Kamath [Wed, 5 Oct 2016 13:46:49 +0000 (13:46 +0000)]
Merge "Temporarily blacklist 955-method-handles-smali."

7 years agoTemporarily blacklist 955-method-handles-smali.
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

7 years agoMake it possible to pass an arena allocator to HLoopOptimization.
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

7 years agoMerge "Basic implementation of invoke / invoke-polymorphic." am: 8ee0b085be
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

7 years agoMerge "Basic implementation of invoke / invoke-polymorphic."
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

7 years agoRemove #include "oat_file.h" from class_linker.h .
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

7 years agoMerge "Basic implementation of invoke / invoke-polymorphic."
Treehugger Robot [Wed, 5 Oct 2016 12:19:30 +0000 (12:19 +0000)]
Merge "Basic implementation of invoke / invoke-polymorphic."

7 years agoMerge "Properly scope HLoopOptimization's allocator." am: d3a9ce9d30
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

7 years agoMerge "Properly scope HLoopOptimization's allocator."
Nicolas Geoffray [Wed, 5 Oct 2016 10:34:10 +0000 (10:34 +0000)]
Merge "Properly scope HLoopOptimization's allocator."
am: d3a9ce9d30

Change-Id: I5fc6d2bfafdbe59862d5e572ad439d66b496cbfa

7 years agoMerge "Properly scope HLoopOptimization's allocator."
Treehugger Robot [Wed, 5 Oct 2016 10:30:14 +0000 (10:30 +0000)]
Merge "Properly scope HLoopOptimization's allocator."

7 years agoBasic implementation of invoke / invoke-polymorphic.
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

7 years agoProperly scope HLoopOptimization's allocator.
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

7 years agoMerge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics" am: 2a5c516077
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

7 years agoMerge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"
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

7 years agoMerge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"
Treehugger Robot [Wed, 5 Oct 2016 03:55:28 +0000 (03:55 +0000)]
Merge "MIPS32: Fix GenerateVirtualCall in the presence of intrinsics"

7 years agoMerge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5
Colin Cross [Wed, 5 Oct 2016 01:44:35 +0000 (01:44 +0000)]
Merge "Revert "Compute PPID at ninja time"" am: 3601e4a5c5
am: 84a7962b88

Change-Id: I57b37702b9138714a474b1e2a3d1e32bed4e6eec

7 years agoMerge "Revert "Compute PPID at ninja time""
Colin Cross [Wed, 5 Oct 2016 01:42:35 +0000 (01:42 +0000)]
Merge "Revert "Compute PPID at ninja time""
am: 3601e4a5c5

Change-Id: Ifb341ffc0ee82d95bff904367baac78f0e23ebc0

7 years agoMerge "Revert "Compute PPID at ninja time""
Colin Cross [Wed, 5 Oct 2016 01:38:09 +0000 (01:38 +0000)]
Merge "Revert "Compute PPID at ninja time""

7 years agoMerge "Fix build break from merge conflict" am: c13fbeb220
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

7 years agoMerge "Fix build break from merge conflict"
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

7 years agoMerge "Fix build break from merge conflict"
Mathieu Chartier [Wed, 5 Oct 2016 00:54:38 +0000 (00:54 +0000)]
Merge "Fix build break from merge conflict"

7 years agoFix build break from merge conflict
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

7 years agoMerge "Rename ObjPtr::Decode to ObjPtr::Ptr" am: 556c9a2f18
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

7 years agoMerge "Rename ObjPtr::Decode to ObjPtr::Ptr"
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

7 years agoMerge "Rename ObjPtr::Decode to ObjPtr::Ptr"
Mathieu Chartier [Wed, 5 Oct 2016 00:39:07 +0000 (00:39 +0000)]
Merge "Rename ObjPtr::Decode to ObjPtr::Ptr"

7 years agoMerge "Fix a CC crash with ThreadStress." am: e793bbb4a8
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

7 years agoMerge "Fix a CC crash with ThreadStress."
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

7 years agoMerge "Fix a CC crash with ThreadStress."
Hiroshi Yamauchi [Wed, 5 Oct 2016 00:27:46 +0000 (00:27 +0000)]
Merge "Fix a CC crash with ThreadStress."

7 years agoRevert "Compute PPID at ninja time"
Colin Cross [Tue, 4 Oct 2016 23:06:16 +0000 (23:06 +0000)]
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

7 years agoFix a CC crash with ThreadStress.
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

7 years agoMerge "Fix build breakage." am: 29a7fd300a
Nicolas Geoffray [Tue, 4 Oct 2016 22:16:05 +0000 (22:16 +0000)]
Merge "Fix build breakage." am: 29a7fd300a
am: 905d0d2543

Change-Id: I11c15a16cd6abb6fa2ef27bae1371bed62a9a3cb

7 years agoMerge "Revert "Remove dead code from compiler driver."" am: 091f6754c3
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

7 years agoMerge "Fix build breakage."
Nicolas Geoffray [Tue, 4 Oct 2016 22:14:12 +0000 (22:14 +0000)]
Merge "Fix build breakage."
am: 29a7fd300a

Change-Id: Ib410f96a0b73d5fcdfda1002d7f7c1563b6eb634

7 years agoMerge "Revert "Remove dead code from compiler driver.""
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

7 years agoMerge "Fix build breakage."
Nicolas Geoffray [Tue, 4 Oct 2016 21:59:14 +0000 (21:59 +0000)]
Merge "Fix build breakage."

7 years agoFix build breakage.
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

7 years agoMerge "Revert "Remove dead code from compiler driver.""
Nicolas Geoffray [Tue, 4 Oct 2016 21:45:24 +0000 (21:45 +0000)]
Merge "Revert "Remove dead code from compiler driver.""

7 years agoRevert "Remove dead code from compiler driver."
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

7 years agoRevert "Revert "Add dex file writer to dexlayout tool.""
Jeff Hao [Tue, 4 Oct 2016 18:13:44 +0000 (18:13 +0000)]
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

7 years agoMerge "A first implementation of a loop optimization framework." am: 26705cca46
Aart Bik [Tue, 4 Oct 2016 20:47:23 +0000 (20:47 +0000)]
Merge "A first implementation of a loop optimization framework." am: 26705cca46
am: 30a054f826

Change-Id: If5720a0fba097bcb9ed26937ceccee7be430e796

7 years agoMerge "A first implementation of a loop optimization framework."
Aart Bik [Tue, 4 Oct 2016 20:44:54 +0000 (20:44 +0000)]
Merge "A first implementation of a loop optimization framework."
am: 26705cca46

Change-Id: I26dbb2161283fba97e62e31f754cf94b4234d7bf

7 years agoMerge "A first implementation of a loop optimization framework."
Aart Bik [Tue, 4 Oct 2016 20:40:23 +0000 (20:40 +0000)]
Merge "A first implementation of a loop optimization framework."

7 years agoMerge changes I65bc7769,Ib24c7060 am: d74bd3a9a4
Andreas Gampe [Tue, 4 Oct 2016 19:14:13 +0000 (19:14 +0000)]
Merge changes I65bc7769,Ib24c7060 am: d74bd3a9a4
am: c3e2247adb

Change-Id: I33ef87ee020e0dc215aba9eef3434e55c9b474b5

7 years agoART: Reprint long messages on abort am: 90a32b16fe
Andreas Gampe [Tue, 4 Oct 2016 19:14:05 +0000 (19:14 +0000)]
ART: Reprint long messages on abort am: 90a32b16fe
am: 4d22cfff72

Change-Id: Ie966311e09128c9783cebc1ea7995acb259c8e9a

7 years agoART: Clean up IRT-related abort messaging am: f1e8630fe8
Andreas Gampe [Tue, 4 Oct 2016 19:13:58 +0000 (19:13 +0000)]
ART: Clean up IRT-related abort messaging am: f1e8630fe8
am: bd152e2a35

Change-Id: Iaa0e9082813e2edadd723a71e8b416e8035cdd95

7 years agoMerge "Revert "Revert "Store resolved Strings for AOT code in .bss.""" am: 129fc43ff9
Vladimir Marko [Tue, 4 Oct 2016 19:13:47 +0000 (19:13 +0000)]
Merge "Revert "Revert "Store resolved Strings for AOT code in .bss.""" am: 129fc43ff9
am: eba59570a2

Change-Id: I1fe1d3fdfb08f27017bf523a61dc599c388fa5aa

7 years agoMerge changes I65bc7769,Ib24c7060
Andreas Gampe [Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)]
Merge changes I65bc7769,Ib24c7060
am: d74bd3a9a4

Change-Id: Ic6e0297261b9774b3f58ed1211fa5059d0384062

7 years agoART: Reprint long messages on abort
Andreas Gampe [Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)]
ART: Reprint long messages on abort
am: 90a32b16fe

Change-Id: I95e38ad0180d881b14cf564d18945b992b997a61

7 years agoART: Clean up IRT-related abort messaging
Andreas Gampe [Tue, 4 Oct 2016 19:12:02 +0000 (19:12 +0000)]
ART: Clean up IRT-related abort messaging
am: f1e8630fe8

Change-Id: I3fa27b8be552adc7a3f8c4956ad17132ebb6da14

7 years agoMerge "Revert "Revert "Store resolved Strings for AOT code in .bss."""
Vladimir Marko [Tue, 4 Oct 2016 19:11:48 +0000 (19:11 +0000)]
Merge "Revert "Revert "Store resolved Strings for AOT code in .bss."""
am: 129fc43ff9

Change-Id: Ia1b1129651b8552ba745cda3c9f7b52a7a469f0a

7 years agoMerge changes I65bc7769,Ib24c7060
Andreas Gampe [Tue, 4 Oct 2016 19:08:14 +0000 (19:08 +0000)]
Merge changes I65bc7769,Ib24c7060

* changes:
  ART: Reprint long messages on abort
  ART: Clean up IRT-related abort messaging

7 years agoMerge "Revert "Revert "Store resolved Strings for AOT code in .bss."""
Vladimir Marko [Tue, 4 Oct 2016 19:00:30 +0000 (19:00 +0000)]
Merge "Revert "Revert "Store resolved Strings for AOT code in .bss."""

7 years agoMerge "Option to gnuplot dex layout" am: b4f0076e7f
David Sehr [Tue, 4 Oct 2016 18:16:14 +0000 (18:16 +0000)]
Merge "Option to gnuplot dex layout" am: b4f0076e7f
am: 5538962ddf

Change-Id: Ie3062d0a2342ceeeb227e218ce625a17143a582c

7 years agoMerge "Option to gnuplot dex layout"
David Sehr [Tue, 4 Oct 2016 18:14:15 +0000 (18:14 +0000)]
Merge "Option to gnuplot dex layout"
am: b4f0076e7f

Change-Id: I1d9f8ada132c74306291ecb42762959d69a41aac

7 years agoMerge "Option to gnuplot dex layout"
David Sehr [Tue, 4 Oct 2016 18:06:48 +0000 (18:06 +0000)]
Merge "Option to gnuplot dex layout"

7 years agoOption to gnuplot dex layout
David Sehr [Mon, 26 Sep 2016 14:44:04 +0000 (07:44 -0700)]
Option to gnuplot dex layout

Display the portions of the dex file that are accessed by the classes in
the dex file.  Optionally limit the display to only those classes that
are present in a runtime profile.

Bug: 29921113
Change-Id: I2a998fba448fec6c23941d3b4358531b1336e1b3
Test: dexlayout test

7 years agoRename ObjPtr::Decode to ObjPtr::Ptr
Mathieu Chartier [Tue, 4 Oct 2016 01:01:28 +0000 (18:01 -0700)]
Rename ObjPtr::Decode to ObjPtr::Ptr

Done to prevent ambiguity with ScopedObjectAccess::Decode.

Bug: 31113334

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

7 years agoMerge "Compute PPID at ninja time" am: 82d4838d6b
Colin Cross [Tue, 4 Oct 2016 16:53:40 +0000 (16:53 +0000)]
Merge "Compute PPID at ninja time" am: 82d4838d6b
am: 6adda1d852

Change-Id: I95513f5611c952ae1a445667ebf076d8e5680e08

7 years agoRevert "Revert "Store resolved Strings for AOT code in .bss.""
Vladimir Marko [Mon, 3 Oct 2016 08:46:48 +0000 (08:46 +0000)]
Revert "Revert "Store resolved Strings for AOT code in .bss.""

Fixed oat_test to keep dex files alive. Fixed mips build.
Rewritten the .bss GC root visiting and added write barrier
to the artResolveStringFromCode().

Test: build aosp_mips-eng
Test: m ART_DEFAULT_GC_TYPE=SS test-art-target-host-gtest-oat_test
Test: Run ART test suite on host and Nexus 9.
Bug: 20323084
Bug: 30627598

This reverts commit 5f926055cb88089d8ca27243f35a9dfd89d981f0.

Change-Id: I07fa2278d82b8eb64964c9a4b66cb93726ccda6b

7 years agoMerge "Compute PPID at ninja time"
Colin Cross [Tue, 4 Oct 2016 16:51:11 +0000 (16:51 +0000)]
Merge "Compute PPID at ninja time"
am: 82d4838d6b

Change-Id: If36dc12209df40a91680fed5d085d56bebe8bf6e

7 years agoMerge "Compute PPID at ninja time"
Colin Cross [Tue, 4 Oct 2016 16:45:44 +0000 (16:45 +0000)]
Merge "Compute PPID at ninja time"

7 years agoMerge "Remove dead code from compiler driver." am: eebe142e93
Nicolas Geoffray [Tue, 4 Oct 2016 14:14:30 +0000 (14:14 +0000)]
Merge "Remove dead code from compiler driver." am: eebe142e93
am: 440ae0e8fe

Change-Id: I07c255e41e056cfd1146cdbcc384b13eeceb00c8

7 years agoMerge "Remove dead code from compiler driver."
Nicolas Geoffray [Tue, 4 Oct 2016 14:12:30 +0000 (14:12 +0000)]
Merge "Remove dead code from compiler driver."
am: eebe142e93

Change-Id: Ic7aebf11851cc6706b6cd3a99cb013eeda850544

7 years agoMerge "Remove dead code from compiler driver."
Nicolas Geoffray [Tue, 4 Oct 2016 14:08:10 +0000 (14:08 +0000)]
Merge "Remove dead code from compiler driver."

7 years agoRemove dead code from compiler driver.
Nicolas Geoffray [Mon, 3 Oct 2016 14:09:25 +0000 (15:09 +0100)]
Remove dead code from compiler driver.

test: m test-art-host
Change-Id: Ie4b6a4c371fff6c9c213d8d6604eb09a5e71d595