OSDN Git Service

android-x86/art.git
7 years agoART: More header cleanup - CC
Andreas Gampe [Mon, 24 Apr 2017 20:22:18 +0000 (13:22 -0700)]
ART: More header cleanup - CC

Forward-declare AtomicStack in CC. Use stack_reference in atomic_stack.h.

Test: mmma art
Change-Id: I863ca8d4a8dfd5e83279fd68ea0e1a94c3c5df6d
(cherry picked from commit 291ce17ada5a126be99f0fc069a028d2100bcf9e)

7 years agoMerge "Merge internal master oc-dev" into oc-dev
David Sehr [Tue, 25 Apr 2017 16:29:33 +0000 (16:29 +0000)]
Merge "Merge internal master oc-dev" into oc-dev

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()" into oc-dev
Calin Juravle [Mon, 24 Apr 2017 22:00:37 +0000 (22:00 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" into oc-dev

7 years agoMerge internal master oc-dev
David Sehr [Mon, 24 Apr 2017 15:59:08 +0000 (08:59 -0700)]
Merge internal master oc-dev

Fixes for O release, including CC code size issue, JVMTI, ART
vectorization, the borg scanner, secondary dex files, and others.

Bug: 29516974
Bug: 30126666
Bug: 36141117
Bug: 30773047
Bug: 30933338
Test: make -j 40 test-art-host; art/test.py -j 8 --target
Change-Id: I77ea4e19dfa45bdf843f16f74154bf8655c258d8

7 years agoLower profiler saver thread priority.
Nicolas Geoffray [Fri, 21 Apr 2017 13:30:18 +0000 (14:30 +0100)]
Lower profiler saver thread priority.

Spotted while looking at bug reports. Doesn't hurt, and better
be safe than sorry.

bug:37446669
bug:36631902
test:manual, looking at bugreports

(cherry picked from commit 23caed84eba735b2615f5962b5161f6dc9e8bd4e)

Change-Id: I47723e368f3a7d863a9ed2e85c223e6e242508d5

7 years agoMerge "ART: Fix missing include" am: a2dfb0f481 am: 1711753241 am: cfde347c47
Andreas Gampe [Sat, 22 Apr 2017 03:06:44 +0000 (03:06 +0000)]
Merge "ART: Fix missing include" am: a2dfb0f481 am: 1711753241 am: cfde347c47
am: 0d6eea29c1

Change-Id: If1238f081fb3bae5649f59f2d865340544c8749a

7 years agoMerge "ART: Fix missing include" am: a2dfb0f481 am: 1711753241
Andreas Gampe [Sat, 22 Apr 2017 03:03:46 +0000 (03:03 +0000)]
Merge "ART: Fix missing include" am: a2dfb0f481 am: 1711753241
am: cfde347c47

Change-Id: Ib5a457c37bfcb38a931db1ba4ca773bfe33deac9

7 years agoMerge "ART: Fix missing include" am: a2dfb0f481
Andreas Gampe [Sat, 22 Apr 2017 03:00:14 +0000 (03:00 +0000)]
Merge "ART: Fix missing include" am: a2dfb0f481
am: 1711753241

Change-Id: If7f70afee5f91c18cf7589fd858d2a09fd0368df

7 years agoMerge "ART: Fix missing include"
Andreas Gampe [Sat, 22 Apr 2017 02:56:13 +0000 (02:56 +0000)]
Merge "ART: Fix missing include"
am: a2dfb0f481

Change-Id: Ib6fc34ea42d0865a854194bd2b7203e5ba8ed89d

7 years agoMerge "ART: Fix missing include"
Andreas Gampe [Sat, 22 Apr 2017 02:47:13 +0000 (02:47 +0000)]
Merge "ART: Fix missing include"

7 years agoART: Fix missing include
Andreas Gampe [Sat, 22 Apr 2017 02:11:15 +0000 (19:11 -0700)]
ART: Fix missing include

Add required headers.

Bug: 37187694
Test: mmma art
Change-Id: I0f39498453973ed9bfbad97965f2dff215caea98

7 years agoMerge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80 am: 1c7fc906b2 am: 47167a4aed
Andreas Gampe [Sat, 22 Apr 2017 02:38:14 +0000 (02:38 +0000)]
Merge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80 am: 1c7fc906b2 am: 47167a4aed
am: 2549f1b6be

Change-Id: Ib37415feabfc94a30607f95fc0557b1447b65c2e

7 years agoMerge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80 am: 1c7fc906b2
Andreas Gampe [Sat, 22 Apr 2017 02:35:14 +0000 (02:35 +0000)]
Merge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80 am: 1c7fc906b2
am: 47167a4aed

Change-Id: Ic1372a41f56bd58530f35ef7087f4b964d7ec3b9

7 years agoMerge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80
Andreas Gampe [Sat, 22 Apr 2017 02:31:45 +0000 (02:31 +0000)]
Merge "ART: Add object-readbarrier-inl.h" am: 9dd326eb80
am: 1c7fc906b2

Change-Id: Ie1832b24af24afdad43fb17c70fb68613b65d646

7 years agoMerge "ART: Add object-readbarrier-inl.h"
Andreas Gampe [Sat, 22 Apr 2017 02:28:41 +0000 (02:28 +0000)]
Merge "ART: Add object-readbarrier-inl.h"
am: 9dd326eb80

Change-Id: I6b6cb998d531e7012ee5fa7f5ee031839021f553

7 years agoMerge "ART: Add object-readbarrier-inl.h"
Treehugger Robot [Sat, 22 Apr 2017 02:22:47 +0000 (02:22 +0000)]
Merge "ART: Add object-readbarrier-inl.h"

7 years agoMerge "More robust GC verification and corruption dumping" am: 498305d881 am: 59f799b...
Mathieu Chartier [Sat, 22 Apr 2017 01:22:39 +0000 (01:22 +0000)]
Merge "More robust GC verification and corruption dumping" am: 498305d881 am: 59f799b1de am: 338a6ecdbc
am: da85c80f9e

Change-Id: Id012633a50dda525e9317d374c6eb146d3c66c03

7 years agoMerge "More robust GC verification and corruption dumping" am: 498305d881 am: 59f799b1de
Mathieu Chartier [Sat, 22 Apr 2017 01:20:07 +0000 (01:20 +0000)]
Merge "More robust GC verification and corruption dumping" am: 498305d881 am: 59f799b1de
am: 338a6ecdbc

Change-Id: I7e094870343ccaef32dc9523227b31bd849edab9

7 years agoMerge "More robust GC verification and corruption dumping" am: 498305d881
Mathieu Chartier [Sat, 22 Apr 2017 01:17:09 +0000 (01:17 +0000)]
Merge "More robust GC verification and corruption dumping" am: 498305d881
am: 59f799b1de

Change-Id: Ifaa0f1bf4d2b3a084aa0b0579b0ae9405cd9735e

7 years agoMerge "More robust GC verification and corruption dumping"
Mathieu Chartier [Sat, 22 Apr 2017 01:14:06 +0000 (01:14 +0000)]
Merge "More robust GC verification and corruption dumping"
am: 498305d881

Change-Id: I6b28aa4a3ece41c28cb8a6cd7b4e1e67c79bb117

7 years agoMerge "ART: Refactor run-test 911" am: 0a5fa0cf48 am: b20b623690 am: a252b4b6cb
Andreas Gampe [Sat, 22 Apr 2017 01:12:07 +0000 (01:12 +0000)]
Merge "ART: Refactor run-test 911" am: 0a5fa0cf48 am: b20b623690 am: a252b4b6cb
am: 0bd5bb8a92

Change-Id: If740c34065cbee1ee6826a8146de39b6ddc9228e

7 years agoMerge "More robust GC verification and corruption dumping"
Mathieu Chartier [Sat, 22 Apr 2017 01:08:52 +0000 (01:08 +0000)]
Merge "More robust GC verification and corruption dumping"

7 years agoMerge "ART: Refactor run-test 911" am: 0a5fa0cf48 am: b20b623690
Andreas Gampe [Sat, 22 Apr 2017 01:05:38 +0000 (01:05 +0000)]
Merge "ART: Refactor run-test 911" am: 0a5fa0cf48 am: b20b623690
am: a252b4b6cb

Change-Id: I648298b8748fd6c1fdc6b17af3a8d013dbe2c9c8

7 years agoMerge "ART: Refactor run-test 911" am: 0a5fa0cf48
Andreas Gampe [Sat, 22 Apr 2017 01:02:38 +0000 (01:02 +0000)]
Merge "ART: Refactor run-test 911" am: 0a5fa0cf48
am: b20b623690

Change-Id: Id9d0f48b34e50af5e8780e062f13ff9ba23bc892

7 years agoMerge "ART: Refactor run-test 911"
Andreas Gampe [Sat, 22 Apr 2017 00:59:36 +0000 (00:59 +0000)]
Merge "ART: Refactor run-test 911"
am: 0a5fa0cf48

Change-Id: I2bc2f097d7bf246875ae9ceac1517c442720e66a

7 years agoMerge "ART: Refactor run-test 911"
Treehugger Robot [Sat, 22 Apr 2017 00:52:42 +0000 (00:52 +0000)]
Merge "ART: Refactor run-test 911"

7 years agoMerge "Add suppression for process_vm_readv." am: 6a90934ab3 am: a869892f05 am: d658a...
Josh Gao [Fri, 21 Apr 2017 23:55:58 +0000 (23:55 +0000)]
Merge "Add suppression for process_vm_readv." am: 6a90934ab3 am: a869892f05 am: d658a4c557
am: 8fde516da8

Change-Id: I0b430f9b5f772218dc93ab8c4d04f08a2cb438fb

7 years agoART: Add object-readbarrier-inl.h
Andreas Gampe [Fri, 21 Apr 2017 19:09:39 +0000 (12:09 -0700)]
ART: Add object-readbarrier-inl.h

Move some read-barrier code into a new header. This prunes the
include tree for the concurrent-copying collector. Clean up other
related includes.

Test: mmma art
Change-Id: I40ce4e74f2e5d4c692529ffb4df933230b6fd73e

7 years agoMerge "Add suppression for process_vm_readv." am: 6a90934ab3 am: a869892f05
Josh Gao [Fri, 21 Apr 2017 23:40:34 +0000 (23:40 +0000)]
Merge "Add suppression for process_vm_readv." am: 6a90934ab3 am: a869892f05
am: d658a4c557

Change-Id: I65502de72ac7a99516008f31c0111415ab83872a

7 years agoMerge "Add suppression for process_vm_readv." am: 6a90934ab3
Josh Gao [Fri, 21 Apr 2017 23:34:30 +0000 (23:34 +0000)]
Merge "Add suppression for process_vm_readv." am: 6a90934ab3
am: a869892f05

Change-Id: Ib6637aead2624d3fd1b6985eb31722e5796f7219

7 years agoMerge "Add suppression for process_vm_readv."
Josh Gao [Fri, 21 Apr 2017 23:32:01 +0000 (23:32 +0000)]
Merge "Add suppression for process_vm_readv."
am: 6a90934ab3

Change-Id: I38ab1f07745935bb7989de3dc6394d40744cbc69

7 years agoMerge "Add suppression for process_vm_readv."
Treehugger Robot [Fri, 21 Apr 2017 23:26:05 +0000 (23:26 +0000)]
Merge "Add suppression for process_vm_readv."

7 years agoMerge "run_build_test_target: Fix run-test not running for art-test[-javac]" am:...
Igor Murashkin [Fri, 21 Apr 2017 23:22:31 +0000 (23:22 +0000)]
Merge "run_build_test_target: Fix run-test not running for art-test[-javac]" am: e81b88f5ee am: b71ae58ca9 am: f9ef18c87f
am: 3fe77aa780

Change-Id: I014e51bec3d06ccbadd30ae9725156bfa8eb423b

7 years agoMerge "run_build_test_target: Fix run-test not running for art-test[-javac]" am:...
Igor Murashkin [Fri, 21 Apr 2017 23:16:30 +0000 (23:16 +0000)]
Merge "run_build_test_target: Fix run-test not running for art-test[-javac]" am: e81b88f5ee am: b71ae58ca9
am: f9ef18c87f

Change-Id: Ic4d967a22f14e47122bacb3533a3c78a3fd73d9d

7 years agoMerge "run_build_test_target: Fix run-test not running for art-test[-javac]" am:...
Igor Murashkin [Fri, 21 Apr 2017 23:13:30 +0000 (23:13 +0000)]
Merge "run_build_test_target: Fix run-test not running for art-test[-javac]" am: e81b88f5ee
am: b71ae58ca9

Change-Id: I3c843d3dd11127dde88f35b51693b2a967ed7a70

7 years agoMerge "run_build_test_target: Fix run-test not running for art-test[-javac]"
Igor Murashkin [Fri, 21 Apr 2017 23:09:59 +0000 (23:09 +0000)]
Merge "run_build_test_target: Fix run-test not running for art-test[-javac]"
am: e81b88f5ee

Change-Id: I16a5fc176b93e6a8b197d7d8a6a610ccd4da45a3

7 years agoART: Refactor run-test 911
Andreas Gampe [Fri, 21 Apr 2017 23:04:27 +0000 (16:04 -0700)]
ART: Refactor run-test 911

Refactor the run-test in preparation for usage in CTS.

Move from the main thread into a dedicated thread. Add filtering
of threads.

Bug: 32072923
Test: m test-art-host
Change-Id: I3e0db90a240dea7154b3d1c6eb93a6f6cce97e21

7 years agoMerge "run_build_test_target: Fix run-test not running for art-test[-javac]"
Treehugger Robot [Fri, 21 Apr 2017 23:01:18 +0000 (23:01 +0000)]
Merge "run_build_test_target: Fix run-test not running for art-test[-javac]"

7 years agoMore robust GC verification and corruption dumping
Mathieu Chartier [Tue, 18 Apr 2017 18:26:22 +0000 (11:26 -0700)]
More robust GC verification and corruption dumping

Added a test for GC heap corruption dumping, added more info to the
dump like adjacent bytes and card table.

Added heap corruption detection in
ConcurrentCopying::MarkNonMoving().

Bug: 37187694
Bug: 12687968

Test: mm test-art-host-gtest-verification_test -j20

Change-Id: I8c90e45796d0784265aa091b2f8082f0cfb62719

7 years agoMerge "ART: Fix Mac build" am: 9ae527f615 am: f35d96a1e3 am: b81016abd5
Andreas Gampe [Fri, 21 Apr 2017 22:04:56 +0000 (22:04 +0000)]
Merge "ART: Fix Mac build" am: 9ae527f615 am: f35d96a1e3 am: b81016abd5
am: 9b712c682c

Change-Id: Id5b2de3a891210d1599924186c3f45bd78a5d9d4

7 years agoMerge "ART: Fix Mac build" am: 9ae527f615 am: f35d96a1e3
Andreas Gampe [Fri, 21 Apr 2017 21:58:55 +0000 (21:58 +0000)]
Merge "ART: Fix Mac build" am: 9ae527f615 am: f35d96a1e3
am: b81016abd5

Change-Id: Ic6e1d7159f595e1f9a85ebdd6c34caef4a9bf913

7 years agoMerge "ART: Fix Mac build" am: 9ae527f615
Andreas Gampe [Fri, 21 Apr 2017 21:56:24 +0000 (21:56 +0000)]
Merge "ART: Fix Mac build" am: 9ae527f615
am: f35d96a1e3

Change-Id: I6a9ca0402409fbbb42cb253c09f9b062827b895d

7 years agoMerge "ART: Fix Mac build"
Andreas Gampe [Fri, 21 Apr 2017 21:53:25 +0000 (21:53 +0000)]
Merge "ART: Fix Mac build"
am: 9ae527f615

Change-Id: I9734f831864fdea26299b4798a85d27b2bb540f0

7 years agoAdd suppression for process_vm_readv.
Josh Gao [Fri, 21 Apr 2017 21:13:54 +0000 (14:13 -0700)]
Add suppression for process_vm_readv.

On some hosts, valgrind complains about the intentional use of
process_vm_readv on invalid addresses.

Test: manually ran safe_copy_test on a VM with a 3.13 kernel
Test: m valgrind-test-art-target-gtest-safe_copy_test32 on angler
Test: m valgrind-test-art-host-gtest-safe_copy_test32 on 4.4 kernel
      (but it wasn't failing in the first place)
Change-Id: Idd4ec19cc81176eb0b880ff1363bffe0c58ec904

7 years agoMerge "ART: Fix Mac build"
Andreas Gampe [Fri, 21 Apr 2017 21:46:46 +0000 (21:46 +0000)]
Merge "ART: Fix Mac build"

7 years agorun_build_test_target: Fix run-test not running for art-test[-javac]
Igor Murashkin [Fri, 21 Apr 2017 20:04:27 +0000 (13:04 -0700)]
run_build_test_target: Fix run-test not running for art-test[-javac]

Test: art/test/testrunner/run_build_test_target.py -j32 art-test
Change-Id: I8e9147fed3db88557376769db52602628754da46

7 years agoART: Fix Mac build
Andreas Gampe [Fri, 21 Apr 2017 20:24:52 +0000 (13:24 -0700)]
ART: Fix Mac build

Another missing transitive include.

Test: m
Change-Id: I3e2691bcf8ddb38e48c7e32dbd9695459f4d9d16

7 years agoIgnore the optimized location passed to DexFile.loadDex()
Calin Juravle [Wed, 19 Apr 2017 04:25:37 +0000 (21:25 -0700)]
Ignore the optimized location passed to DexFile.loadDex()

This ensures that apps don't trigger dex2oat to locations
that are not recognized (anymore) by the runtime.

The background compilation job will takes care of optimizing
the dex files loaded via DexClassLoader.

Test: m test-art-host
Bug: 36824842

(cherry picked from commit 1f7079b72965cba0b1a40f53be97a4944ecb4a51)

Change-Id: Icf07ac70b5d2df7b9e6259877908d12b96827a82

7 years agoMerge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26...
Aart Bik [Fri, 21 Apr 2017 20:19:06 +0000 (20:19 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26 am: fc5558cacf am: 536a476fdf
am: 990cc18eab

Change-Id: Iba68ccb2f9a8fde6bb304ef16ec51045435caa6d

7 years agoMerge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c am: f099e8b163 am: 0d3c9756e2
Aart Bik [Fri, 21 Apr 2017 20:18:45 +0000 (20:18 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c am: f099e8b163 am: 0d3c9756e2
am: c8505291b9

Change-Id: I5c69a4ab32748da18af4e90d3406fb508fd3159d

7 years agoMerge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26...
Aart Bik [Fri, 21 Apr 2017 20:15:09 +0000 (20:15 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26 am: fc5558cacf
am: 536a476fdf

Change-Id: I0623de61695750f37e72f33fc6629e52c1522d81

7 years agoMerge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c am: f099e8b163
Aart Bik [Fri, 21 Apr 2017 20:14:48 +0000 (20:14 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c am: f099e8b163
am: 0d3c9756e2

Change-Id: I49f5fc8aa753c3ef65cb1f3815a38489674cc5e4

7 years agoMerge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26
Aart Bik [Fri, 21 Apr 2017 20:11:38 +0000 (20:11 +0000)]
Merge "Factor vector unary/binary shared code out into superclass." am: 2d4d161f26
am: fc5558cacf

Change-Id: I66c66a79cacf7a69a5609b696bcd31eff7c0cb15

7 years agoMerge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c
Aart Bik [Fri, 21 Apr 2017 20:11:17 +0000 (20:11 +0000)]
Merge "ARM64: Improve SIMD LDR/STR." am: 1cd51da49c
am: f099e8b163

Change-Id: I9a7f77ddbc8734b7109c9478cd441b7c150c8af2

7 years agoMerge "Factor vector unary/binary shared code out into superclass."
Aart Bik [Fri, 21 Apr 2017 20:08:45 +0000 (20:08 +0000)]
Merge "Factor vector unary/binary shared code out into superclass."
am: 2d4d161f26

Change-Id: Id8d7c292409c83bc6c6fa578da90ad44f5af6708

7 years agoMerge "ARM64: Improve SIMD LDR/STR."
Aart Bik [Fri, 21 Apr 2017 20:08:16 +0000 (20:08 +0000)]
Merge "ARM64: Improve SIMD LDR/STR."
am: 1cd51da49c

Change-Id: I66328344fa4346c5a30f8f4f0a0b036bf726becb

7 years agoMerge "Factor vector unary/binary shared code out into superclass."
Treehugger Robot [Fri, 21 Apr 2017 20:01:32 +0000 (20:01 +0000)]
Merge "Factor vector unary/binary shared code out into superclass."

7 years agoMerge "ARM64: Improve SIMD LDR/STR."
Aart Bik [Fri, 21 Apr 2017 20:00:37 +0000 (20:00 +0000)]
Merge "ARM64: Improve SIMD LDR/STR."

7 years agoMerge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2 am: f7fc407e3e
Andreas Gampe [Fri, 21 Apr 2017 19:15:39 +0000 (19:15 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2 am: f7fc407e3e
am: 3aed257fb5

Change-Id: I1719981cfd3f852277894ba20d70e2406f2568a6

7 years agoMerge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714...
Andreas Gampe [Fri, 21 Apr 2017 19:15:17 +0000 (19:15 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714 am: 5337d69ccb am: 9693638da4
am: 039694619e

Change-Id: I1f45ced6f36559b7e8535ee898d8e255c68ff252

7 years agoMerge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2
Andreas Gampe [Fri, 21 Apr 2017 19:10:31 +0000 (19:10 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211 am: 37c1413ab2
am: f7fc407e3e

Change-Id: I8941f7ba1cd29db6d3466e5cb340862c43a234c1

7 years agoMerge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714...
Andreas Gampe [Fri, 21 Apr 2017 19:10:12 +0000 (19:10 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714 am: 5337d69ccb
am: 9693638da4

Change-Id: I16405d02cae958d7a1c3947032e0b8946606bc53

7 years agoMerge changes I6ff2d6f8,I8f60f116 am: 6b8b075211
Andreas Gampe [Fri, 21 Apr 2017 19:06:04 +0000 (19:06 +0000)]
Merge changes I6ff2d6f8,I8f60f116 am: 6b8b075211
am: 37c1413ab2

Change-Id: I8c69f9afc9d51aa838f0541794962240602913e5

7 years agoMerge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714
Andreas Gampe [Fri, 21 Apr 2017 19:05:44 +0000 (19:05 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler' am: e0ffd22714
am: 5337d69ccb

Change-Id: I888c2e85e950222f8c75df6648b181163fa1b2ba

7 years agoMerge changes I6ff2d6f8,I8f60f116
Andreas Gampe [Fri, 21 Apr 2017 19:02:10 +0000 (19:02 +0000)]
Merge changes I6ff2d6f8,I8f60f116
am: 6b8b075211

Change-Id: Iec665a5733bb2da0a926317e732382f7993489f9

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5...
Calin Juravle [Fri, 21 Apr 2017 19:01:51 +0000 (19:01 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5 am: 90a9c1d00a am: 93f8b836f3
am: 3c0f9e3595

Change-Id: Idfaf073fdbb8396d235962ebfe1eb1c06e7e89c6

7 years agoMerge changes from topic 'art_move_inline_method_anlyzer_to_compiler'
Andreas Gampe [Fri, 21 Apr 2017 19:01:43 +0000 (19:01 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler'
am: e0ffd22714

Change-Id: I697f4a9bb76b30c76af15fa1da20dc222c9bf12c

7 years agoMerge changes I6ff2d6f8,I8f60f116
Treehugger Robot [Fri, 21 Apr 2017 18:57:25 +0000 (18:57 +0000)]
Merge changes I6ff2d6f8,I8f60f116

* changes:
  ART: Clean up art_field.h
  ART: Clean up art_method.h

7 years agoMerge changes from topic 'art_move_inline_method_anlyzer_to_compiler'
Treehugger Robot [Fri, 21 Apr 2017 18:56:17 +0000 (18:56 +0000)]
Merge changes from topic 'art_move_inline_method_anlyzer_to_compiler'

* changes:
  ART: Clean up InlineMethodAnalyzer
  ART: Move InlineMethodAnalyzer into compiler

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5...
Calin Juravle [Fri, 21 Apr 2017 18:53:11 +0000 (18:53 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5 am: 90a9c1d00a
am: 93f8b836f3

Change-Id: Iab1ad5a0565aec1faf722111a5566b3c104d97fc

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5
Calin Juravle [Fri, 21 Apr 2017 18:50:42 +0000 (18:50 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()" am: 2a9dc4dcc5
am: 90a9c1d00a

Change-Id: I47ccd8953c4f1dd783325de612e3074322df7559

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()"
Calin Juravle [Fri, 21 Apr 2017 18:48:12 +0000 (18:48 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()"
am: 2a9dc4dcc5

Change-Id: I1bfa09f8fb6718f83d928eb85088e0231fccfc3e

7 years agoMerge "Ignore the optimized location passed to DexFile.loadDex()"
Calin Juravle [Fri, 21 Apr 2017 18:41:23 +0000 (18:41 +0000)]
Merge "Ignore the optimized location passed to DexFile.loadDex()"

7 years agoFactor vector unary/binary shared code out into superclass.
Aart Bik [Fri, 21 Apr 2017 16:42:01 +0000 (09:42 -0700)]
Factor vector unary/binary shared code out into superclass.

Test: test-art-target, test-art-host
Change-Id: I42770d9a9142f2e53d3b5bd60bd25593b2154a7c

7 years agoMerge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750 am: 20e7d03d7d...
Mathieu Chartier [Fri, 21 Apr 2017 17:04:34 +0000 (17:04 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750 am: 20e7d03d7d am: dbf3538483
am: a6f265a503

Change-Id: I5f0852f5062fc773d1a384344733b407867aa596

7 years agoMerge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750 am: 20e7d03d7d
Mathieu Chartier [Fri, 21 Apr 2017 16:48:32 +0000 (16:48 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750 am: 20e7d03d7d
am: dbf3538483

Change-Id: I90825e185e8f877684dc3b8a8757e7c2236889bc

7 years agoMerge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750
Mathieu Chartier [Fri, 21 Apr 2017 16:46:01 +0000 (16:46 +0000)]
Merge "Store java_lang_Object_ in the flip callback" am: 9bb7ab6750
am: 20e7d03d7d

Change-Id: Ic5b74f775ea34b5ccfd5b98bbf11ca8da546787c

7 years agoMerge "Store java_lang_Object_ in the flip callback"
Mathieu Chartier [Fri, 21 Apr 2017 16:42:30 +0000 (16:42 +0000)]
Merge "Store java_lang_Object_ in the flip callback"
am: 9bb7ab6750

Change-Id: Ib86a5c6905f8bfe9a5453ee187ab14dc842a0f5f

7 years agoARM64: Improve SIMD LDR/STR.
Artem Serov [Wed, 19 Apr 2017 14:43:53 +0000 (15:43 +0100)]
ARM64: Improve SIMD LDR/STR.

Test: 640-checker-*-simd
Test: test-art-target, test-art-host

Change-Id: I2bcdef3f5cb7c0e7d1b3d02910fbf89ac694d89a

7 years agoART: Clean up InlineMethodAnalyzer
Andreas Gampe [Fri, 21 Apr 2017 03:07:21 +0000 (20:07 -0700)]
ART: Clean up InlineMethodAnalyzer

Remove dead code.

Test: m test-art-host
Change-Id: If86503fde2a77279a3169144bcae700101d81784

7 years agoART: Move InlineMethodAnalyzer into compiler
Andreas Gampe [Fri, 21 Apr 2017 02:43:21 +0000 (19:43 -0700)]
ART: Move InlineMethodAnalyzer into compiler

Move the infrastructure, which is now only used by the compiler.

Test: mmma art
Change-Id: I4a61e35f23736b226523d7349f49208ad852ad2f

7 years agoMerge "Store java_lang_Object_ in the flip callback"
Mathieu Chartier [Fri, 21 Apr 2017 16:34:44 +0000 (16:34 +0000)]
Merge "Store java_lang_Object_ in the flip callback"

7 years agoStore java_lang_Object_ in the flip callback
Mathieu Chartier [Fri, 21 Apr 2017 02:28:54 +0000 (19:28 -0700)]
Store java_lang_Object_ in the flip callback

There was a race where the GC thread would not have is_marking =
true, and call
WellKnownClasses::ToClass(WellKnownClasses::java_lang_Object). This
meant that the returned class was maybe in the from-space for the
no image case. The fix was to move this decoding into the flip
callback since this callback is called before flipping any thread
roots.

Bug: 37531237
Bug: 12687968
Test: test-art-host

Change-Id: I9a09249e9c6ea2b3b124e957a9e4b61017869306

7 years agoART: Clean up art_field.h
Andreas Gampe [Fri, 21 Apr 2017 05:53:58 +0000 (22:53 -0700)]
ART: Clean up art_field.h

Clean up the header. Fix up other headers including the -inl file,
in an effort to prune the include graph. Fix broken transitive
includes by making includes explicit.

Test: m
Change-Id: I6ff2d6f89b741d8188e19426eccf4743fec688fc

7 years agoART: Clean up art_method.h
Andreas Gampe [Thu, 2 Feb 2017 00:46:28 +0000 (16:46 -0800)]
ART: Clean up art_method.h

Clean up the header. Fix up other headers including the -inl file,
in an effort to prune the include graph. Fix broken transitive
includes by making includes explicit. Introduce new -inl files
for method handles and reference visiting.

Test: source build/envsetup.sh && lunch aosp_angler-userdebug && mmma art
Test: source build/envsetup.sh && lunch aosp_mips64-userdebug && mmma art
Change-Id: I8f60f1160c2a702fdf3598149dae38f6fa6bc851

7 years agoMerge "Fix verifier crash on abstract final class." am: d68677c5fd am: 4d32c69622...
Vladimir Marko [Fri, 21 Apr 2017 14:39:55 +0000 (14:39 +0000)]
Merge "Fix verifier crash on abstract final class." am: d68677c5fd am: 4d32c69622 am: 9fdd729158
am: 0d5f222b73

Change-Id: I462637c2d9bf0720c788d9374479de0f2c6304bb

7 years agoMerge "Fix verifier crash on abstract final class." am: d68677c5fd am: 4d32c69622
Vladimir Marko [Fri, 21 Apr 2017 14:36:24 +0000 (14:36 +0000)]
Merge "Fix verifier crash on abstract final class." am: d68677c5fd am: 4d32c69622
am: 9fdd729158

Change-Id: Id9932a219d9dbfdbd839d325ca02fd391834024a

7 years agoMerge "Fix verifier crash on abstract final class." am: d68677c5fd
Vladimir Marko [Fri, 21 Apr 2017 14:33:25 +0000 (14:33 +0000)]
Merge "Fix verifier crash on abstract final class." am: d68677c5fd
am: 4d32c69622

Change-Id: Ia92526ea0cbeee6738cf07b5c620ffa7007214af

7 years agoMerge "Fix verifier crash on abstract final class."
Vladimir Marko [Fri, 21 Apr 2017 14:29:24 +0000 (14:29 +0000)]
Merge "Fix verifier crash on abstract final class."
am: d68677c5fd

Change-Id: I8a6c1791532318a96844cc49c708a99b7283bb8c

7 years agoMerge "Fix verifier crash on abstract final class."
Treehugger Robot [Fri, 21 Apr 2017 14:24:57 +0000 (14:24 +0000)]
Merge "Fix verifier crash on abstract final class."

7 years agoFix verifier crash on abstract final class.
Vladimir Marko [Fri, 21 Apr 2017 12:31:41 +0000 (13:31 +0100)]
Fix verifier crash on abstract final class.

Remove a check for erroneous class. It should not matter to
the verifier whether the class is just resolved, initialized
or resolved erroneous. The check was also inherently racy
and could yield different behavior based on the timing of
the verification.

Test: 161-final-abstract-class
Test: testrunner.py --host
Bug: 37248840
Change-Id: Ic4d964050bbe52e3de4438ada9e75676956cb6b4

7 years agoMerge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6 am: 786a563...
Vladimir Marko [Fri, 21 Apr 2017 11:32:13 +0000 (11:32 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6 am: 786a563287 am: 9252b98c00
am: 0ce1b704f6

Change-Id: I58f830d7fe49e520d4f915a7280edd6d8d997e34

7 years agoMerge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6 am: 786a563287
Vladimir Marko [Fri, 21 Apr 2017 11:29:13 +0000 (11:29 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6 am: 786a563287
am: 9252b98c00

Change-Id: I987e32eb975a034003054623716cfd3d491fbd83

7 years agoMerge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6
Vladimir Marko [Fri, 21 Apr 2017 11:26:12 +0000 (11:26 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner." am: 6d3c61d8c6
am: 786a563287

Change-Id: I743e63c0c00946fa354686ec13d072c30dd66370

7 years agoMerge "Reuse DexCache and ClassLoader handles in inliner."
Vladimir Marko [Fri, 21 Apr 2017 11:23:41 +0000 (11:23 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner."
am: 6d3c61d8c6

Change-Id: I2815484428676b663bc53bc45c5818ab19e3eab2

7 years agoMerge "Reuse DexCache and ClassLoader handles in inliner."
Treehugger Robot [Fri, 21 Apr 2017 11:17:46 +0000 (11:17 +0000)]
Merge "Reuse DexCache and ClassLoader handles in inliner."

7 years agoReuse DexCache and ClassLoader handles in inliner.
Vladimir Marko [Thu, 20 Apr 2017 18:50:32 +0000 (19:50 +0100)]
Reuse DexCache and ClassLoader handles in inliner.

Measured memory usage with heaptrack for a large app:
  Before:
    bytes allocated in total (ignoring deallocations): 3.14GB
    calls to allocation functions: 8130596
  After:
    bytes allocated in total (ignoring deallocations): 3.12GB
    calls to allocation functions: 7750377

Test: testrunner.py --host
Bug: 34053922
Change-Id: I1ad7aaffccc6527cd4f409ca8fca75bab8d7439a

7 years agoMerge "Handle catch phis in code sinking." am: d1a05c9088 am: 7a717284ab am: 0ac60fee7a
Nicolas Geoffray [Fri, 21 Apr 2017 08:14:01 +0000 (08:14 +0000)]
Merge "Handle catch phis in code sinking." am: d1a05c9088 am: 7a717284ab am: 0ac60fee7a
am: b3763272cd

Change-Id: I25abcd0378d178778688a5c5e495d98e5df21e01

7 years agoMerge "Handle catch phis in code sinking." am: d1a05c9088 am: 7a717284ab
Nicolas Geoffray [Fri, 21 Apr 2017 08:11:02 +0000 (08:11 +0000)]
Merge "Handle catch phis in code sinking." am: d1a05c9088 am: 7a717284ab
am: 0ac60fee7a

Change-Id: I302165f06e65ad94a96a5d80d6fa5df499aea44a

7 years agoMerge "Handle catch phis in code sinking." am: d1a05c9088
Nicolas Geoffray [Fri, 21 Apr 2017 08:08:00 +0000 (08:08 +0000)]
Merge "Handle catch phis in code sinking." am: d1a05c9088
am: 7a717284ab

Change-Id: I8169f02159771093821441cf774eb75ec107a77f