OSDN Git Service
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
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 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 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 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: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: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: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:31:37 +0000 (22:31 +0000)]
Merge "ART: Add IMT stats and dumping to oatdump"
am:
f28fe69812
Change-Id: I82de0be9d49193172ad347d338642d6cda4197c4
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
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
Mathieu Chartier [Wed, 28 Sep 2016 22:04:13 +0000 (22:04 +0000)]
Merge "Use ObjPtr for reflection.cc/h/inl"
Wojciech Staszkiewicz [Wed, 28 Sep 2016 20:36:59 +0000 (20:36 +0000)]
Merge "Gather divergences in single directory"
am:
1c3ca75e63
Change-Id: I1fb9c199ae801b6a3f5336b2ba7bcf9f6d82ab62
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
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
Treehugger Robot [Wed, 28 Sep 2016 20:22:28 +0000 (20:22 +0000)]
Merge "Gather 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
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
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"
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
Treehugger Robot [Wed, 28 Sep 2016 18:01:40 +0000 (18:01 +0000)]
Merge "ART: Dump referenced type in IRT overflows"
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
Treehugger Robot [Wed, 28 Sep 2016 17:41:06 +0000 (17:41 +0000)]
Merge "ART: Factor out IMT from ArtMethod"
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)
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
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
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
Neil Fuller [Wed, 28 Sep 2016 12:29:53 +0000 (12:29 +0000)]
Merge "Add 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
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
Nicolas Geoffray [Wed, 28 Sep 2016 08:24:12 +0000 (08:24 +0000)]
Merge "benchmark: Add jni benchmarks for use in golem"
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
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
Treehugger Robot [Wed, 28 Sep 2016 02:19:49 +0000 (02:19 +0000)]
Merge "Handle tests which fail with no methods compiled"
Treehugger Robot [Wed, 28 Sep 2016 02:14:34 +0000 (02:14 +0000)]
Merge "Store bisection logs in test directory"
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
Treehugger Robot [Tue, 27 Sep 2016 23:53:08 +0000 (23:53 +0000)]
Merge "Fix a CC deadlock in 129-ThreadGetId."
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
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
Treehugger Robot [Tue, 27 Sep 2016 20:12:21 +0000 (20:12 +0000)]
Merge "Add a true divergence mode to run_jfuzz_test.py"
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
Mathieu Chartier [Tue, 27 Sep 2016 18:17:00 +0000 (18:17 +0000)]
Merge "Add basic support for object pointer poisoning"
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
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
Andreas Gampe [Tue, 27 Sep 2016 15:18:05 +0000 (15:18 +0000)]
Merge "ART: Fix dependencies"
am:
38e1882858
Change-Id: If040142b21b56fe3e172e76a8d0efe9afd5afff6
Andreas Gampe [Tue, 27 Sep 2016 15:10:57 +0000 (15:10 +0000)]
Merge "ART: Fix dependencies"
Nicolas Geoffray [Tue, 27 Sep 2016 09:36:15 +0000 (09:36 +0000)]
Merge "Cleanup String.<init> handling."
am:
adc4e8297c
Change-Id: I96e1fd961cb7e93358ec53dfc8c8e03e3598f43e
Nicolas Geoffray [Tue, 27 Sep 2016 09:31:33 +0000 (09:31 +0000)]
Merge "Cleanup String.<init> handling."
Nicolas Geoffray [Tue, 27 Sep 2016 09:31:14 +0000 (09:31 +0000)]
Merge "Fix no-prebuild failure."
am:
fc916a6c9a
Change-Id: I034c417313e32207b71dcb219f6499bca7233cfb
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
Nicolas Geoffray [Tue, 27 Sep 2016 09:25:58 +0000 (09:25 +0000)]
Merge "Fix 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
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
Richard Uhler [Tue, 27 Sep 2016 07:25:35 +0000 (07:25 +0000)]
Merge "ahat: Show GC Root Paths."
am:
52591a6682
Change-Id: I672498e2f21801c26c1052386c1caa2b25ab68ee
Treehugger Robot [Tue, 27 Sep 2016 07:17:52 +0000 (07:17 +0000)]
Merge "ahat: Show GC Root Paths."
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
Andreas Gampe [Tue, 27 Sep 2016 02:55:48 +0000 (02:55 +0000)]
Merge "ART: Fix dependencies"
am:
2ac59375f8
Change-Id: I5fb1ac633b743e2a18ae3d93c1dcf22f32423366
Andreas Gampe [Tue, 27 Sep 2016 02:48:37 +0000 (02:48 +0000)]
Merge "ART: 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
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
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
Andreas Gampe [Mon, 26 Sep 2016 23:38:36 +0000 (23:38 +0000)]
Merge "ART: Fix dependencies"
am:
fdaa803ba3
Change-Id: Ib7bbf19b3ed243120c8bd5e45e3bb3a23b3ce330
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
Andreas Gampe [Mon, 26 Sep 2016 23:26:51 +0000 (23:26 +0000)]
Merge "ART: Fix dependencies"
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
Treehugger Robot [Mon, 26 Sep 2016 23:00:02 +0000 (23:00 +0000)]
Merge "ART: Revert base/logging conditional hacks"
Andreas Gampe [Mon, 26 Sep 2016 22:52:31 +0000 (22:52 +0000)]
Merge "ART: Fix nits"
am:
cda79e87e0
Change-Id: Ie552080275f58b1354f47fefbc3d5a06e6eb65f5
Treehugger Robot [Mon, 26 Sep 2016 22:48:55 +0000 (22:48 +0000)]
Merge "ART: Fix nits"
Wojciech Staszkiewicz [Mon, 26 Sep 2016 21:52:05 +0000 (21:52 +0000)]
Merge "Implement nightly jfuzz test runner"
am:
25243492bf
Change-Id: If37fa2111a9709e7c21f308539d7a7faa4c901ed
Treehugger Robot [Mon, 26 Sep 2016 21:42:08 +0000 (21:42 +0000)]
Merge "Implement nightly jfuzz test runner"
Andreas Gampe [Mon, 26 Sep 2016 21:18:25 +0000 (14:18 -0700)]
ART: Fix dependencies
Add libbase as a dependency to libartbenchmark.
Bug:
31338270
Test: m test-art-host
Change-Id: I23c9f4219710fd8b5691837c5bc197b993aafe7b
Andreas Gampe [Mon, 26 Sep 2016 21:07:57 +0000 (14:07 -0700)]
ART: Fix nits
Follow-up to commit
3fec9ac0d5af1358d216eb2fdc2000ec0205f3f0.
Bug:
31338270
Test: m test-art-host
Change-Id: Ia50f450bef144167b946224c26242c529302996e
Wojciech Staszkiewicz [Sat, 24 Sep 2016 01:02:55 +0000 (18:02 -0700)]
Add a true divergence mode to run_jfuzz_test.py
Adds a --true_divergence switch which prevents tool from bisecting
TIMEOUT vs ERROR and TIMEOUT vs SUCCESS return code divergences.
Test: ./run_jfuzz_test.py
Change-Id: I53dd1c2b6934aafcc178fcc5dffd0b10d7a7fc5f
Igor Murashkin [Mon, 26 Sep 2016 19:56:36 +0000 (19:56 +0000)]
Merge "jni: Punt to generic JNI for mips"
am:
20426c3403
Change-Id: I078b4bdafdd14b9e2876db26c2a5a2d7d2ea550f
Andreas Gampe [Mon, 26 Sep 2016 19:56:19 +0000 (19:56 +0000)]
Merge "ART: Use libbase logging"
am:
a4850b0fa1
Change-Id: Id19ac0187a9213fe6b2bd2135f994e60e772dc90
Andreas Gampe [Mon, 26 Sep 2016 19:51:53 +0000 (12:51 -0700)]
ART: Revert base/logging conditional hacks
This partially reverts commit
bda1d606f2d31086874b68edd9254e3817d8049c.
ART was switched to libbase logging.
Bug:
31338270
Test: m test-art-host
Change-Id: I1a2f90d1ddb67d45ebe28d970b3ee7fd2d16a730
Treehugger Robot [Mon, 26 Sep 2016 19:53:37 +0000 (19:53 +0000)]
Merge "jni: Punt to generic JNI for mips"
Wojciech Staszkiewicz [Sat, 24 Sep 2016 00:41:27 +0000 (17:41 -0700)]
Implement nightly jfuzz test runner
New script runs multiple instances of run_jfuzz_test.py and has
predefined arguments suitable for nightly runs.
Test: ./run_jfuzz_test_nightly.py
Change-Id: I8c0060d72c69bbdf88571a9272f2d3fef74697eb
Treehugger Robot [Mon, 26 Sep 2016 19:45:22 +0000 (19:45 +0000)]
Merge "ART: Use libbase logging"
Andreas Gampe [Tue, 13 Sep 2016 17:47:28 +0000 (10:47 -0700)]
ART: Use libbase logging
Move most of our logging infrastructure over to system/core/base.
Retain VLOG.
Using unified Android infrastructure has two main advantages. First,
it reduces the complexity/maintenance burden in ART. Second, it
allows to detach logging for the cases where we do not want or need
a runtime, e.g., dexdump, the disassembler, etc. As a part of the
latter, libbase is also supported for all hosts (including Windows).
From a developer viewpoint, there are minor behavior changes for the
LOG statements (see above), but otherwise usage is the same. Explicit
severity enum items are in the android::base namespace now.
Bug:
31338270
Test: m test-art-host
Change-Id: I5abcb2f45f5b03d49951874c48544f72a283a91b
Igor Murashkin [Mon, 26 Sep 2016 17:10:17 +0000 (10:10 -0700)]
jni: Punt to generic JNI for mips
Preopting dex the bootclasspath causes dex2oat to crash for MIPS builds.
Disable JNI compiler for MIPS until it supports @CriticalNative.
Test: lunch aosp_mips-eng && make && make test-art-host
Bug:
31743474
Change-Id: I802f1e61863c4bb54a1bd884a4c9ce9a75bab62b
Vishwath Mohan [Mon, 26 Sep 2016 16:22:42 +0000 (09:22 -0700)]
Increase frame size for ASAN enabled builds.
This CL increases the frame size for builds where SANITIZE_TARGET is
non-empty from 6400 to 7400 (6400 was insufficient for ASAN and
coverage) to ensure that it builds successfully.
This was previously submitted as ag/
1353693 for Android.common_build.mk,
but it looks like the frame size modifications have now moved to art.go
instead (found out from ag/
1468464).
Bug:
30766843
Test: m test-art-host
Change-Id: If05defdcf93e2f6f7179941d95d8ee99c4c9a385
David Sehr [Mon, 26 Sep 2016 14:42:26 +0000 (14:42 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
am:
0cfe19af3b
Change-Id: Ifd5c3e906c3175ba25dc179d6378be0f1aa80c84
David Sehr [Mon, 26 Sep 2016 14:34:49 +0000 (14:34 +0000)]
Merge "Fix CTS crash from DexFile refactoring"
Nicolas Geoffray [Mon, 26 Sep 2016 12:45:49 +0000 (12:45 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
am:
3cc69a8944
Change-Id: I7b485879dbaee0feea345d2834fef348405eec83
Treehugger Robot [Mon, 26 Sep 2016 12:39:16 +0000 (12:39 +0000)]
Merge "Compensate in compiler for verifier shortcomings."
Nicolas Geoffray [Fri, 23 Sep 2016 14:40:41 +0000 (15:40 +0100)]
Compensate in compiler for verifier shortcomings.
The verifier does not differentiate zero and null, so a move-object
of zero can be used as a non-object later on.
Change the compiler to ignore the object conversion when the input
is zero or a phi (which might just hold zeros). The type propagation
will then do proper inferencing of the types.
Also remove some stalled comments in ssa_builder.cc.
bug:
31313170
test: dex2oat
b31313170.apk
test: run-test 800
test: m test-art-host-run-test
Change-Id: I579d667415a7decf8ff2c2238dae4c13eec5d0e0