OSDN Git Service

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

7 years agoMerge "Print to System.err to avoid output races."
Treehugger Robot [Thu, 29 Sep 2016 09:51:52 +0000 (09:51 +0000)]
Merge "Print to System.err to avoid output races."

7 years agoMerge "ARM64: Update the disassembler after the VIXL update."
Nicolas Geoffray [Thu, 29 Sep 2016 08:57:54 +0000 (08:57 +0000)]
Merge "ARM64: Update the disassembler after the VIXL update."
am: 6a2cd493c1

Change-Id: Ic1591bfb5e7ef20a62b63cc749a0b3b280af41bf

7 years agoMerge "ARM64: Update the disassembler after the VIXL update."
Nicolas Geoffray [Thu, 29 Sep 2016 08:49:06 +0000 (08:49 +0000)]
Merge "ARM64: Update the disassembler after the VIXL update."

7 years agoPrint to System.err to avoid output races.
Nicolas Geoffray [Thu, 29 Sep 2016 08:00:46 +0000 (09:00 +0100)]
Print to System.err to avoid output races.

test: run-test 054
Change-Id: I40ee02b377bd982090e74238dae0fddbde126a80

7 years agoMerge "Fix true divergence mode"
Wojciech Staszkiewicz [Thu, 29 Sep 2016 00:58:48 +0000 (00:58 +0000)]
Merge "Fix true divergence mode"
am: 6e6c479a44

Change-Id: I9a2f1ec3d0c017d59e7d290e0f668f392970feb4

7 years agoMerge "Fix true divergence mode"
Treehugger Robot [Thu, 29 Sep 2016 00:56:11 +0000 (00:56 +0000)]
Merge "Fix true divergence mode"

7 years agoMerge "Update oat file version to 089"
Alex Light [Thu, 29 Sep 2016 00:05:44 +0000 (00:05 +0000)]
Merge "Update oat file version to 089"
am: dd2b8a5d78

Change-Id: I42f918627834f40220a4b90eb9496589be8ca315

7 years agoMerge "Update oat file version to 089"
Treehugger Robot [Wed, 28 Sep 2016 23:57:11 +0000 (23:57 +0000)]
Merge "Update oat file version to 089"

7 years agoMerge "jni: test CriticalNative with generic jni"
Igor Murashkin [Wed, 28 Sep 2016 23:21:11 +0000 (23:21 +0000)]
Merge "jni: test CriticalNative with generic jni"
am: 73dac6e366

Change-Id: I311fdcb80b48d6fdf13f3d07af2d939e9ed3f9cc

7 years agoFix true divergence mode
Wojciech Staszkiewicz [Wed, 28 Sep 2016 23:15:50 +0000 (16:15 -0700)]
Fix true divergence mode

Do not report TIMEOUT divergences in true divergence mode.

Test: ./run_jfuzz_test.py
Change-Id: I65e48ee6b3d90de0ba997a48b85445312cb0661f

7 years agoMerge "jni: test CriticalNative with generic jni"
Treehugger Robot [Wed, 28 Sep 2016 23:15:04 +0000 (23:15 +0000)]
Merge "jni: test CriticalNative with generic jni"

7 years agoMerge "Increase frame size for ASAN enabled builds."
Vishwath Mohan [Wed, 28 Sep 2016 23:01:39 +0000 (23:01 +0000)]
Merge "Increase frame size for ASAN enabled builds."
am: 0ba1ba2578

Change-Id: I94a3865f8c7ff8594bd40e87adc5b2be640fdf9e

7 years agoMerge "Increase frame size for ASAN enabled builds."
Treehugger Robot [Wed, 28 Sep 2016 22:56:25 +0000 (22:56 +0000)]
Merge "Increase frame size for ASAN enabled builds."

7 years agoMerge "ART: Add IMT stats and dumping to oatdump"
Andreas Gampe [Wed, 28 Sep 2016 22:31:37 +0000 (22:31 +0000)]
Merge "ART: Add IMT stats and dumping to oatdump"
am: f28fe69812

Change-Id: I82de0be9d49193172ad347d338642d6cda4197c4

7 years agoMerge "ART: Add IMT stats and dumping to oatdump"
Treehugger Robot [Wed, 28 Sep 2016 22:24:32 +0000 (22:24 +0000)]
Merge "ART: Add IMT stats and dumping to oatdump"

7 years agoUpdate oat file version to 089
Alex Light [Wed, 28 Sep 2016 22:04:03 +0000 (15:04 -0700)]
Update oat file version to 089

In order to ensure that the 088 oat version used in an internal branch
is not repeated in any other versions we are skipping it and moving
the oat version to 089.

Bug: 31789675
Test: mma test-art-host
Change-Id: Iaa2ba972caa223f8c747cc739aa4daa11eec3e33

