git.osdn.net Git - android-x86/art.git/log

Wojciech Staszkiewicz [Thu, 29 Sep 2016 01:04:53 +0000 (01:04 +0000)]

Merge "Fix true divergence mode" am: 6e6c479a44 am: e8fcd75d76
am: bd92fed5d0

Change-Id: I71900a729e7c38240e9139ec0819ade167eb11ee

commit | commitdiff | tree

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

commit | commitdiff | tree

Wojciech Staszkiewicz [Thu, 29 Sep 2016 00:58:48 +0000 (00:58 +0000)]

Merge "Fix true divergence mode"
am: 6e6c479a44

Change-Id: I9a2f1ec3d0c017d59e7d290e0f668f392970feb4

commit | commitdiff | tree

Treehugger Robot [Thu, 29 Sep 2016 00:56:11 +0000 (00:56 +0000)]

Merge "Fix true divergence mode"

commit | commitdiff | tree

Alex Light [Thu, 29 Sep 2016 00:11:53 +0000 (00:11 +0000)]

Merge "Update oat file version to 089" am: dd2b8a5d78 am: 12e7c42563
am: 0f0fd724ab

Change-Id: Ie93bb29be9da40ebc6578721b39d588f0f2dc53f

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 23:57:11 +0000 (23:57 +0000)]

Merge "Update oat file version to 089"

commit | commitdiff | tree

Igor Murashkin [Wed, 28 Sep 2016 23:27:09 +0000 (23:27 +0000)]

Merge "jni: test CriticalNative with generic jni" am: 73dac6e366 am: 54fa0da6c3
am: 54232b5596

Change-Id: I08c4d840cd82fe749ab991b338e7f344b4de0d46

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 23:15:04 +0000 (23:15 +0000)]

Merge "jni: test CriticalNative with generic jni"

commit | commitdiff | tree

Vishwath Mohan [Wed, 28 Sep 2016 23:07:10 +0000 (23:07 +0000)]

Merge "Increase frame size for ASAN enabled builds." am: 0ba1ba2578 am: 872d45a8b8
am: 556e196a44

Change-Id: I5d83f72565e999479c748385f70c3b30d114ef05

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 22:56:25 +0000 (22:56 +0000)]

Merge "Increase frame size for ASAN enabled builds."

commit | commitdiff | tree

Andreas Gampe [Wed, 28 Sep 2016 22:38:07 +0000 (22:38 +0000)]

Merge "ART: Add IMT stats and dumping to oatdump" am: f28fe69812 am: d41f58754f
am: af8a1c1ca4

Change-Id: I9b27409d542bf63245a262bcc852d89cade2513a

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Wed, 28 Sep 2016 22:31:37 +0000 (22:31 +0000)]

Merge "Use ObjPtr for reflection.cc/h/inl" am: 4d46970b8a am: db7e1c3ba7
am: 1764b1dae7

Change-Id: I196dd74a0f029f6f50442affd11e9beae55b659e

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 22:24:32 +0000 (22:24 +0000)]

Merge "ART: Add IMT stats and dumping to oatdump"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Wed, 28 Sep 2016 22:04:13 +0000 (22:04 +0000)]

Merge "Use ObjPtr for reflection.cc/h/inl"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Wojciech Staszkiewicz [Wed, 28 Sep 2016 20:36:59 +0000 (20:36 +0000)]

Merge "Gather divergences in single directory"
am: 1c3ca75e63

Change-Id: I1fb9c199ae801b6a3f5336b2ba7bcf9f6d82ab62

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 20:22:28 +0000 (20:22 +0000)]

Merge "Gather divergences in single directory"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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"

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 18:01:40 +0000 (18:01 +0000)]

Merge "ART: Dump referenced type in IRT overflows"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 17:41:06 +0000 (17:41 +0000)]

Merge "ART: Factor out IMT from ArtMethod"

commit | commitdiff | tree

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)

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Neil Fuller [Wed, 28 Sep 2016 12:29:53 +0000 (12:29 +0000)]

Merge "Add support for Executable.getParameters() metadata"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nicolas Geoffray [Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)]

Merge "benchmark: Add jni benchmarks for use in golem"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 02:19:49 +0000 (02:19 +0000)]

Merge "Handle tests which fail with no methods compiled"

commit | commitdiff | tree

Treehugger Robot [Wed, 28 Sep 2016 02:14:34 +0000 (02:14 +0000)]

Merge "Store bisection logs in test directory"

commit | commitdiff | tree

Andreas Gampe [Wed, 28 Sep 2016 01:45:02 +0000 (18:45 -0700)]

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 27 Sep 2016 23:53:08 +0000 (23:53 +0000)]

Merge "Fix a CC deadlock in 129-ThreadGetId."

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Treehugger Robot [Tue, 27 Sep 2016 20:12:21 +0000 (20:12 +0000)]

Merge "Add a true divergence mode to run_jfuzz_test.py"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Tue, 27 Sep 2016 18:17:00 +0000 (18:17 +0000)]

Merge "Add basic support for object pointer poisoning"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andreas Gampe [Tue, 27 Sep 2016 15:20:34 +0000 (15:20 +0000)]

Merge "ART: Fix dependencies" am: 38e1882858
am: a89cf62ea1

Change-Id: Iafbbfbdd931b42ffef56b1b55f1ac00103e95544

commit | commitdiff | tree

Andreas Gampe [Tue, 27 Sep 2016 15:18:05 +0000 (15:18 +0000)]

Merge "ART: Fix dependencies"
am: 38e1882858

Change-Id: If040142b21b56fe3e172e76a8d0efe9afd5afff6

commit | commitdiff | tree

Andreas Gampe [Tue, 27 Sep 2016 15:10:57 +0000 (15:10 +0000)]

Merge "ART: Fix dependencies"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Nicolas Geoffray [Tue, 27 Sep 2016 09:36:15 +0000 (09:36 +0000)]

Merge "Cleanup String.<init> handling."
am: adc4e8297c

Change-Id: I96e1fd961cb7e93358ec53dfc8c8e03e3598f43e

commit | commitdiff | tree

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

commit | commitdiff | tree

Nicolas Geoffray [Tue, 27 Sep 2016 09:31:33 +0000 (09:31 +0000)]

Merge "Cleanup String.<init> handling."

commit | commitdiff | tree

Nicolas Geoffray [Tue, 27 Sep 2016 09:31:14 +0000 (09:31 +0000)]

Merge "Fix no-prebuild failure."
am: fc916a6c9a

Change-Id: I034c417313e32207b71dcb219f6499bca7233cfb

commit | commitdiff | tree

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

commit | commitdiff | tree

Nicolas Geoffray [Tue, 27 Sep 2016 09:25:58 +0000 (09:25 +0000)]

Merge "Fix no-prebuild failure."

commit | commitdiff | tree

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