OSDN Git Service

android-x86/art.git
7 years agoDO NOT MERGE: Update Oat version to 088 am: ae444410cc
Alex Light [Wed, 28 Sep 2016 22:29:07 +0000 (22:29 +0000)]
DO NOT MERGE: Update Oat version to 088 am: ae444410cc
am: c7e8eca014  -s ours

Change-Id: Ibd0d5f49e3dabedbd21c653090f3c13aa2836b41

7 years agoDO NOT MERGE: Update Oat version to 088
Alex Light [Wed, 28 Sep 2016 22:09:05 +0000 (22:09 +0000)]
DO NOT MERGE: Update Oat version to 088
am: ae444410cc

Change-Id: I44f82f443b449733dadbc1e262aac83a782c76a5

7 years agoMerge "Gather divergences in single directory" am: 1c3ca75e63 am: 96d34b8a10
Wojciech Staszkiewicz [Wed, 28 Sep 2016 20:49:30 +0000 (20:49 +0000)]
Merge "Gather divergences in single directory" am: 1c3ca75e63 am: 96d34b8a10
am: 29dc425be4

Change-Id: Id7a5344a7719185788e100563cb7ac719b87c4a9

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 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 agoDO NOT MERGE: Update Oat version to 088
Alex Light [Wed, 28 Sep 2016 18:27:11 +0000 (11:27 -0700)]
DO NOT MERGE: Update Oat version to 088

Give N-MR1 a different oat version to prevent compatibility problems
with NYC.

Bug: 31789675
Test: mma test-art-host
Test: Phone boots and runs apps
Change-Id: I6a922e8ac932dbf36a19431c4f34c2ace6f34609

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

Change-Id: Id1b3df1a013164a0d9e90c118a23bcce6aa69456

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 agoresolve merge conflicts of 9bfe5ec to nyc-mr1-dev-plus-aosp
Andreas Gampe [Wed, 28 Sep 2016 18:38:52 +0000 (11:38 -0700)]
resolve merge conflicts of 9bfe5ec to nyc-mr1-dev-plus-aosp

Change-Id: I80041677f44bfa2280949054961132b9802a3696

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

Change-Id: I9269f8faf7d8b7c2b22e067d15d8e9aba62472ad

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

Change-Id: Iccfda1931da7c1cc531a703ccf310e5ceb864c8a

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

Change-Id: Iabc17e3103e83f41a61b8da58058bebc1417f79f

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 agoART: Dump referenced type in IRT overflows am: 280f32b095
Andreas Gampe [Wed, 28 Sep 2016 06:48:07 +0000 (06:48 +0000)]
ART: Dump referenced type in IRT overflows am: 280f32b095
am: d6a77d2e83

Change-Id: I9d484897853651a0562bd73bbb0d26abda1ae68d

7 years agoART: Dump referenced type in IRT overflows
Andreas Gampe [Wed, 28 Sep 2016 06:46:04 +0000 (06:46 +0000)]
ART: Dump referenced type in IRT overflows
am: 280f32b095

Change-Id: I6dedb3915fd67c08e45218892a7c909d397d9733

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

Change-Id: I68f763b6d81ba4430e7bf9d09ce2f13adb02e070

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

Change-Id: I8a770089ab5913fa25d4dc6066e0cae55f86cf78

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 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
Change-Id: Ia892dc84ca8827dd93a8b75d6f571c392f94859c

7 years agoMerge "Fix a CC deadlock in 129-ThreadGetId." am: b737745c79 am: 02db54f577
Hiroshi Yamauchi [Wed, 28 Sep 2016 00:05:39 +0000 (00:05 +0000)]
Merge "Fix a CC deadlock in 129-ThreadGetId." am: b737745c79 am: 02db54f577
am: 11137bd5fb

Change-Id: I192310fbf64444383dbdeabc60048d2928a471b1

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

Change-Id: I40a7a331f3f41f7ff014f27a63c4124682d2aa9b

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

Change-Id: I4bee7ee3fea387e0a4ec61c7617b61b51e603cc9

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