7 years agoMerge "Use ObjPtr for reflection.cc/h/inl"
Mathieu Chartier [Wed, 28 Sep 2016 22:12:36 +0000 (22:12 +0000)]
Merge "Use ObjPtr for reflection.cc/h/inl"
am: 4d46970b8a

Change-Id: I5fa08f7fe0928d41eb36578e1348739ff2901374

7 years agoMerge "Use ObjPtr for reflection.cc/h/inl"
Mathieu Chartier [Wed, 28 Sep 2016 22:04:13 +0000 (22:04 +0000)]
Merge "Use ObjPtr for reflection.cc/h/inl"

7 years agoMerge "Gather divergences in single directory"
Wojciech Staszkiewicz [Wed, 28 Sep 2016 20:36:59 +0000 (20:36 +0000)]
Merge "Gather divergences in single directory"
am: 1c3ca75e63

Change-Id: I1fb9c199ae801b6a3f5336b2ba7bcf9f6d82ab62

7 years agoMake run-test fail if output-path is too long
Wojciech Staszkiewicz [Fri, 23 Sep 2016 17:59:55 +0000 (10:59 -0700)]
Make run-test fail if output-path is too long

Long output-path in no prebuild mode leads to silent fallback to
interpreter in dalvikvm.

This change ensures that we handle this situation by failing the
test.

Bug: 31597671
Test: m test-art-run-test -j
Change-Id: I19a7cee788760a81c9395be1252b2edab0db39f7

7 years agoART: Add IMT stats and dumping to oatdump
Andreas Gampe [Sun, 25 Sep 2016 23:08:35 +0000 (16:08 -0700)]
ART: Add IMT stats and dumping to oatdump

Add stats and IMT dumping to oatdump to help in the derivation
of a better hash.

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

7 years agojni: test CriticalNative with generic jni
Igor Murashkin [Wed, 28 Sep 2016 20:23:19 +0000 (13:23 -0700)]
jni: test CriticalNative with generic jni

Previously this combination was uncovered due to a missing
line in the macro definition.

Bug: 31400248
Test: make test-art-host
Change-Id: I5407f46f2394edc028c9b74dc783899a3a2f6588

7 years agoMerge "Gather divergences in single directory"
Treehugger Robot [Wed, 28 Sep 2016 20:22:28 +0000 (20:22 +0000)]
Merge "Gather divergences in single directory"

7 years agoGather divergences in single directory
Wojciech Staszkiewicz [Tue, 27 Sep 2016 20:09:34 +0000 (13:09 -0700)]
Gather divergences in single directory

Gather all divergences in a single directory to make investigating
them easier.

Test: ./run_jfuzz_test_nightly.py
Change-Id: I0fcdfb2f99e33d8bce444e5d5bf5092f282f03b1

7 years agoMerge "build: Fix golem build to exclude libartd.so from public.libraries.txt"
Igor Murashkin [Wed, 28 Sep 2016 18:17:50 +0000 (18:17 +0000)]
Merge "build: Fix golem build to exclude libartd.so from public.libraries.txt"
am: 6bee259767

Change-Id: I66761db635d71fa5b0d808e3b402a935f2da903a

7 years agoMerge "build: Fix golem build to exclude libartd.so from public.libraries.txt"
Treehugger Robot [Wed, 28 Sep 2016 18:11:47 +0000 (18:11 +0000)]
Merge "build: Fix golem build to exclude libartd.so from public.libraries.txt"

7 years agoMerge "ART: Dump referenced type in IRT overflows"
Andreas Gampe [Wed, 28 Sep 2016 18:08:49 +0000 (18:08 +0000)]
Merge "ART: Dump referenced type in IRT overflows"
am: d30e51ac25

Change-Id: Icae4a3a3bc24a24ba148ead726aa3823e106dd34

7 years agoMerge "ART: Dump referenced type in IRT overflows"
Treehugger Robot [Wed, 28 Sep 2016 18:01:40 +0000 (18:01 +0000)]
Merge "ART: Dump referenced type in IRT overflows"

7 years agoMerge "ART: Factor out IMT from ArtMethod"
Andreas Gampe [Wed, 28 Sep 2016 17:44:17 +0000 (17:44 +0000)]
Merge "ART: Factor out IMT from ArtMethod"
am: 7f7fb9c0dc

Change-Id: I578904513b435ad50eecc5b7ca676a6b52c45b86

7 years agoMerge "ART: Factor out IMT from ArtMethod"
Treehugger Robot [Wed, 28 Sep 2016 17:41:06 +0000 (17:41 +0000)]
Merge "ART: Factor out IMT from ArtMethod"

