OSDN Git Service

android-x86/art.git
7 years agoMerge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6f...
Jeff Hao [Mon, 3 Oct 2016 17:56:57 +0000 (17:56 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b am: 67396f35de
am: 5f894870a2

Change-Id: I6637de6f076a9748b95be26ef2c3d4990405a5f9

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b
Jeff Hao [Mon, 3 Oct 2016 17:53:24 +0000 (17:53 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations" am: ce0db6fb7b
am: 67396f35de

Change-Id: I68f1f4598cbeb9a376720d9f4bbd896ed6ec038f

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations"
Jeff Hao [Mon, 3 Oct 2016 17:49:53 +0000 (17:49 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations"
am: ce0db6fb7b

Change-Id: I2e6cb00c5962ebcd9f94a1f7f1d5f82e0b6298ba

7 years agoMerge "Reserve space in the char backing vector to prevent reallocations"
Jeff Hao [Mon, 3 Oct 2016 17:42:15 +0000 (17:42 +0000)]
Merge "Reserve space in the char backing vector to prevent reallocations"

7 years agoMerge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca
Narayan Kamath [Mon, 3 Oct 2016 13:23:24 +0000 (13:23 +0000)]
Merge "DexCachePair : Add an Assign method." am: d295618ac7 am: 25912555ca
am: c356fc66cf

Change-Id: I566af9d8dbab6f7d8218b6735d2d3fe948541e88

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35...
Narayan Kamath [Mon, 3 Oct 2016 13:23:10 +0000 (13:23 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35 am: 5d722d83e6
am: dc7ab3a0e1

Change-Id: I6b5e170b8b805183ecc772d69692405c13259ec9

7 years agoMerge "DexCachePair : Add an Assign method." am: d295618ac7
Narayan Kamath [Mon, 3 Oct 2016 13:19:22 +0000 (13:19 +0000)]
Merge "DexCachePair : Add an Assign method." am: d295618ac7
am: 25912555ca

Change-Id: Icfbe18b08e866e3c1532b3b4c6668ec017f4212e

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35
Narayan Kamath [Mon, 3 Oct 2016 13:19:07 +0000 (13:19 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab." am: 1ec37ada35
am: 5d722d83e6

Change-Id: I68466df8d8d1a21737d778754622f7cbbb041e26

7 years agoMerge "DexCachePair : Add an Assign method."
Narayan Kamath [Mon, 3 Oct 2016 13:15:50 +0000 (13:15 +0000)]
Merge "DexCachePair : Add an Assign method."
am: d295618ac7

Change-Id: I400ebe914f35dd690902888b8edbc9d78262fc90

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab."
Narayan Kamath [Mon, 3 Oct 2016 13:15:37 +0000 (13:15 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab."
am: 1ec37ada35

Change-Id: I31e88cef1bc1dbcef2bd84dc9dbac2b13723bc40

7 years agoMerge "DexCachePair : Add an Assign method."
Narayan Kamath [Mon, 3 Oct 2016 13:10:42 +0000 (13:10 +0000)]
Merge "DexCachePair : Add an Assign method."

7 years agoDexCachePair : Add an Assign method.
Narayan Kamath [Fri, 30 Sep 2016 15:29:19 +0000 (16:29 +0100)]
DexCachePair : Add an Assign method.

This prevents the logic for determining a slot from the type ID from
being scattered all over the place.

Bug: 30550796
Test: make test-art-host
Change-Id: I4ad6db8b730dc617fa8474a71c3794963b58279b

7 years agoMerge "Address review comments for change 25352fc06c84cdab8a2ab."
Narayan Kamath [Mon, 3 Oct 2016 13:09:34 +0000 (13:09 +0000)]
Merge "Address review comments for change 25352fc06c84cdab8a2ab."

7 years agoMerge "class_linker: Add support for resolving method types." am: ebeee75e46 am:...
Narayan Kamath [Mon, 3 Oct 2016 10:44:05 +0000 (10:44 +0000)]
Merge "class_linker: Add support for resolving method types." am: ebeee75e46 am: 838d4b7aff
am: 5c4aeb46f5

Change-Id: I382bf3c92c48b4575f515d822d9e7840ecfb3eeb

7 years agoMerge "class_linker: Add support for resolving method types." am: ebeee75e46
Narayan Kamath [Mon, 3 Oct 2016 10:40:31 +0000 (10:40 +0000)]
Merge "class_linker: Add support for resolving method types." am: ebeee75e46
am: 838d4b7aff

Change-Id: Ied67ad558ac83aafae2fc7b2c7c70ab649f4fb26

7 years agoMerge "class_linker: Add support for resolving method types."
Narayan Kamath [Mon, 3 Oct 2016 10:37:02 +0000 (10:37 +0000)]
Merge "class_linker: Add support for resolving method types."
am: ebeee75e46

Change-Id: Ic92e41bd5386ae7476cc26ef476e5fc22335b404

7 years agoAddress review comments for change 25352fc06c84cdab8a2ab.
Narayan Kamath [Mon, 3 Oct 2016 10:33:01 +0000 (11:33 +0100)]
Address review comments for change 25352fc06c84cdab8a2ab.

Test: make test-art-host
Bug: 30550796

Change-Id: Ic689e4c9bee691f03703288c3b12634a26841140

7 years agoMerge "class_linker: Add support for resolving method types."
Treehugger Robot [Mon, 3 Oct 2016 10:32:15 +0000 (10:32 +0000)]
Merge "class_linker: Add support for resolving method types."

7 years agoclass_linker: Add support for resolving method types.
Narayan Kamath [Wed, 3 Aug 2016 11:46:58 +0000 (12:46 +0100)]
class_linker: Add support for resolving method types.

- Add a new fixed size dex cache array for resolved method types.
  The size of this array is set to 1024.
- Also introduces a new runtime flag that controls this feature.

Test: make test-art-host
Bug: 30550796

Change-Id: I147b33398d71ee21f2e91b418d3700d4630801ff

7 years agoMerge "Integrate dexfuzz with bisection search" am: 51cbe84ca3 am: 55fc7998dc
Wojciech Staszkiewicz [Sat, 1 Oct 2016 01:14:48 +0000 (01:14 +0000)]
Merge "Integrate dexfuzz with bisection search" am: 51cbe84ca3 am: 55fc7998dc
am: 756a6bc88d

Change-Id: Ib4191d6fe587385d84bd2c624ffe634c27a9fb4d

7 years agoMerge "Integrate dexfuzz with bisection search" am: 51cbe84ca3
Wojciech Staszkiewicz [Sat, 1 Oct 2016 01:11:16 +0000 (01:11 +0000)]
Merge "Integrate dexfuzz with bisection search" am: 51cbe84ca3
am: 55fc7998dc

Change-Id: Icdfe4a910d596ee89a4c43b1dddac1cc719f46e9

7 years agoMerge "Integrate dexfuzz with bisection search"
Wojciech Staszkiewicz [Sat, 1 Oct 2016 01:07:44 +0000 (01:07 +0000)]
Merge "Integrate dexfuzz with bisection search"
am: 51cbe84ca3

Change-Id: I10fe4df9f3efb577229f6f1c06617793cdac21aa

7 years agoMerge "Integrate dexfuzz with bisection search"
Treehugger Robot [Sat, 1 Oct 2016 01:00:38 +0000 (01:00 +0000)]
Merge "Integrate dexfuzz with bisection search"

7 years agoIntegrate dexfuzz with bisection search
Wojciech Staszkiewicz [Thu, 29 Sep 2016 00:51:06 +0000 (17:51 -0700)]
Integrate dexfuzz with bisection search

Adds --bisection-search switch to dexfuzz. When specified makes
dexfuzz run bisection search on discovered output divergences.

Bisection search output is saved to bisection_outputs/ directory which
is assumed to be present.

If --bisection-search is used, bisection_search.py has to be on PATH.

Test: ./run_dex_fuzz_test.py , with hardcoded change to emit a known
divergent program instead of calling jfuzz.

Change-Id: I8fcb45e201761f1f05adee74e6b8636bcc452332

7 years agoMerge "String Compression for ARM and ARM64" am: e89e1b5fa2 am: fad299e61a
Jeff Hao [Fri, 30 Sep 2016 23:02:19 +0000 (23:02 +0000)]
Merge "String Compression for ARM and ARM64" am: e89e1b5fa2 am: fad299e61a
am: 0e078f2993

Change-Id: If7e1aa2c199248beee1e36b9aac55cd2d0938438

7 years agoMerge "String compression on intrinsics x86 and x86_64" am: f2ebe98e32 am: efa2baa97c
Jeff Hao [Fri, 30 Sep 2016 23:02:05 +0000 (23:02 +0000)]
Merge "String compression on intrinsics x86 and x86_64" am: f2ebe98e32 am: efa2baa97c
am: a76253b88b

Change-Id: I6b82dbf7ccc80e21b06d9f56a5c4696ed0c50a4e

7 years agoMerge "String Compression for ARM and ARM64" am: e89e1b5fa2
Jeff Hao [Fri, 30 Sep 2016 22:58:46 +0000 (22:58 +0000)]
Merge "String Compression for ARM and ARM64" am: e89e1b5fa2
am: fad299e61a

Change-Id: I17c85936779deb1764207cbe0833afd025924067

7 years agoMerge "String compression on intrinsics x86 and x86_64" am: f2ebe98e32
Jeff Hao [Fri, 30 Sep 2016 22:58:32 +0000 (22:58 +0000)]
Merge "String compression on intrinsics x86 and x86_64" am: f2ebe98e32
am: efa2baa97c

Change-Id: I9453006e191c9c6a7912ac9e60becc6a00c5d063

7 years agoMerge "String Compression for ARM and ARM64"
Jeff Hao [Fri, 30 Sep 2016 22:55:17 +0000 (22:55 +0000)]
Merge "String Compression for ARM and ARM64"
am: e89e1b5fa2

Change-Id: I1d81afc30cf5c3170e56d94787f9ab0cff80ce69

7 years agoMerge "String compression on intrinsics x86 and x86_64"
Jeff Hao [Fri, 30 Sep 2016 22:55:03 +0000 (22:55 +0000)]
Merge "String compression on intrinsics x86 and x86_64"
am: f2ebe98e32

Change-Id: I36f94d80eab93b13e3d2fd44ca3b0597077d476c

7 years agoMerge "String Compression for ARM and ARM64"
Jeff Hao [Fri, 30 Sep 2016 22:52:13 +0000 (22:52 +0000)]
Merge "String Compression for ARM and ARM64"

7 years agoMerge "String compression on intrinsics x86 and x86_64"
Jeff Hao [Fri, 30 Sep 2016 22:44:45 +0000 (22:44 +0000)]
Merge "String compression on intrinsics x86 and x86_64"

7 years agoMerge "ART: Add odex IMT dumping to oatdump" am: 6fa67a0261 am: 8980248138
Andreas Gampe [Fri, 30 Sep 2016 22:38:33 +0000 (22:38 +0000)]
Merge "ART: Add odex IMT dumping to oatdump" am: 6fa67a0261 am: 8980248138
am: f726e16ce3

Change-Id: Ida0a6b3f89fda6b7a7be05929df8dd685cf16b18

7 years agoMerge "ART: Add odex IMT dumping to oatdump" am: 6fa67a0261
Andreas Gampe [Fri, 30 Sep 2016 22:35:00 +0000 (22:35 +0000)]
Merge "ART: Add odex IMT dumping to oatdump" am: 6fa67a0261
am: 8980248138

Change-Id: Ib11ad01348970fd22ac30cf80ec25facc2120841

7 years agoMerge "ART: Add odex IMT dumping to oatdump"
Andreas Gampe [Fri, 30 Sep 2016 22:30:30 +0000 (22:30 +0000)]
Merge "ART: Add odex IMT dumping to oatdump"
am: 6fa67a0261

Change-Id: Ia9d8f1728aa20ac6b8b2b9dbd7238191fbdc9422

7 years agoMerge "Set coverage to false for dex2oat." am: dd26fef65a am: 818f49e898
Vishwath Mohan [Fri, 30 Sep 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Set coverage to false for dex2oat." am: dd26fef65a am: 818f49e898
am: d70dd12402

Change-Id: I6d16e601096301af2ff21cb38fee452d9423e07d

7 years agoMerge "ART: Add odex IMT dumping to oatdump"
Treehugger Robot [Fri, 30 Sep 2016 22:20:10 +0000 (22:20 +0000)]
Merge "ART: Add odex IMT dumping to oatdump"

7 years agoMerge "Set coverage to false for dex2oat." am: dd26fef65a
Vishwath Mohan [Fri, 30 Sep 2016 22:20:00 +0000 (22:20 +0000)]
Merge "Set coverage to false for dex2oat." am: dd26fef65a
am: 818f49e898

Change-Id: I69fb0180eda85e1f5c7ad8a2ca2450dc2125af76

7 years agoMerge "Set coverage to false for dex2oat."
Vishwath Mohan [Fri, 30 Sep 2016 22:16:29 +0000 (22:16 +0000)]
Merge "Set coverage to false for dex2oat."
am: dd26fef65a

Change-Id: Ieeb29431a3b3b2798bbab118fae7165e1bbfa193

7 years agoMerge "Set coverage to false for dex2oat."
Treehugger Robot [Fri, 30 Sep 2016 22:08:56 +0000 (22:08 +0000)]
Merge "Set coverage to false for dex2oat."

7 years agoReserve space in the char backing vector to prevent reallocations
Ben Gruver [Fri, 30 Sep 2016 20:10:42 +0000 (13:10 -0700)]
Reserve space in the char backing vector to prevent reallocations

The pointers in image_filenames_ and oat_filenames can become invalidated
if the char_backing_storage_ vector gets reallocated when adding strings.

Test: mma test-art-host-gtest-dex2oat_test
Change-Id: I82714468163ce49ce53953e6edcb57a17d46cdbb

7 years agoMerge "Remove dependency on libcutils" am: 4f0cabfe13 am: 2da7492dc8
Dimitry Ivanov [Fri, 30 Sep 2016 17:59:08 +0000 (17:59 +0000)]
Merge "Remove dependency on libcutils" am: 4f0cabfe13 am: 2da7492dc8
am: 35829c75d1

Change-Id: I71e31d2bceb6748c84c2e65d4dfacc08e6b8904a

7 years agoString Compression for ARM and ARM64
jessicahandojo [Sat, 10 Sep 2016 02:01:32 +0000 (19:01 -0700)]
String Compression for ARM and ARM64

Changes on intrinsics and Code Generation on ARM and ARM64
for string compression feature. Currently the feature is off.

The size of boot.oat and boot.art for ARM before and after the
changes (feature OFF) are still. When the feature ON,
boot.oat increased by 0.60% and boot.art decreased by 9.38%.

Meanwhile for ARM64, size of boot.oat and boot.art before and
after changes (feature OFF) are still. When the feature ON,
boot.oat increased by 0.48% and boot.art decreased by 6.58%.

Turn feature on: runtime/mirror/string.h (kUseStringCompression = true)
runtime/asm_support.h (STRING_COMPRESSION_FEATURE 1)

Test: m -j31 test-art-target
All tests passed both when the mirror::kUseStringCompression
is ON and OFF.

Bug: 31040547
Change-Id: I24e86b99391df33ba27df747779b648c5a820649

7 years agoMerge "Remove dependency on libcutils" am: 4f0cabfe13
Dimitry Ivanov [Fri, 30 Sep 2016 17:48:07 +0000 (17:48 +0000)]
Merge "Remove dependency on libcutils" am: 4f0cabfe13
am: 2da7492dc8

Change-Id: Id36a3883f3b67a2f0c2ae94336683647054b40ee

7 years agoMerge "Remove dependency on libcutils"
Dimitry Ivanov [Fri, 30 Sep 2016 17:43:15 +0000 (17:43 +0000)]
Merge "Remove dependency on libcutils"
am: 4f0cabfe13

Change-Id: Ib9a9717dac149f4a74a5893d614ac1f36bfed0e7

7 years agoMerge "Remove dependency on libcutils"
Dimitry Ivanov [Fri, 30 Sep 2016 17:37:57 +0000 (17:37 +0000)]
Merge "Remove dependency on libcutils"

7 years agoMerge "Revert "Store resolved Strings for AOT code in .bss."" am: 523b51537f am:...
Vladimir Marko [Fri, 30 Sep 2016 17:24:36 +0000 (17:24 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss."" am: 523b51537f am: c8c8407648
am: 4e98fb60ff

Change-Id: Ia6652d0df4c86788a86f8d35bb5b177412bcc99d

7 years agoMerge "Revert "Store resolved Strings for AOT code in .bss."" am: 523b51537f
Vladimir Marko [Fri, 30 Sep 2016 17:21:36 +0000 (17:21 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss."" am: 523b51537f
am: c8c8407648

Change-Id: Ifa5b9cb9c85e9737461eaa394107f1dea455ddaa

7 years agoMerge "Revert "Store resolved Strings for AOT code in .bss.""
Vladimir Marko [Fri, 30 Sep 2016 17:18:36 +0000 (17:18 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss.""
am: 523b51537f

Change-Id: I563f9b4aed5a86279a926c0bd240d0fc39017f93

7 years agoMerge "Revert "Store resolved Strings for AOT code in .bss.""
Vladimir Marko [Fri, 30 Sep 2016 17:12:41 +0000 (17:12 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss.""

7 years agoString compression on intrinsics x86 and x86_64
jessicahandojo [Fri, 9 Sep 2016 02:49:13 +0000 (19:49 -0700)]
String compression on intrinsics x86 and x86_64

Changes on intrinsics and Code Generation (x86 and x86_64)
for string compression feature. Currently the feature is off.

The size of boot.oat and boot.art for x86 before and after the
changes (feature OFF) are still. When the feature ON,
boot.oat increased by 0.83% and boot.art decreased by 19.32%.

Meanwhile for x86_64, size of boot.oat and boot.art before and
after changes (feature OFF) are still. When the feature ON,
boot.oat increased by 0.87% and boot.art decreased by 6.59%.

Turn feature on: runtime/mirror/string.h (kUseStringCompression = true)
runtime/asm_support.h (STRING_COMPRESSION_FEATURE 1)

Test: m -j31 test-art-host
All tests passed both when the mirror::kUseStringCompression
is ON and OFF.

The jni_internal_test changed to assert an empty string length
to be equal -(1 << 31) as it is compressed.

Bug: 31040547
Change-Id: Ia447c9b147cabb6a69e6ded86be1fe0c46d9638d

7 years agoRevert "Store resolved Strings for AOT code in .bss."
Vladimir Marko [Fri, 30 Sep 2016 17:04:49 +0000 (17:04 +0000)]
Revert "Store resolved Strings for AOT code in .bss."

There are some issues with oat_test64 on host and aosp_mips-eng.

Also reverts "compiler_driver: Fix build."

Bug: 20323084
Bug: 30627598

This reverts commit 63dccbbefef3014c99c22748d18befcc7bcb3b41.
This reverts commit 04a44135ace10123f059373691594ae0f270a8a4.

Change-Id: I568ba3e58cf103987fdd63c8a21521010a9f27c4

7 years agoMerge "Make run-test fail if output-path is too long" am: 9e5739aaa6 am: edc3bec952
Wojciech Staszkiewicz [Fri, 30 Sep 2016 16:55:34 +0000 (16:55 +0000)]
Merge "Make run-test fail if output-path is too long" am: 9e5739aaa6 am: edc3bec952
am: 644c3d5837

Change-Id: Ia8790806e7e5c67f43029460072c82a4f22ea62b

7 years agoMerge "Make run-test fail if output-path is too long" am: 9e5739aaa6
Wojciech Staszkiewicz [Fri, 30 Sep 2016 16:53:06 +0000 (16:53 +0000)]
Merge "Make run-test fail if output-path is too long" am: 9e5739aaa6
am: edc3bec952

Change-Id: I85d75afbebb469ed630688e9cddf50332ba27b16

7 years agoMerge "Make run-test fail if output-path is too long"
Wojciech Staszkiewicz [Fri, 30 Sep 2016 16:50:02 +0000 (16:50 +0000)]
Merge "Make run-test fail if output-path is too long"
am: 9e5739aaa6

Change-Id: Ie07a4925a02fdec690fa4e83ed7a74d05db28d1f

7 years agoART: Add odex IMT dumping to oatdump
Andreas Gampe [Fri, 30 Sep 2016 02:50:27 +0000 (19:50 -0700)]
ART: Add odex IMT dumping to oatdump

Support scanning oat files besides the boot image.

Bug: 31594153
Test: m test-art-host
Change-Id: I672d0534b8a8274a4430217656b68c55e4b31cc4

7 years agoMerge "Make run-test fail if output-path is too long"
Treehugger Robot [Fri, 30 Sep 2016 16:42:48 +0000 (16:42 +0000)]
Merge "Make run-test fail if output-path is too long"

7 years agoRemove dependency on libcutils
Dimitry Ivanov [Wed, 28 Sep 2016 09:44:00 +0000 (02:44 -0700)]
Remove dependency on libcutils

Use liblog for liblog (instead of libcutils)
Replace calls to property_get with libbase
GetProperty()

Bug: http://b/31289077
Bug: http://b/27171986
Test: remove liblog from libcutils and recompile
Test: make test-art-target -j4
Change-Id: I2a2913af8f521131558e9dd672d3973a64a410d3

7 years agoMerge "Add const-string benchmark." am: 93acbaca3b am: 8c9ce06bfc
Vladimir Marko [Fri, 30 Sep 2016 15:00:27 +0000 (15:00 +0000)]
Merge "Add const-string benchmark." am: 93acbaca3b am: 8c9ce06bfc
am: 8620720910

Change-Id: I8f02758f6f77247ce128353fdcc0a28145e3d4ce

7 years agoMerge "Add const-string benchmark." am: 93acbaca3b
Vladimir Marko [Fri, 30 Sep 2016 14:57:53 +0000 (14:57 +0000)]
Merge "Add const-string benchmark." am: 93acbaca3b
am: 8c9ce06bfc

Change-Id: I423bb2ca1aba550c9aec902ea45cbaef339c9905

7 years agoMerge "Add const-string benchmark."
Vladimir Marko [Fri, 30 Sep 2016 14:55:24 +0000 (14:55 +0000)]
Merge "Add const-string benchmark."
am: 93acbaca3b

Change-Id: Id1f730f86ed90666a8964e9c0083d7facbd4f3c4

7 years agoMerge "Add const-string benchmark."
Treehugger Robot [Fri, 30 Sep 2016 14:50:55 +0000 (14:50 +0000)]
Merge "Add const-string benchmark."

7 years agoMerge "compiler_driver: Fix build." am: 33531dcb91 am: 8e5e03a333
Nicolas Geoffray [Fri, 30 Sep 2016 14:46:55 +0000 (14:46 +0000)]
Merge "compiler_driver: Fix build." am: 33531dcb91 am: 8e5e03a333
am: 5008612237

Change-Id: Idd4abb6936460a2e3ffb3013182c6c8809d0cf27

7 years agoMerge "compiler_driver: Fix build." am: 33531dcb91
Nicolas Geoffray [Fri, 30 Sep 2016 14:43:55 +0000 (14:43 +0000)]
Merge "compiler_driver: Fix build." am: 33531dcb91
am: 8e5e03a333

Change-Id: I4c235617f53e49e731389a53e5094ec391f90d16

7 years agoMerge "compiler_driver: Fix build."
Nicolas Geoffray [Fri, 30 Sep 2016 14:40:54 +0000 (14:40 +0000)]
Merge "compiler_driver: Fix build."
am: 33531dcb91

Change-Id: Ice81e20bdf9ff85aa1893a065e996b53afff6dc8

7 years agoMerge "compiler_driver: Fix build."
Nicolas Geoffray [Fri, 30 Sep 2016 14:36:37 +0000 (14:36 +0000)]
Merge "compiler_driver: Fix build."

7 years agocompiler_driver: Fix build.
Narayan Kamath [Fri, 30 Sep 2016 14:24:19 +0000 (15:24 +0100)]
compiler_driver: Fix build.

Test: make-art-host
Change-Id: I94e164ed245caea60fe26872a943ea5e14aa8860

7 years agoMerge "Store resolved Strings for AOT code in .bss." am: 428792553e am: ee963538f4
Vladimir Marko [Fri, 30 Sep 2016 14:21:23 +0000 (14:21 +0000)]
Merge "Store resolved Strings for AOT code in .bss." am: 428792553e am: ee963538f4
am: 45c93615dc

Change-Id: I1c76a574a202a1c8caaa683ad696a050c5d4635e

7 years agoMerge "Store resolved Strings for AOT code in .bss." am: 428792553e
Vladimir Marko [Fri, 30 Sep 2016 14:18:22 +0000 (14:18 +0000)]
Merge "Store resolved Strings for AOT code in .bss." am: 428792553e
am: ee963538f4

Change-Id: Iee680059376b707408c4c36a94155a0bb43c8019

7 years agoMerge "Store resolved Strings for AOT code in .bss."
Vladimir Marko [Fri, 30 Sep 2016 14:15:23 +0000 (14:15 +0000)]
Merge "Store resolved Strings for AOT code in .bss."
am: 428792553e

Change-Id: I975dfaa7b4f2fad3f38557db18705f1b90b6a0bb

7 years agoMerge "Store resolved Strings for AOT code in .bss."
Vladimir Marko [Fri, 30 Sep 2016 14:10:21 +0000 (14:10 +0000)]
Merge "Store resolved Strings for AOT code in .bss."

7 years agoMerge "Simplify our intrinsic recognizer." am: ce157a6864 am: d6fa0694b8
Nicolas Geoffray [Fri, 30 Sep 2016 11:49:13 +0000 (11:49 +0000)]
Merge "Simplify our intrinsic recognizer." am: ce157a6864 am: d6fa0694b8
am: c11038a114

Change-Id: I29f7ad5698857d74d22cbaa0399561f400d8392c

7 years agoMerge "Simplify our intrinsic recognizer." am: ce157a6864
Nicolas Geoffray [Fri, 30 Sep 2016 11:46:11 +0000 (11:46 +0000)]
Merge "Simplify our intrinsic recognizer." am: ce157a6864
am: d6fa0694b8

Change-Id: I6aa2cbc1a6b8cb609bfa47a054e961556a79f72e

7 years agoMerge "Simplify our intrinsic recognizer."
Nicolas Geoffray [Fri, 30 Sep 2016 11:43:41 +0000 (11:43 +0000)]
Merge "Simplify our intrinsic recognizer."
am: ce157a6864

Change-Id: I9003fead7a2e09396ce696475a623a5944f520fb

7 years agoMerge "Simplify our intrinsic recognizer."
Treehugger Robot [Fri, 30 Sep 2016 11:38:56 +0000 (11:38 +0000)]
Merge "Simplify our intrinsic recognizer."

7 years agoMerge "Move two dangling mirror objects into handles." am: 394b8b23df am: 83b19c2779
Nicolas Geoffray [Fri, 30 Sep 2016 10:58:51 +0000 (10:58 +0000)]
Merge "Move two dangling mirror objects into handles." am: 394b8b23df am: 83b19c2779
am: 2843fcd645

Change-Id: I331b51f8223b6a89eb97e6bbe825fc13de5ad846

7 years agoMove two dangling mirror objects into handles. am: 9d07414a25 am: cc922c40c5
Nicolas Geoffray [Fri, 30 Sep 2016 10:58:39 +0000 (10:58 +0000)]
Move two dangling mirror objects into handles. am: 9d07414a25 am: cc922c40c5
am: 00385e42eb

Change-Id: If697dca4ecd7453af01d4252c804a5083f582b4d

7 years agoMerge "Move two dangling mirror objects into handles." am: 394b8b23df
Nicolas Geoffray [Fri, 30 Sep 2016 10:55:51 +0000 (10:55 +0000)]
Merge "Move two dangling mirror objects into handles." am: 394b8b23df
am: 83b19c2779

Change-Id: I873bbd2907df9de4009728cac8b0a868e8f5c865

7 years agoMove two dangling mirror objects into handles. am: 9d07414a25
Nicolas Geoffray [Fri, 30 Sep 2016 10:55:37 +0000 (10:55 +0000)]
Move two dangling mirror objects into handles. am: 9d07414a25
am: cc922c40c5

Change-Id: I08f87316651ee9e55e44f155c696eea4e7a09687

7 years agoMerge "Move two dangling mirror objects into handles."
Nicolas Geoffray [Fri, 30 Sep 2016 10:53:09 +0000 (10:53 +0000)]
Merge "Move two dangling mirror objects into handles."
am: 394b8b23df

Change-Id: I3894384ac26a0035e8cdfb95a2ef8c7de6db90a2

7 years agoMove two dangling mirror objects into handles.
Nicolas Geoffray [Fri, 30 Sep 2016 10:53:08 +0000 (10:53 +0000)]
Move two dangling mirror objects into handles.
am: 9d07414a25

Change-Id: I578649ec9cf9cf3d921b2871658fd27d16478c34

7 years agoMerge "Move two dangling mirror objects into handles."
Treehugger Robot [Fri, 30 Sep 2016 10:47:24 +0000 (10:47 +0000)]
Merge "Move two dangling mirror objects into handles."

7 years agoAdd const-string benchmark.
Vladimir Marko [Fri, 30 Sep 2016 10:21:07 +0000 (11:21 +0100)]
Add const-string benchmark.

Test: vogar --benchmark art/benchmark/const-string/src/ConstStringBenchmark.java
Bug: 20323084
Change-Id: I6b0b9cc8de19694ca43221b3224ac09eaa54d9ff

7 years agoSimplify our intrinsic recognizer.
Nicolas Geoffray [Fri, 15 Jul 2016 14:28:35 +0000 (15:28 +0100)]
Simplify our intrinsic recognizer.

- Use the modifiers for storing the intrinsic kind.
- Delete dex_file_method_inliner and its associated map.

This work was also motivated by the fact that the inline
method analyzer leaks intrinsic tables, and even worse, might re-use
a table from one dex file to another unrelated dex file in the presence
of class unloading and the unlikely event of the dex files getting
the same address.

test: m test-art-host m test-art-target

Change-Id: Ia653d2c72df13889dc85dd8c84997582c034ea4b

7 years agoMove two dangling mirror objects into handles.
Nicolas Geoffray [Fri, 30 Sep 2016 08:51:32 +0000 (09:51 +0100)]
Move two dangling mirror objects into handles.

test: libcore.java.lang.reflect.MissingClassesTest#testGetFieldFails
test: ./art/tools/run-libcore-tests.sh --mode=host --variant=X64
Change-Id: Ib708e914cac6abe4d4fc7cb88e258da83a8219ab

7 years agoMerge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>" am: b4cf427734 am...
Narayan Kamath [Fri, 30 Sep 2016 09:06:29 +0000 (09:06 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>" am: b4cf427734 am: c7a8774d3e
am: ecc4249860

Change-Id: I362254654c6e0014262cb1c580e22d0d0312100f

7 years agoMerge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>" am: b4cf427734
Narayan Kamath [Fri, 30 Sep 2016 09:01:00 +0000 (09:01 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>" am: b4cf427734
am: c7a8774d3e

Change-Id: I6c90828f038ea4162a0d122a5ec7f07e581e7a96

7 years agoMerge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"
Narayan Kamath [Fri, 30 Sep 2016 08:55:00 +0000 (08:55 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"
am: b4cf427734

Change-Id: I00c8954ea23bb2a5982c9c7214f04d100305ec49

7 years agoMerge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"
Treehugger Robot [Fri, 30 Sep 2016 08:52:28 +0000 (08:52 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"

7 years agoMerge "Clean up ScopedThreadStateChange to use ObjPtr" am: 74a69eda05 am: 039ef51ee7
Mathieu Chartier [Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)]
Merge "Clean up ScopedThreadStateChange to use ObjPtr" am: 74a69eda05 am: 039ef51ee7
am: 1becf77e92

Change-Id: I1e19a8ae4eb3eec0a2c25e072e577f66af0c0010

7 years agoMerge "Clean up ScopedThreadStateChange to use ObjPtr" am: 74a69eda05
Mathieu Chartier [Fri, 30 Sep 2016 02:40:33 +0000 (02:40 +0000)]
Merge "Clean up ScopedThreadStateChange to use ObjPtr" am: 74a69eda05
am: 039ef51ee7

Change-Id: Ibb7c20e2a4701106b4c525f0e0a1276c9baa4542

7 years agoMerge "Clean up ScopedThreadStateChange to use ObjPtr"
Mathieu Chartier [Fri, 30 Sep 2016 02:38:33 +0000 (02:38 +0000)]
Merge "Clean up ScopedThreadStateChange to use ObjPtr"
am: 74a69eda05

Change-Id: I9e2d90b06745f0790c1321e95c9af795958d090c

7 years agoMerge "Clean up ScopedThreadStateChange to use ObjPtr"
Mathieu Chartier [Fri, 30 Sep 2016 02:33:08 +0000 (02:33 +0000)]
Merge "Clean up ScopedThreadStateChange to use ObjPtr"

7 years agoClean up ScopedThreadStateChange to use ObjPtr
Mathieu Chartier [Wed, 28 Sep 2016 01:43:30 +0000 (18:43 -0700)]
Clean up ScopedThreadStateChange to use ObjPtr

Also fixed inclusion of -inl.h files in .h files by adding
scoped_object_access-inl.h and scoped_fast_natvie_object_access-inl.h

Changed AddLocalReference / Decode to use ObjPtr.

Changed libartbenchmark to be debug to avoid linkage errors.

Bug: 31113334

Test: test-art-host

Change-Id: I4d2e160483a29d21e1e0e440585ed328b9811483

7 years agoSet coverage to false for dex2oat.
Vishwath Mohan [Thu, 29 Sep 2016 22:05:51 +0000 (15:05 -0700)]
Set coverage to false for dex2oat.

dex2oat explicitly sets address to false when SANITIZE_TARGET is
non-empty, in order to prevent it being compiled with ASAN. This CL also
sets coverage to false to prevent build errors when
SANITIZE_TARGET="address coverage" (because coverage currently does not
work without address).

Bug: 29188876
Test: SANITIZE_TARGET="address coverage" builds without error
Change-Id: I0faeb7fab76678b923af732235188e19e08ea90c

7 years agodex_cache: rewrite StringDexCachePair as DexCachePair<T>
Narayan Kamath [Thu, 29 Sep 2016 16:07:20 +0000 (17:07 +0100)]
dex_cache: rewrite StringDexCachePair as DexCachePair<T>

.. with [T = mirror::String]. This is in preparation for introducing
a dex cache array for MethodTypes, which will be treated the same way.

Test: make test-art-host
bug: 30550796
Change-Id: Ief4455b4c6e4c9dd897f2c40b14b843a57b1dc8e

7 years agoStore resolved Strings for AOT code in .bss.
Vladimir Marko [Wed, 21 Sep 2016 12:51:10 +0000 (13:51 +0100)]
Store resolved Strings for AOT code in .bss.

And do some related refactorings.

Bug: 20323084
Bug: 30627598
Test: Run ART test suite including gcstress on host and Nexus 9.
Test: Run ART test suite including gcstress with baker CC on host and Nexus 9.
Test: Build aosp_mips64-eng.
Change-Id: I1b12c1570fee8e5da490b47f231050142afcbd1e

7 years agoMerge "java.lang.invoke: Add mirror types for MethodHandle / MethodType." am: d1224dc...
Narayan Kamath [Thu, 29 Sep 2016 14:33:12 +0000 (14:33 +0000)]
Merge "java.lang.invoke: Add mirror types for MethodHandle / MethodType." am: d1224dce59 am: b39ba157aa
am: 7a632d262d

Change-Id: I8038c5d169ec49e3675f184a621dd0cce59c1970

7 years agoMerge "java.lang.invoke: Add mirror types for MethodHandle / MethodType." am: d1224dce59
Narayan Kamath [Thu, 29 Sep 2016 14:28:07 +0000 (14:28 +0000)]
Merge "java.lang.invoke: Add mirror types for MethodHandle / MethodType." am: d1224dce59
am: b39ba157aa

Change-Id: I290a68b3a9e69e6409401b05031e38aafa54e14d

7 years agoMerge "java.lang.invoke: Add mirror types for MethodHandle / MethodType."
Narayan Kamath [Thu, 29 Sep 2016 14:23:37 +0000 (14:23 +0000)]
Merge "java.lang.invoke: Add mirror types for MethodHandle / MethodType."
am: d1224dce59

Change-Id: I2cab21c8d33b0f3facc5d3ec162d160a596b3fb3