OSDN Git Service

android-x86/art.git
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 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."
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

7 years agoMerge "Revert "Add dex file writer to dexlayout tool.""
Nicolas Geoffray [Tue, 4 Oct 2016 11:04:21 +0000 (11:04 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool.""
am: 148768f51e

Change-Id: I0a9e96f33e5be196fd5631bd58acd05de9e5a697

7 years agoMerge "Revert "Add dex file writer to dexlayout tool.""
Nicolas Geoffray [Tue, 4 Oct 2016 11:01:53 +0000 (11:01 +0000)]
Merge "Revert "Add dex file writer to dexlayout tool.""

7 years agoRevert "Add dex file writer to dexlayout tool."
Nicolas Geoffray [Tue, 4 Oct 2016 11:01:17 +0000 (11:01 +0000)]
Revert "Add dex file writer to dexlayout tool."

Bug: 29921113

This reverts commit 69b58cf399c3507ca3debf9ec9b2db3c5a0fe7f2.

Change-Id: I8bf9b1222d99489059e45f47d220396a853170a4

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon."
Narayan Kamath [Tue, 4 Oct 2016 08:38:43 +0000 (08:38 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon."
am: f12831352c

Change-Id: I6e97ab2c8f574cd794a8d3f3d0fe4762f92d8891

7 years agoMerge "interpreter: Remove unnecessary template arg from DoCallCommon."
Narayan Kamath [Tue, 4 Oct 2016 08:35:13 +0000 (08:35 +0000)]
Merge "interpreter: Remove unnecessary template arg from DoCallCommon."

7 years agointerpreter: Remove unnecessary template arg from DoCallCommon.
Narayan Kamath [Mon, 3 Oct 2016 15:51:22 +0000 (16:51 +0100)]
interpreter: Remove unnecessary template arg from DoCallCommon.

The function was always called with a fixed size array so there's
no real advantage in templatizing it this way.

Test: make build-art-host

Change-Id: I782e113225f1c97877f2bcb5afe8df9ae8efd26e

7 years agoMerge "Add handle wrapper for interpreter field get/set"
Mathieu Chartier [Tue, 4 Oct 2016 08:06:11 +0000 (08:06 +0000)]
Merge "Add handle wrapper for interpreter field get/set"
am: 8c2983be6c

Change-Id: Ic954db30680bb152d40378ed752387e4537337ca

7 years agoMerge "Add handle wrapper for interpreter field get/set"
Mathieu Chartier [Tue, 4 Oct 2016 08:02:59 +0000 (08:02 +0000)]
Merge "Add handle wrapper for interpreter field get/set"

7 years agoAdd handle wrapper for interpreter field get/set
Mathieu Chartier [Tue, 4 Oct 2016 05:49:46 +0000 (22:49 -0700)]
Add handle wrapper for interpreter field get/set

The listeners have thread suspension for jdwp tests.

Bug: 31113334

Test: tools/run-jdwp-tests.sh '--mode=host' '--variant=X32' --no-jit --debug

Change-Id: I08f17432cc0c79ee9a0163eb88d4d6355f6851ca

7 years agoMerge changes I50493bca,I8b266ad0
Mathieu Chartier [Tue, 4 Oct 2016 01:09:28 +0000 (01:09 +0000)]
Merge changes I50493bca,I8b266ad0
am: 5075b0e5e2

Change-Id: Id9374c534cf2dd03a4a71d38d83d3e670ca1ec7e

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
Mathieu Chartier [Tue, 4 Oct 2016 01:09:27 +0000 (01:09 +0000)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
am: b890130a66

Change-Id: I8394cd377bf81f4d367067d101a8734c3999d18e

7 years agoMove ArtField to ObjPtr
Mathieu Chartier [Tue, 4 Oct 2016 01:09:18 +0000 (01:09 +0000)]
Move ArtField to ObjPtr
am: 3398c7874e

Change-Id: I0aa82905394f02357eaaf96507382344ca6e6292

7 years agoMerge changes I50493bca,I8b266ad0
Mathieu Chartier [Tue, 4 Oct 2016 01:06:05 +0000 (01:06 +0000)]
Merge changes I50493bca,I8b266ad0

* changes:
  Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
  Move ArtField to ObjPtr

7 years agoCompute PPID at ninja time
Colin Cross [Mon, 3 Oct 2016 23:40:13 +0000 (16:40 -0700)]
Compute PPID at ninja time

Using $(shell $$PPID) to compute PPID will return the pid of kati, which
will be the same for multiple sequential runs of make without changing
any makefiles.  Replace it with a bash subshell command to return the pid
of ninja, which will be different for every call to make.

ART_HOST_TEST_DIR now contains $ that need to propagate to the final
bash command, and must be evaluated exactly once.  Escape the $ in
${ART_HOST_TEST_DIR} in define-test-art-run-test so that
${ART_HOST_TEST_DIR} is not substituted in the function call to prevent
evaluating its contents in the $(eval) that wraps it, which would
substitute out the necessary $.

Test: m -j test-art-host
Change-Id: I3303805481cc1c77d1a321674e8c7c003043a7c4

7 years agoMerge "Add dex file writer to dexlayout tool."
Jeff Hao [Tue, 4 Oct 2016 00:50:17 +0000 (00:50 +0000)]
Merge "Add dex file writer to dexlayout tool."
am: 3ee94eea2a

Change-Id: I45e84a7997c835bf2d556c8b4b0102bbe6b59b0f

7 years agoMerge "Add dex file writer to dexlayout tool."
Jeff Hao [Tue, 4 Oct 2016 00:46:26 +0000 (00:46 +0000)]
Merge "Add dex file writer to dexlayout tool."

7 years agoMerge "art: Replace cutils/log.h with android/log.h"
Mark Salyzyn [Mon, 3 Oct 2016 23:07:39 +0000 (23:07 +0000)]
Merge "art: Replace cutils/log.h with android/log.h"
am: bd590cbd0e

Change-Id: I4f4cf2064c2e1eb3c9c9f07c02da9bf272087c94

7 years agoMerge "art: Replace cutils/log.h with android/log.h"
Mark Salyzyn [Mon, 3 Oct 2016 23:02:27 +0000 (23:02 +0000)]
Merge "art: Replace cutils/log.h with android/log.h"

7 years agoUse ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest
Mathieu Chartier [Fri, 30 Sep 2016 17:27:43 +0000 (10:27 -0700)]
Use ObjPtr for ResolvedFieldAccessTest and ResolvedMethodAccessTest

Also added LookupResolvedType that is guaranteed to not do thread
suspension but deals with multidex since GetResolvedType will
return null if the type was resolved in another dex file.

Added test.

Bug: 31113334

Test: test-art-host CC baker

Change-Id: I50493bca7d8ce9760546c3116b717484c62c47a4

7 years agoAdd dex file writer to dexlayout tool.
Jeff Hao [Fri, 23 Sep 2016 01:02:49 +0000 (18:02 -0700)]
Add dex file writer to dexlayout tool.

All sections are being written out properly.
There is one small difference:
  - unindexed string data is not written out

Bug: 29921113
Test: mm test-art-host-gtest-dexlayout_test
Change-Id: I3872327526a350f33f0f851516a389622c1a54ae

7 years agoMerge "Run dexfuzz in bisection-search mode"
Aart Bik [Mon, 3 Oct 2016 21:31:34 +0000 (21:31 +0000)]
Merge "Run dexfuzz in bisection-search mode"
am: 6ba406580e

Change-Id: I11f9d561ed89856a8675e68b773d5adb98a24c9d

7 years agoMerge "Run dexfuzz in bisection-search mode"
Aart Bik [Mon, 3 Oct 2016 21:29:19 +0000 (21:29 +0000)]
Merge "Run dexfuzz in bisection-search mode"

7 years agoMove ArtField to ObjPtr
Mathieu Chartier [Fri, 30 Sep 2016 17:27:43 +0000 (10:27 -0700)]
Move ArtField to ObjPtr

Added EXPECT_OBJ_PTR_EQ and variants to gtests.

Fixed moving GC bugs in:
ClassLinker::CreatePathClassLoader
ClassLinkerTest: StaticFields

ObjPtr Decode call sites: 186 -> 181.

Some tests fail due to ResolvedFieldAccessTest, will fix in follow
up CL.

Bug: 31113334

Test: test-art-host CC baker

Change-Id: I8b266ad00f3c20c8cbe7cfdf280d175083df0b88

7 years agoRun dexfuzz in bisection-search mode
Wojciech Staszkiewicz [Thu, 29 Sep 2016 22:12:48 +0000 (15:12 -0700)]
Run dexfuzz in bisection-search mode

Call dexfuzz with --bisection-search switch to automatically bisect
discovered divergences.

Test: ./run_dex_fuzz_test.py
Change-Id: I87af8b45675b464e984a05e06eac24cad3650d2b

7 years agoMerge "benchmark: Add a build target that's not Android-dependent"
Igor Murashkin [Mon, 3 Oct 2016 19:43:58 +0000 (19:43 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent"
am: a845d07bbd

Change-Id: I681a857e3366bd6d61bd149c50ecdf9b3cbcf9a8

7 years agoMerge "benchmark: Add a build target that's not Android-dependent"
Treehugger Robot [Mon, 3 Oct 2016 19:39:28 +0000 (19:39 +0000)]
Merge "benchmark: Add a build target that's not Android-dependent"

7 years agoMerge "Delete some unused bitmap walking code"
Mathieu Chartier [Mon, 3 Oct 2016 18:41:59 +0000 (18:41 +0000)]
Merge "Delete some unused bitmap walking code"
am: 462e21cc8d

Change-Id: Ie01f34d37f895fadfb6e657deacfa8239ce6e4ba

7 years agoart: Replace cutils/log.h with android/log.h
Mark Salyzyn [Wed, 28 Sep 2016 22:29:14 +0000 (15:29 -0700)]
art: Replace cutils/log.h with android/log.h

Test: compile
Bug: 26552300
Bug: 31289077
Change-Id: Ie5720d9e1388047856392e8635895895c22f3112

7 years agoMerge "Delete some unused bitmap walking code"
Mathieu Chartier [Mon, 3 Oct 2016 18:27:26 +0000 (18:27 +0000)]
Merge "Delete some unused bitmap walking code"

7 years agobenchmark: Add a build target that's not Android-dependent
Igor Murashkin [Fri, 30 Sep 2016 21:12:14 +0000 (14:12 -0700)]
benchmark: Add a build target that's not Android-dependent

Allow building the micronative portion of libartbenchmark as pure JNI without any android
library dependencies.

Bug: 31401609
Change-Id: I99f1466fb668a9ae5dd2f7229dca44d3bb064e15

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."
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."
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"
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"
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"
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 "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."
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 agoDelete some unused bitmap walking code
Mathieu Chartier [Fri, 30 Sep 2016 17:59:32 +0000 (10:59 -0700)]
Delete some unused bitmap walking code

No longer required with newer versions of the image writer.

Test: mm -j32

Change-Id: I496bc49c80d84bfa3aada39f8c6e3e4e4dfb15d4

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"
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.""
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"
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."
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."
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."
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."
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."
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>"
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"
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."
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

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

7 years agojava.lang.invoke: Add mirror types for MethodHandle / MethodType.
Narayan Kamath [Wed, 3 Aug 2016 11:46:58 +0000 (12:46 +0100)]
java.lang.invoke: Add mirror types for MethodHandle / MethodType.

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

7 years agoMerge "Print to System.err to avoid output races."
Nicolas Geoffray [Thu, 29 Sep 2016 09:57:52 +0000 (09:57 +0000)]
Merge "Print to System.err to avoid output races."
am: 72795d0a33

Change-Id: Iaf87bd23a20a619592108d6e482c2121bda34155