7 years agoART: Dump referenced type in IRT overflows
Andreas Gampe [Wed, 28 Sep 2016 01:45:02 +0000 (18:45 -0700)]
ART: Dump referenced type in IRT overflows

When the runtime dumps a reference table, e.g., when aborting for
an overflow, dump the type of stored referents for reference types
to aid in debugging leaks.

Bug: 31600693
Test: m test-art-host-gtest-reference_table_test
Change-Id: Ia892dc84ca8827dd93a8b75d6f571c392f94859c
(cherry picked from commit 280f32b095f55f24dc557f9a9067d223901214ce)

7 years agobuild: Fix golem build to exclude libartd.so from public.libraries.txt
Igor Murashkin [Wed, 28 Sep 2016 16:04:07 +0000 (09:04 -0700)]
build: Fix golem build to exclude libartd.so from public.libraries.txt

Golem doesn't build libartd.so, so at runtime the JNI loading would fail
when trying to initialize the android library namespaces.

Test: build-art-target-golem
Bug: 31401609
Change-Id: I2ee988e84d0a87b3cd1338d29fc28a874905cccc

7 years agoART: Factor out IMT from ArtMethod
Andreas Gampe [Mon, 26 Sep 2016 19:04:26 +0000 (12:04 -0700)]
ART: Factor out IMT from ArtMethod

Move IMT Conflict Table to its own file. Move IMT index computation to
ImTable.

In preparation for code using this independent of specific ArtMethods.

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

7 years agoMerge "Add support for Executable.getParameters() metadata"
Neil Fuller [Wed, 28 Sep 2016 12:33:01 +0000 (12:33 +0000)]
Merge "Add support for Executable.getParameters() metadata"
am: 1b6cf7fbca

Change-Id: Ifff7a9d2906cbfb5678357a111297b3f6d08b5dd

7 years agoMerge "Add support for Executable.getParameters() metadata"
Neil Fuller [Wed, 28 Sep 2016 12:29:53 +0000 (12:29 +0000)]
Merge "Add support for Executable.getParameters() metadata"

7 years agoAdd support for Executable.getParameters() metadata
Neil Fuller [Fri, 9 Sep 2016 13:24:51 +0000 (14:24 +0100)]
Add support for Executable.getParameters() metadata

java.lang.reflect.Executable native code to create Parameter
objects and supporting code for obtaining the system annotations
that hold the parameter metadata.

Bug: 30391692
Test: test-art-host and CtsLibcoreTestCases
Change-Id: I23d7e36014716967ce189fba5955cc5e064fe8d0

7 years agoMerge "benchmark: Add jni benchmarks for use in golem"
Nicolas Geoffray [Wed, 28 Sep 2016 08:27:42 +0000 (08:27 +0000)]
Merge "benchmark: Add jni benchmarks for use in golem"
am: fd8339e58e

Change-Id: I0dee551a90754c31ebdaece9c19b27e317b0ad3b

7 years agoMerge "benchmark: Add jni benchmarks for use in golem"
Nicolas Geoffray [Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)]
Merge "benchmark: Add jni benchmarks for use in golem"

7 years agoMerge "Handle tests which fail with no methods compiled"
Wojciech Staszkiewicz [Wed, 28 Sep 2016 02:22:33 +0000 (02:22 +0000)]
Merge "Handle tests which fail with no methods compiled"
am: 161243e480

Change-Id: I574fbd4a6089fc873bfaee22ab8ceb336568b900

7 years agoMerge "Store bisection logs in test directory"
Wojciech Staszkiewicz [Wed, 28 Sep 2016 02:22:19 +0000 (02:22 +0000)]
Merge "Store bisection logs in test directory"
am: 36cbbde646

Change-Id: I17b58431a9850cc4546e7ee480ae577b224013b5

7 years agoMerge "Handle tests which fail with no methods compiled"
Treehugger Robot [Wed, 28 Sep 2016 02:19:49 +0000 (02:19 +0000)]
Merge "Handle tests which fail with no methods compiled"

7 years agoMerge "Store bisection logs in test directory"
Treehugger Robot [Wed, 28 Sep 2016 02:14:34 +0000 (02:14 +0000)]
Merge "Store bisection logs in test directory"

7 years agoMerge "Fix a CC deadlock in 129-ThreadGetId."
Hiroshi Yamauchi [Tue, 27 Sep 2016 23:59:40 +0000 (23:59 +0000)]
Merge "Fix a CC deadlock in 129-ThreadGetId."
am: b737745c79

Change-Id: Ie8024f2735625f760e3d5ab063de97b86e91a4d6

7 years agoMerge "Fix a CC deadlock in 129-ThreadGetId."
Treehugger Robot [Tue, 27 Sep 2016 23:53:08 +0000 (23:53 +0000)]
Merge "Fix a CC deadlock in 129-ThreadGetId."