Change-Id: I6639e26cf9d8c244141168079f3dff32f7d171c4

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

Change-Id: I94cb90d624ff38b999dcb8be790bcdc6a9cad2d1

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

Change-Id: Ia96a3816e46e457248ac0ac171554ff77f80fa79

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 agoMerge "ahat: Show GC Root Paths." am: 52591a6682 am: a60dff878c
Richard Uhler [Tue, 27 Sep 2016 07:33:58 +0000 (07:33 +0000)]
Merge "ahat: Show GC Root Paths." am: 52591a6682 am: a60dff878c
am: ac9edd669f

Change-Id: I77352d342f2bfcb2b1a6e962b736ef258dc48f73

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 am: f1e7fc5eae
Andreas Gampe [Tue, 27 Sep 2016 03:03:01 +0000 (03:03 +0000)]
Merge "ART: Fix dependencies" am: 2ac59375f8 am: f1e7fc5eae
am: 3fccc52dff

Change-Id: I37da1e407477795ffcf724d50fd8e6e3b58be470

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

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

7 years agoART: Fix dependencies
Andreas Gampe [Tue, 27 Sep 2016 01:09:47 +0000 (18:09 -0700)]
ART: Fix dependencies

Add libbase to libart-compiler.

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

7 years agoStore bisection logs in test directory
Wojciech Staszkiewicz [Tue, 27 Sep 2016 00:51:52 +0000 (17:51 -0700)]
Store bisection logs in test directory

Store bisection search logs in test directory for easier access.

Test: ./test/run-test --never-clean --no-prebuild --bisection-search
037-inherit
Change-Id: I67e472b933516f0e486f47fd2c7a4ae06212db44

7 years agoHandle tests which fail with no methods compiled
Wojciech Staszkiewicz [Tue, 27 Sep 2016 00:39:26 +0000 (17:39 -0700)]
Handle tests which fail with no methods compiled

Check if test passes with no methods compiled and only then bisect
it.

Test: ./bisection_search.py -cp classes.dex --expected-output out --class
Test
Change-Id: If63af7304ae124a1920ec2a3f57d33a6b1f71bb9

7 years agoMerge "ART: Fix dependencies" am: fdaa803ba3 am: 08d19ced93
Andreas Gampe [Tue, 27 Sep 2016 00:14:08 +0000 (00:14 +0000)]
Merge "ART: Fix dependencies" am: fdaa803ba3 am: 08d19ced93
am: b141ef04c0

Change-Id: I8e416c7b9f2ccf5e4f34f2714518a4cdfb7e250f

7 years agoMerge "ART: Fix dependencies" am: fdaa803ba3
Andreas Gampe [Mon, 26 Sep 2016 23:42:05 +0000 (23:42 +0000)]
Merge "ART: Fix dependencies" am: fdaa803ba3
am: 08d19ced93

Change-Id: If43b0ff029ded7844511a3ba0a06276f83be0a49

7 years agoMerge "ART: Fix dependencies"
Andreas Gampe [Mon, 26 Sep 2016 23:38:36 +0000 (23:38 +0000)]
Merge "ART: Fix dependencies"
am: fdaa803ba3

Change-Id: Ib7bbf19b3ed243120c8bd5e45e3bb3a23b3ce330

7 years agoAdd basic support for object pointer poisoning
Mathieu Chartier [Mon, 26 Sep 2016 18:39:52 +0000 (11:39 -0700)]
Add basic support for object pointer poisoning

ObjPtr is a pointer that checks for heap corruption and is meant
to replace mirror::Object* in places where a mirror::Object* is a
local variable. Whenever there is a possible suspend point, the
current thread's object pointers are all invalidated. This is done
by storing a cookie in the object pointer associated with what thread
created it.

Added test case in object_test.

Example failure:
object_test F 25379 25379 object_pointer.h:70] Check failed:
IsValid() Invalid cookie, expected 0 but got 2

Bug: 31113334

Test: test-art-host-gtest-object_test

Change-Id: I9fa80ccaf2f0448621942935af702a243a3e1ee6

