OSDN Git Service
Andreas Gampe [Fri, 30 Sep 2016 22:38:33 +0000 (22:38 +0000)]
Merge "ART: Add odex IMT dumping to oatdump" am:
6fa67a0261 am:
8980248138
am:
f726e16ce3
Change-Id: Ida0a6b3f89fda6b7a7be05929df8dd685cf16b18
Andreas Gampe [Fri, 30 Sep 2016 22:35:00 +0000 (22:35 +0000)]
Merge "ART: Add odex IMT dumping to oatdump" am:
6fa67a0261
am:
8980248138
Change-Id: Ib11ad01348970fd22ac30cf80ec25facc2120841
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
Vishwath Mohan [Fri, 30 Sep 2016 22:23:34 +0000 (22:23 +0000)]
Merge "Set coverage to false for dex2oat." am:
dd26fef65a am:
818f49e898
am:
d70dd12402
Change-Id: I6d16e601096301af2ff21cb38fee452d9423e07d
Treehugger Robot [Fri, 30 Sep 2016 22:20:10 +0000 (22:20 +0000)]
Merge "ART: Add odex IMT dumping to oatdump"
Vishwath Mohan [Fri, 30 Sep 2016 22:20:00 +0000 (22:20 +0000)]
Merge "Set coverage to false for dex2oat." am:
dd26fef65a
am:
818f49e898
Change-Id: I69fb0180eda85e1f5c7ad8a2ca2450dc2125af76
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
Treehugger Robot [Fri, 30 Sep 2016 22:08:56 +0000 (22:08 +0000)]
Merge "Set coverage to false for dex2oat."
Dimitry Ivanov [Fri, 30 Sep 2016 17:59:08 +0000 (17:59 +0000)]
Merge "Remove dependency on libcutils" am:
4f0cabfe13 am:
2da7492dc8
am:
35829c75d1
Change-Id: I71e31d2bceb6748c84c2e65d4dfacc08e6b8904a
Dimitry Ivanov [Fri, 30 Sep 2016 17:48:07 +0000 (17:48 +0000)]
Merge "Remove dependency on libcutils" am:
4f0cabfe13
am:
2da7492dc8
Change-Id: Id36a3883f3b67a2f0c2ae94336683647054b40ee
Dimitry Ivanov [Fri, 30 Sep 2016 17:43:15 +0000 (17:43 +0000)]
Merge "Remove dependency on libcutils"
am:
4f0cabfe13
Change-Id: Ib9a9717dac149f4a74a5893d614ac1f36bfed0e7
Dimitry Ivanov [Fri, 30 Sep 2016 17:37:57 +0000 (17:37 +0000)]
Merge "Remove dependency on libcutils"
Vladimir Marko [Fri, 30 Sep 2016 17:24:36 +0000 (17:24 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss."" am:
523b51537f am:
c8c8407648
am:
4e98fb60ff
Change-Id: Ia6652d0df4c86788a86f8d35bb5b177412bcc99d
Vladimir Marko [Fri, 30 Sep 2016 17:21:36 +0000 (17:21 +0000)]
Merge "Revert "Store resolved Strings for AOT code in .bss."" am:
523b51537f
am:
c8c8407648
Change-Id: Ifa5b9cb9c85e9737461eaa394107f1dea455ddaa
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
Vladimir Marko [Fri, 30 Sep 2016 17:12:41 +0000 (17:12 +0000)]
Merge "Revert "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
Wojciech Staszkiewicz [Fri, 30 Sep 2016 16:55:34 +0000 (16:55 +0000)]
Merge "Make run-test fail if output-path is too long" am:
9e5739aaa6 am:
edc3bec952
am:
644c3d5837
Change-Id: Ia8790806e7e5c67f43029460072c82a4f22ea62b
Wojciech Staszkiewicz [Fri, 30 Sep 2016 16:53:06 +0000 (16:53 +0000)]
Merge "Make run-test fail if output-path is too long" am:
9e5739aaa6
am:
edc3bec952
Change-Id: I85d75afbebb469ed630688e9cddf50332ba27b16
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
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
Treehugger Robot [Fri, 30 Sep 2016 16:42:48 +0000 (16:42 +0000)]
Merge "Make run-test fail if output-path is too long"
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
Vladimir Marko [Fri, 30 Sep 2016 15:00:27 +0000 (15:00 +0000)]
Merge "Add const-string benchmark." am:
93acbaca3b am:
8c9ce06bfc
am:
8620720910
Change-Id: I8f02758f6f77247ce128353fdcc0a28145e3d4ce
Vladimir Marko [Fri, 30 Sep 2016 14:57:53 +0000 (14:57 +0000)]
Merge "Add const-string benchmark." am:
93acbaca3b
am:
8c9ce06bfc
Change-Id: I423bb2ca1aba550c9aec902ea45cbaef339c9905
Vladimir Marko [Fri, 30 Sep 2016 14:55:24 +0000 (14:55 +0000)]
Merge "Add const-string benchmark."
am:
93acbaca3b
Change-Id: Id1f730f86ed90666a8964e9c0083d7facbd4f3c4
Treehugger Robot [Fri, 30 Sep 2016 14:50:55 +0000 (14:50 +0000)]
Merge "Add const-string benchmark."
Nicolas Geoffray [Fri, 30 Sep 2016 14:46:55 +0000 (14:46 +0000)]
Merge "compiler_driver: Fix build." am:
33531dcb91 am:
8e5e03a333
am:
5008612237
Change-Id: Idd4abb6936460a2e3ffb3013182c6c8809d0cf27
Nicolas Geoffray [Fri, 30 Sep 2016 14:43:55 +0000 (14:43 +0000)]
Merge "compiler_driver: Fix build." am:
33531dcb91
am:
8e5e03a333
Change-Id: I4c235617f53e49e731389a53e5094ec391f90d16
Nicolas Geoffray [Fri, 30 Sep 2016 14:40:54 +0000 (14:40 +0000)]
Merge "compiler_driver: Fix build."
am:
33531dcb91
Change-Id: Ice81e20bdf9ff85aa1893a065e996b53afff6dc8
Nicolas Geoffray [Fri, 30 Sep 2016 14:36:37 +0000 (14:36 +0000)]
Merge "compiler_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
Vladimir Marko [Fri, 30 Sep 2016 14:21:23 +0000 (14:21 +0000)]
Merge "Store resolved Strings for AOT code in .bss." am:
428792553e am:
ee963538f4
am:
45c93615dc
Change-Id: I1c76a574a202a1c8caaa683ad696a050c5d4635e
Vladimir Marko [Fri, 30 Sep 2016 14:18:22 +0000 (14:18 +0000)]
Merge "Store resolved Strings for AOT code in .bss." am:
428792553e
am:
ee963538f4
Change-Id: Iee680059376b707408c4c36a94155a0bb43c8019
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
Vladimir Marko [Fri, 30 Sep 2016 14:10:21 +0000 (14:10 +0000)]
Merge "Store resolved Strings for AOT code in .bss."
Nicolas Geoffray [Fri, 30 Sep 2016 11:49:13 +0000 (11:49 +0000)]
Merge "Simplify our intrinsic recognizer." am:
ce157a6864 am:
d6fa0694b8
am:
c11038a114
Change-Id: I29f7ad5698857d74d22cbaa0399561f400d8392c
Nicolas Geoffray [Fri, 30 Sep 2016 11:46:11 +0000 (11:46 +0000)]
Merge "Simplify our intrinsic recognizer." am:
ce157a6864
am:
d6fa0694b8
Change-Id: I6aa2cbc1a6b8cb609bfa47a054e961556a79f72e
Nicolas Geoffray [Fri, 30 Sep 2016 11:43:41 +0000 (11:43 +0000)]
Merge "Simplify our intrinsic recognizer."
am:
ce157a6864
Change-Id: I9003fead7a2e09396ce696475a623a5944f520fb
Treehugger Robot [Fri, 30 Sep 2016 11:38:56 +0000 (11:38 +0000)]
Merge "Simplify our intrinsic recognizer."
Nicolas Geoffray [Fri, 30 Sep 2016 10:58:51 +0000 (10:58 +0000)]
Merge "Move two dangling mirror objects into handles." am:
394b8b23df am:
83b19c2779
am:
2843fcd645
Change-Id: I331b51f8223b6a89eb97e6bbe825fc13de5ad846
Nicolas Geoffray [Fri, 30 Sep 2016 10:58:39 +0000 (10:58 +0000)]
Move two dangling mirror objects into handles. am:
9d07414a25 am:
cc922c40c5
am:
00385e42eb
Change-Id: If697dca4ecd7453af01d4252c804a5083f582b4d
Nicolas Geoffray [Fri, 30 Sep 2016 10:55:51 +0000 (10:55 +0000)]
Merge "Move two dangling mirror objects into handles." am:
394b8b23df
am:
83b19c2779
Change-Id: I873bbd2907df9de4009728cac8b0a868e8f5c865
Nicolas Geoffray [Fri, 30 Sep 2016 10:55:37 +0000 (10:55 +0000)]
Move two dangling mirror objects into handles. am:
9d07414a25
am:
cc922c40c5
Change-Id: I08f87316651ee9e55e44f155c696eea4e7a09687
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
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
Treehugger Robot [Fri, 30 Sep 2016 10:47:24 +0000 (10:47 +0000)]
Merge "Move two dangling mirror objects into handles."
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
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
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
Narayan Kamath [Fri, 30 Sep 2016 09:06:29 +0000 (09:06 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>" am:
b4cf427734 am:
c7a8774d3e
am:
ecc4249860
Change-Id: I362254654c6e0014262cb1c580e22d0d0312100f
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
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
Treehugger Robot [Fri, 30 Sep 2016 08:52:28 +0000 (08:52 +0000)]
Merge "dex_cache: rewrite StringDexCachePair as DexCachePair<T>"
Mathieu Chartier [Fri, 30 Sep 2016 02:42:33 +0000 (02:42 +0000)]
Merge "Clean up ScopedThreadStateChange to use ObjPtr" am:
74a69eda05 am:
039ef51ee7
am:
1becf77e92
Change-Id: I1e19a8ae4eb3eec0a2c25e072e577f66af0c0010
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
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
Mathieu Chartier [Fri, 30 Sep 2016 02:33:08 +0000 (02:33 +0000)]
Merge "Clean 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
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
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
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
Narayan Kamath [Thu, 29 Sep 2016 14:33:12 +0000 (14:33 +0000)]
Merge "java.lang.invoke: Add mirror types for MethodHandle / MethodType." am:
d1224dce59 am:
b39ba157aa
am:
7a632d262d
Change-Id: I8038c5d169ec49e3675f184a621dd0cce59c1970
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
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
Narayan Kamath [Thu, 29 Sep 2016 14:16:17 +0000 (14:16 +0000)]
Merge "java.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
Nicolas Geoffray [Thu, 29 Sep 2016 10:10:59 +0000 (10:10 +0000)]
Merge "Print to System.err to avoid output races." am:
72795d0a33 am:
d2a443fe08
am:
8635e97870
Change-Id: Ie1e03467b2e3fc258bf32fcf1cb3d8b50ca76adf
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
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
Treehugger Robot [Thu, 29 Sep 2016 09:51:52 +0000 (09:51 +0000)]
Merge "Print to System.err to avoid output races."
Nicolas Geoffray [Thu, 29 Sep 2016 09:07:27 +0000 (09:07 +0000)]
Merge "ARM64: Update the disassembler after the VIXL update." am:
6a2cd493c1 am:
f7ddbd4418
am:
34977cdc6b
Change-Id: I497198f53e284cb52ed1534bee5aa79e9d01d4bb
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
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
Nicolas Geoffray [Thu, 29 Sep 2016 08:49:06 +0000 (08:49 +0000)]
Merge "ARM64: Update the disassembler after the VIXL update."
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
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
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
Wojciech Staszkiewicz [Thu, 29 Sep 2016 00:58:48 +0000 (00:58 +0000)]
Merge "Fix true divergence mode"
am:
6e6c479a44
Change-Id: I9a2f1ec3d0c017d59e7d290e0f668f392970feb4
Treehugger Robot [Thu, 29 Sep 2016 00:56:11 +0000 (00:56 +0000)]
Merge "Fix true divergence mode"
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
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
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
Treehugger Robot [Wed, 28 Sep 2016 23:57:11 +0000 (23:57 +0000)]
Merge "Update oat file version to 089"
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
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
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
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
Treehugger Robot [Wed, 28 Sep 2016 23:15:04 +0000 (23:15 +0000)]
Merge "jni: test CriticalNative with generic jni"
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
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
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
Treehugger Robot [Wed, 28 Sep 2016 22:56:25 +0000 (22:56 +0000)]
Merge "Increase frame size for ASAN enabled builds."
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
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
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
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
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
Treehugger Robot [Wed, 28 Sep 2016 22:24:32 +0000 (22:24 +0000)]
Merge "ART: Add IMT stats and dumping to oatdump"
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
OSDN Git Service
