OSDN Git Service

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

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." am: 72795d0a33
Nicolas Geoffray [Thu, 29 Sep 2016 10:02:23 +0000 (10:02 +0000)]
Merge "Print to System.err to avoid output races." am: 72795d0a33
am: d2a443fe08

Change-Id: Ib4a39e7698e0545b5896f533a05f1af0463a105d

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." am: 6a2cd493c1
Nicolas Geoffray [Thu, 29 Sep 2016 09:02:22 +0000 (09:02 +0000)]
Merge "ARM64: Update the disassembler after the VIXL update." am: 6a2cd493c1
am: f7ddbd4418

Change-Id: I87471b5c5acdafd9ef730da00f2cd2791fc1fc22

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" am: 6e6c479a44
Wojciech Staszkiewicz [Thu, 29 Sep 2016 01:01:49 +0000 (01:01 +0000)]
Merge "Fix true divergence mode" am: 6e6c479a44
am: e8fcd75d76

Change-Id: I6471a9be3877555005272d5214e3bfd9cbf07623

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" am: dd2b8a5d78
Alex Light [Thu, 29 Sep 2016 00:08:45 +0000 (00:08 +0000)]
Merge "Update oat file version to 089" am: dd2b8a5d78
am: 12e7c42563

Change-Id: Ie537f518707c3e1b566d488a7c35c151e91edb0d

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" am: 73dac6e366
Igor Murashkin [Wed, 28 Sep 2016 23:24:41 +0000 (23:24 +0000)]
Merge "jni: test CriticalNative with generic jni" am: 73dac6e366
am: 54fa0da6c3

Change-Id: I904b1b8135dccbfaf9fcaec0fd3ea62e6fd88712

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." am: 0ba1ba2578
Vishwath Mohan [Wed, 28 Sep 2016 23:04:40 +0000 (23:04 +0000)]
Merge "Increase frame size for ASAN enabled builds." am: 0ba1ba2578
am: 872d45a8b8

Change-Id: I5869f9d3f40029a21204a69f0b8f83477f7d96e2

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" am: f28fe69812
Andreas Gampe [Wed, 28 Sep 2016 22:34:37 +0000 (22:34 +0000)]
Merge "ART: Add IMT stats and dumping to oatdump" am: f28fe69812
am: d41f58754f

Change-Id: I4b78d3a0454554849696552e0efeb3828193550d

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" am: 4d46970b8a
Mathieu Chartier [Wed, 28 Sep 2016 22:17:09 +0000 (22:17 +0000)]
Merge "Use ObjPtr for reflection.cc/h/inl" am: 4d46970b8a
am: db7e1c3ba7

Change-Id: I1c3bde2ea76b4469579aea2ae37110ead154f958

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" am: 1c3ca75e63
Wojciech Staszkiewicz [Wed, 28 Sep 2016 20:44:01 +0000 (20:44 +0000)]
Merge "Gather divergences in single directory" am: 1c3ca75e63
am: 96d34b8a10

Change-Id: Ifc8b8cc288a3216f9d4dff0582eb31c3a9430940

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 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" am...
Igor Murashkin [Wed, 28 Sep 2016 18:20:50 +0000 (18:20 +0000)]
Merge "build: Fix golem build to exclude libartd.so from public.libraries.txt" am: 6bee259767
am: 99c7f50d1d

Change-Id: I1e9c0190a11e918df9425edf51e1810cb47aef54

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 "ART: Dump referenced type in IRT overflows" am: d30e51ac25
Andreas Gampe [Wed, 28 Sep 2016 18:11:49 +0000 (18:11 +0000)]
Merge "ART: Dump referenced type in IRT overflows" am: d30e51ac25
am: 9be96f5ea2

Change-Id: I595bd0a3c73db0637974fcb1c943b3f3c4407333

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" am: 7f7fb9c0dc
Andreas Gampe [Wed, 28 Sep 2016 17:46:48 +0000 (17:46 +0000)]
Merge "ART: Factor out IMT from ArtMethod" am: 7f7fb9c0dc
am: e082f3ae24

Change-Id: Ib2ec1576688ce7d97e5e4506ba837c4f3f8a9867

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" am: 1b6cf7fbca
Neil Fuller [Wed, 28 Sep 2016 12:36:03 +0000 (12:36 +0000)]
Merge "Add support for Executable.getParameters() metadata" am: 1b6cf7fbca
am: 96ebee6a0c

Change-Id: I91d75b94725c8e0160f98d28575014cd062bbcc5

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" am: fd8339e58e
Nicolas Geoffray [Wed, 28 Sep 2016 08:30:43 +0000 (08:30 +0000)]
Merge "benchmark: Add jni benchmarks for use in golem" am: fd8339e58e
am: d3ce806748

Change-Id: Id3f46ac8cf496228ee85d9581299a3c5342016f4

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" am: 161243e480
Wojciech Staszkiewicz [Wed, 28 Sep 2016 02:25:34 +0000 (02:25 +0000)]
Merge "Handle tests which fail with no methods compiled" am: 161243e480
am: 3bb328438d