7 years agoMerge "ART: Fix dependencies"
Andreas Gampe [Mon, 26 Sep 2016 23:26:51 +0000 (23:26 +0000)]
Merge "ART: Fix dependencies"

7 years agoMerge "ART: Revert base/logging conditional hacks" am: 42c49d236c am: 19ad7b889f
Andreas Gampe [Mon, 26 Sep 2016 23:21:51 +0000 (23:21 +0000)]
Merge "ART: Revert base/logging conditional hacks" am: 42c49d236c am: 19ad7b889f
am: de0d5ce7a0

Change-Id: I5b37789c3ce6d2c87c294461524886f212e26aad

7 years agoMerge "ART: Revert base/logging conditional hacks" am: 42c49d236c
Andreas Gampe [Mon, 26 Sep 2016 23:13:34 +0000 (23:13 +0000)]
Merge "ART: Revert base/logging conditional hacks" am: 42c49d236c
am: 19ad7b889f

Change-Id: I5338ccb2353dcc1f0025b916f295d1030b825fe7

7 years agoMerge "ART: Revert base/logging conditional hacks"
Andreas Gampe [Mon, 26 Sep 2016 23:07:32 +0000 (23:07 +0000)]
Merge "ART: Revert base/logging conditional hacks"
am: 42c49d236c

Change-Id: I0cb701ab52fb3047360bc96097e47b0806f90f64

7 years agoMerge "ART: Fix nits" am: cda79e87e0 am: b2b9d390c1
Andreas Gampe [Mon, 26 Sep 2016 23:07:32 +0000 (23:07 +0000)]
Merge "ART: Fix nits" am: cda79e87e0 am: b2b9d390c1
am: 31650025be

Change-Id: I7d178a1fc150f4e3a0e0d6f1938bae0ba61e7807

7 years agoMerge "ART: Revert base/logging conditional hacks"
Treehugger Robot [Mon, 26 Sep 2016 23:00:02 +0000 (23:00 +0000)]
Merge "ART: Revert base/logging conditional hacks"

7 years agoMerge "ART: Fix nits" am: cda79e87e0
Andreas Gampe [Mon, 26 Sep 2016 22:56:32 +0000 (22:56 +0000)]
Merge "ART: Fix nits" am: cda79e87e0
am: b2b9d390c1

Change-Id: I97762fd8c1e6a5657096dbc3b60cdb5597089514

7 years agoMerge "ART: Fix nits"
Andreas Gampe [Mon, 26 Sep 2016 22:52:31 +0000 (22:52 +0000)]
Merge "ART: Fix nits"
am: cda79e87e0

Change-Id: Ie552080275f58b1354f47fefbc3d5a06e6eb65f5

7 years agoMerge "ART: Fix nits"
Treehugger Robot [Mon, 26 Sep 2016 22:48:55 +0000 (22:48 +0000)]
Merge "ART: Fix nits"

7 years agoMerge "Implement nightly jfuzz test runner" am: 25243492bf am: 5188ae322f
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:58:06 +0000 (21:58 +0000)]
Merge "Implement nightly jfuzz test runner" am: 25243492bf am: 5188ae322f
am: 7fabf4acba

Change-Id: I883a7d8e9b5efe45fd455b11818cf27a9098a6a3

7 years agoMerge "Implement nightly jfuzz test runner" am: 25243492bf
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:55:13 +0000 (21:55 +0000)]
Merge "Implement nightly jfuzz test runner" am: 25243492bf
am: 5188ae322f

Change-Id: I30a148443e2ac6d47438978657e8562bf9473a29

7 years agoMerge "Implement nightly jfuzz test runner"
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:52:05 +0000 (21:52 +0000)]
Merge "Implement nightly jfuzz test runner"
am: 25243492bf

Change-Id: If37fa2111a9709e7c21f308539d7a7faa4c901ed

7 years agoMerge "Implement nightly jfuzz test runner"
Treehugger Robot [Mon, 26 Sep 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Implement nightly jfuzz test runner"