7 years agoUse ObjPtr for reflection.cc/h/inl
Mathieu Chartier [Tue, 27 Sep 2016 01:13:17 +0000 (18:13 -0700)]
Use ObjPtr for reflection.cc/h/inl

Changed Pretty helpers to use this to reduce usage of Decode. The
eventual goal is not have almost any calls to ObjPtr::Decode.

Moved ObjPtr out of mirror namespace for convenience. Added more
PoisonObjectPointers calls in class linker, thread suspension.

Bug: 31113334

Test: test-art-host

Change-Id: I44d08db5143d95ed1b65e2f00f9749ef5cf379f7

7 years agoMerge "Add a true divergence mode to run_jfuzz_test.py"
Wojciech Staszkiewicz [Tue, 27 Sep 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Add a true divergence mode to run_jfuzz_test.py"
am: 05ce52b406

Change-Id: Ic9db912f397700212df5dae4ac9b9b946c4e4d9b

7 years agoMerge "Add a true divergence mode to run_jfuzz_test.py"
Treehugger Robot [Tue, 27 Sep 2016 20:12:21 +0000 (20:12 +0000)]
Merge "Add a true divergence mode to run_jfuzz_test.py"

7 years agoMerge "Add basic support for object pointer poisoning"
Mathieu Chartier [Tue, 27 Sep 2016 18:26:16 +0000 (18:26 +0000)]
Merge "Add basic support for object pointer poisoning"
am: 83b13b32f3

Change-Id: I4d44d8e16303089d89351ac24a0600c80fa495d6

7 years agoMerge "Add basic support for object pointer poisoning"
Mathieu Chartier [Tue, 27 Sep 2016 18:17:00 +0000 (18:17 +0000)]
Merge "Add basic support for object pointer poisoning"

7 years agoFix a CC deadlock in 129-ThreadGetId.
Hiroshi Yamauchi [Mon, 26 Sep 2016 23:56:24 +0000 (16:56 -0700)]
Fix a CC deadlock in 129-ThreadGetId.

GC should consider a thread as "waiting for GC thread flip" or
"transitioning to runnable" only if its suspend count is 1.

See 31683379#7 for the deadlock scenario.

Bug: 31683379
Bug: 12687968
Test: test-art with CC and gcstress, N9 libartd boot, Ritz EAAC.
Change-Id: Icd2548bd6d9a4f8d7b54ed20150a4801af9e26a3

7 years agobenchmark: Add jni benchmarks for use in golem
Igor Murashkin [Thu, 22 Sep 2016 22:46:29 +0000 (15:46 -0700)]
benchmark: Add jni benchmarks for use in golem

Also adds libartbenchmark.so as a build dependency for golem targets

Test: make build-art-host-golem build-art-target-golem
Bug: 31401609
Change-Id: I3f6b11f93684cc8eb3534bb02bf2d3eb05e39dcf

7 years agoMerge "ART: Fix dependencies"
Andreas Gampe [Tue, 27 Sep 2016 15:18:05 +0000 (15:18 +0000)]
Merge "ART: Fix dependencies"
am: 38e1882858

Change-Id: If040142b21b56fe3e172e76a8d0efe9afd5afff6

7 years agoMerge "ART: Fix dependencies"
Andreas Gampe [Tue, 27 Sep 2016 15:10:57 +0000 (15:10 +0000)]
Merge "ART: Fix dependencies"

7 years agoMerge "Cleanup String.<init> handling."
Nicolas Geoffray [Tue, 27 Sep 2016 09:36:15 +0000 (09:36 +0000)]
Merge "Cleanup String.<init> handling."
am: adc4e8297c

Change-Id: I96e1fd961cb7e93358ec53dfc8c8e03e3598f43e

7 years agoMerge "Cleanup String.<init> handling."
Nicolas Geoffray [Tue, 27 Sep 2016 09:31:33 +0000 (09:31 +0000)]
Merge "Cleanup String.<init> handling."

7 years agoMerge "Fix no-prebuild failure."
Nicolas Geoffray [Tue, 27 Sep 2016 09:31:14 +0000 (09:31 +0000)]
Merge "Fix no-prebuild failure."
am: fc916a6c9a

Change-Id: I034c417313e32207b71dcb219f6499bca7233cfb

7 years agoCleanup String.<init> handling.
Nicolas Geoffray [Mon, 26 Sep 2016 16:56:07 +0000 (17:56 +0100)]
Cleanup String.<init> handling.

Move everything to one place (currently well_known_classes.cc, but
no strong preference) and define a macro to easily handle the list
of affected methods.

test: m test-art-host
test: m test-art-target
Change-Id: Ib8372d130d5458516a1f1ae31014afc76037fc34