Change-Id: I182c0db1b660bf1f62d915678886f3e7f5bffcb6

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

Change-Id: Id48e472319533aee72318434f225c1ac7a85fa46

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." am: b737745c79
Hiroshi Yamauchi [Wed, 28 Sep 2016 00:02:09 +0000 (00:02 +0000)]
Merge "Fix a CC deadlock in 129-ThreadGetId." am: b737745c79
am: 02db54f577

Change-Id: I8a9fc7c164e0af39a56c447855f734205800565d

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" am: 05ce52b406
Wojciech Staszkiewicz [Tue, 27 Sep 2016 20:24:25 +0000 (20:24 +0000)]
Merge "Add a true divergence mode to run_jfuzz_test.py" am: 05ce52b406
am: 93d2e2daf5

Change-Id: If6b88f65b8f87a0b672086fd90fa24340bbeffce

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" am: 83b13b32f3
Mathieu Chartier [Tue, 27 Sep 2016 18:29:17 +0000 (18:29 +0000)]
Merge "Add basic support for object pointer poisoning" am: 83b13b32f3
am: ba0ec99938

Change-Id: I887ec1517a1c4d65b2fab1de1d9639dc0652603c

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" am: 38e1882858
Andreas Gampe [Tue, 27 Sep 2016 15:20:34 +0000 (15:20 +0000)]
Merge "ART: Fix dependencies" am: 38e1882858
am: a89cf62ea1

Change-Id: Iafbbfbdd931b42ffef56b1b55f1ac00103e95544

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." am: adc4e8297c
Nicolas Geoffray [Tue, 27 Sep 2016 09:38:43 +0000 (09:38 +0000)]
Merge "Cleanup String.<init> handling." am: adc4e8297c
am: 915633426c

Change-Id: I90c1455a3c400b9ed9bff78ad857b45061ab0da1

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 "Fix no-prebuild failure." am: fc916a6c9a
Nicolas Geoffray [Tue, 27 Sep 2016 09:33:42 +0000 (09:33 +0000)]
Merge "Fix no-prebuild failure." am: fc916a6c9a
am: 214d712493

Change-Id: I6d1211980ec6677bf0e43ce1f444db35a4c88d7e

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

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

7 years agoFix no-prebuild failure.
Nicolas Geoffray [Tue, 27 Sep 2016 09:24:36 +0000 (10:24 +0100)]
Fix no-prebuild failure.

Printed executable is now dalvikvm* instead of art.

test:run-test --host 118

Change-Id: Id2c3a7f6ba90ee3cb4e57a49e366c46377fc4c45

7 years agoARM64: Update the disassembler after the VIXL update.
Alexandre Rames [Mon, 26 Sep 2016 13:14:01 +0000 (14:14 +0100)]
ARM64: Update the disassembler after the VIXL update.

Test: top-level `make -j40`
      `mma -j40 test-art-target-test-optimizing dist`
      `mma -j40 test-art-host dist`

Change-Id: I173976998dc8e3e466ca8502c3fdc447f9019cee

7 years agoMerge "ahat: Show GC Root Paths." am: 52591a6682
Richard Uhler [Tue, 27 Sep 2016 07:28:05 +0000 (07:28 +0000)]
Merge "ahat: Show GC Root Paths." am: 52591a6682
am: a60dff878c

Change-Id: I95bdbedbfa42e6ae99747b8d82e201c56c973df0

7 years agoMerge "ahat: Show GC Root Paths."
Richard Uhler [Tue, 27 Sep 2016 07:25:35 +0000 (07:25 +0000)]
Merge "ahat: Show GC Root Paths."
am: 52591a6682

Change-Id: I672498e2f21801c26c1052386c1caa2b25ab68ee

7 years agoMerge "ahat: Show GC Root Paths."
Treehugger Robot [Tue, 27 Sep 2016 07:17:52 +0000 (07:17 +0000)]
Merge "ahat: Show GC Root Paths."

7 years agoART: Fix dependencies
Andreas Gampe [Tue, 27 Sep 2016 03:17:42 +0000 (20:17 -0700)]
ART: Fix dependencies

Add libbase to libart-simulator.

Bug: 31338270
Test: m test-art-host
Change-Id: I956465f8d380e856cddf7f53c5aae358847b52ed

7 years agoMerge "ART: Fix dependencies" am: 2ac59375f8
Andreas Gampe [Tue, 27 Sep 2016 02:57:48 +0000 (02:57 +0000)]
Merge "ART: Fix dependencies" am: 2ac59375f8
am: f1e7fc5eae

Change-Id: I78d75487fd3a516d8609e98999317a49bd5ac2af

7 years agoMerge "ART: Fix dependencies"
Andreas Gampe [Tue, 27 Sep 2016 02:55:48 +0000 (02:55 +0000)]
Merge "ART: Fix dependencies"
am: 2ac59375f8

Change-Id: I5fb1ac633b743e2a18ae3d93c1dcf22f32423366