OSDN Git Service
Vladimir Marko [Thu, 20 Apr 2017 15:25:50 +0000 (15:25 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()." am:
38870a8a27
am:
404d562547
Change-Id: I36f5c055a894abae61682ac123a186132d7a5c1a
Vladimir Marko [Thu, 20 Apr 2017 15:23:21 +0000 (15:23 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()."
am:
38870a8a27
Change-Id: Iffc3aed0a5fc54dac5a36518faf416724a03266f
Treehugger Robot [Thu, 20 Apr 2017 15:16:44 +0000 (15:16 +0000)]
Merge "Add descriptor validation to ClassLinker::FindClass()."
Vladimir Marko [Thu, 20 Apr 2017 10:26:03 +0000 (11:26 +0100)]
Add descriptor validation to ClassLinker::FindClass().
And add tests for odd signatures passed to JNI GetFieldID().
Previously, passing the signature "java/lang/String" instead
of "Ljava/lang/String;" would call the class loader with the
dot name java.lang.String and the class loader would find
that class only to fail the DescriptorEquals() check back
in ClassLinker::FindClass().
Test: 647-jni-get-field-id
Bug:
33577836
Bug:
37156832
Change-Id: I6612a272ec24b0d54b728fd35003e9c24a7e2e95
Nicolas Geoffray [Thu, 20 Apr 2017 12:39:08 +0000 (12:39 +0000)]
Merge "Fix fault_handler with heap poisoning." am:
aa03f6fa38
am:
92f47fb522
Change-Id: I4ea97ec3c2ba52dd274e1e3e85738d0bb7b740c3
Nicolas Geoffray [Thu, 20 Apr 2017 12:36:09 +0000 (12:36 +0000)]
Merge "Fix fault_handler with heap poisoning."
am:
aa03f6fa38
Change-Id: I8acd9d6f7129c1034c34e1722ac35e5a14d3f3df
Nicolas Geoffray [Thu, 20 Apr 2017 12:32:48 +0000 (12:32 +0000)]
Merge "Fix fault_handler with heap poisoning."
Nicolas Geoffray [Thu, 20 Apr 2017 11:50:13 +0000 (12:50 +0100)]
Fix fault_handler with heap poisoning.
test: test-art-host
Change-Id: Ifeb3d5ff4cfdcb703d5874bca90c9c1438d86f08
Nicolas Geoffray [Thu, 20 Apr 2017 11:10:33 +0000 (11:10 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type." am:
de9e54abcf
am:
a629563348
Change-Id: I7d1021243fe0f45cb9428976bee077cc85925ccc
Nicolas Geoffray [Thu, 20 Apr 2017 11:08:03 +0000 (11:08 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type."
am:
de9e54abcf
Change-Id: Ide0f8c117fc1f7406966bea73e88009eca21bc3d
Treehugger Robot [Thu, 20 Apr 2017 11:01:32 +0000 (11:01 +0000)]
Merge "Vdex: Workaround arrays with erroneous component type."
Nicolas Geoffray [Wed, 19 Apr 2017 12:50:34 +0000 (13:50 +0100)]
Vdex: Workaround arrays with erroneous component type.
The assignability DCHECK is only reliable when classes are not
erroneous. For arrays whose component type could be erroneous,
the verifier can join types even if they're not assignable.
bug:
33770646
Test: verifier_deps_test
Change-Id: I4ec1b12b2e2c7d5b57b51a64aea381f951a38dcd
Josh Gao [Thu, 20 Apr 2017 03:11:28 +0000 (03:11 +0000)]
Merge "base: make SafeCopy work on older Linux kernels." am:
8d0f3aaf28
am:
f97911fa01
Change-Id: I35f86968f1d44e28dcd74e6b00d4d22d11da6b3b
Josh Gao [Thu, 20 Apr 2017 03:09:00 +0000 (03:09 +0000)]
Merge "base: make SafeCopy work on older Linux kernels."
am:
8d0f3aaf28
Change-Id: I6542a492d60208b37f4880dc0d92d8ac3e61857d
Treehugger Robot [Thu, 20 Apr 2017 03:04:32 +0000 (03:04 +0000)]
Merge "base: make SafeCopy work on older Linux kernels."
Josh Gao [Wed, 19 Apr 2017 22:44:20 +0000 (15:44 -0700)]
base: make SafeCopy work on older Linux kernels.
process_vm_readv is documented to not split transfer across a single
iovec element, but this appears to not be the case for the newer
kernels we have on our workstations.
Split up transfers across page boundaries, to avoid this. This has the
side effect of limiting the maximum size of a transfer, but 64 pages
ought to be enough for anybody.
Test: safe_copy_test on 3.13.0-101-generic (failing before)
Test: safe_copy_test on 4.4.0-66-generic (still passing)
Change-Id: I6a6dbf0cd2aeaa7eab39f6d41285d46ebd760e30
Colin Cross [Wed, 19 Apr 2017 23:00:12 +0000 (23:00 +0000)]
Merge "Remove obsolete rules to build runtests" am:
6c99499c8a
am:
c55ed0c843
Change-Id: Iff78a4f014c0a6d8888301c3c8455dc220ceeec5
Colin Cross [Wed, 19 Apr 2017 22:58:42 +0000 (22:58 +0000)]
Merge "Remove obsolete rules to build runtests"
am:
6c99499c8a
Change-Id: I5e10478e2ffadec2c0ccad151c49c24e24e05a96
Andreas Gampe [Wed, 19 Apr 2017 22:58:42 +0000 (22:58 +0000)]
Merge changes from topic 'art_run_test_912_cts_refactor' am:
afcec28403
am:
ccaac1364d
Change-Id: I01b0db54a7556a0619b301f8dd8d0c24b823aa57
Andreas Gampe [Wed, 19 Apr 2017 22:56:47 +0000 (22:56 +0000)]
Merge changes from topic 'art_run_test_912_cts_refactor'
am:
afcec28403
Change-Id: Ibda516ad39de9a931e3b4ddc3ecfbeaba01dc719
Colin Cross [Wed, 19 Apr 2017 22:54:19 +0000 (22:54 +0000)]
Merge "Remove obsolete rules to build runtests"
Treehugger Robot [Wed, 19 Apr 2017 22:52:57 +0000 (22:52 +0000)]
Merge changes from topic 'art_run_test_912_cts_refactor'
* changes:
ART: Refactor run-test 912 (3/3)
ART: Refactor run-test 912 (2/3)
ART: Refactor run-test 912 (1/3)
Andreas Gampe [Wed, 19 Apr 2017 20:45:25 +0000 (13:45 -0700)]
ART: Refactor run-test 912 (3/3)
Add run-test Main.
Bug:
32072923
Test: m
Test: art/test/testrunner/testrunner.py -b --host -t 912
Change-Id: I4a4bbe587937d9b87eab77af1a5f05fd4df7f0d4
Andreas Gampe [Wed, 19 Apr 2017 20:43:43 +0000 (13:43 -0700)]
ART: Refactor run-test 912 (2/3)
Move the refactored run-test into place.
Bug:
32072923
Test: m
Change-Id: I170cd1465a3afce3f48a9cbad864eaa5d9fdaacc
Andreas Gampe [Wed, 19 Apr 2017 20:37:48 +0000 (13:37 -0700)]
ART: Refactor run-test 912 (1/3)
Refactor the test for CTS. Break out the ART-specific part. Move
the rest into the regular layout. Move class events to their own
thread, and report them on the Java side. Use InMemoryDexClassLoader
for classloaders to avoid explicit files.
Bug:
32072923
Test: none
Change-Id: I80e27cc9c21646bbecd1de1a246f583a0d388e05
Josh Gao [Wed, 19 Apr 2017 20:31:32 +0000 (20:31 +0000)]
Merge "fault_handler: hopefully fix darwin build." am:
1f56cb5c59
am:
b04c235e46
Change-Id: Ida7ba6f4aae320c099a26ebbbea1feac249c02e1
Josh Gao [Wed, 19 Apr 2017 20:29:35 +0000 (20:29 +0000)]
Merge "fault_handler: hopefully fix darwin build."
am:
1f56cb5c59
Change-Id: I9ef55964245472afd412ae0720651bc2fdcdc2e0
Josh Gao [Wed, 19 Apr 2017 20:22:45 +0000 (20:22 +0000)]
Merge "fault_handler: hopefully fix darwin build."
Josh Gao [Wed, 19 Apr 2017 20:20:19 +0000 (13:20 -0700)]
fault_handler: hopefully fix darwin build.
Test: none
Change-Id: I08adf266c6287a289d213a0b1fa854f223fec72d
David Sehr [Wed, 19 Apr 2017 20:06:24 +0000 (20:06 +0000)]
Merge "Revert "Add dexdiag_test"" am:
1cfe8728e0
am:
9206a9a087
Change-Id: I68633122a2e6fa9ded5c445bae84592e79333fa6
Josh Gao [Wed, 19 Apr 2017 20:06:02 +0000 (20:06 +0000)]
Merge changes Ie3d5e176,Ic1fbb885,I10bafcff am:
3955baf83f
am:
398dd33a1e
Change-Id: I5d7d7231784cd6cc6908b926377e67c93423b097
David Sehr [Wed, 19 Apr 2017 20:04:28 +0000 (20:04 +0000)]
Merge "Revert "Add dexdiag_test""
am:
1cfe8728e0
Change-Id: I705ab54f2a7386373be5fbb469ca1e1dfde670fe
Josh Gao [Wed, 19 Apr 2017 20:04:04 +0000 (20:04 +0000)]
Merge changes Ie3d5e176,Ic1fbb885,I10bafcff
am:
3955baf83f
Change-Id: I449e532cd4061667213fea7a999278f7a52f6b9f
David Sehr [Wed, 19 Apr 2017 20:00:50 +0000 (20:00 +0000)]
Merge "Revert "Add dexdiag_test""
Treehugger Robot [Wed, 19 Apr 2017 19:57:35 +0000 (19:57 +0000)]
Merge changes Ie3d5e176,Ic1fbb885,I10bafcff
* changes:
fault_handler: use SafeCopy to verify the validity of ArtMethod.
fault_handler: use SafeCopy to decode x86 instruction length.
base: add SafeCopy.
David Sehr [Wed, 19 Apr 2017 19:44:08 +0000 (19:44 +0000)]
Revert "Add dexdiag_test"
This reverts commit
2120ad43acc0ab0fa74c151069948ef9698c009f.
Change-Id: Icdb42e47eb2f099cbfbd302477ad6614bb8524f1
Alex Light [Wed, 19 Apr 2017 19:38:29 +0000 (19:38 +0000)]
Merge "Implement can_generate_native_method_bind capability" am:
9088df87d9
am:
be94b3b662
Change-Id: Ib82b927d7f4d5b8b54eeb7d99bba180edf13168f
Alex Light [Wed, 19 Apr 2017 19:35:59 +0000 (19:35 +0000)]
Merge "Implement can_generate_native_method_bind capability"
am:
9088df87d9
Change-Id: I7be5238299d959c2d7bdabffe436fd7469cbd1e7
Treehugger Robot [Wed, 19 Apr 2017 19:31:06 +0000 (19:31 +0000)]
Merge "Implement can_generate_native_method_bind capability"
Aart Bik [Wed, 19 Apr 2017 19:26:28 +0000 (19:26 +0000)]
Merge "Implement halving add idiom (with checker tests)." am:
ed5d0ee21e
am:
d9928c6d46
Change-Id: Ibcc7372b669d9e0872dbb267245bf43341db3f8b
Aart Bik [Wed, 19 Apr 2017 19:24:27 +0000 (19:24 +0000)]
Merge "Implement halving add idiom (with checker tests)."
am:
ed5d0ee21e
Change-Id: Ibc118d3cad5b7563426a9fee07e1082e750da552
Treehugger Robot [Wed, 19 Apr 2017 19:19:00 +0000 (19:19 +0000)]
Merge "Implement halving add idiom (with checker tests)."
Chris Larsen [Wed, 19 Apr 2017 18:24:22 +0000 (18:24 +0000)]
Merge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]." am:
88b7c37163
am:
ca6b4d94db
Change-Id: I3ab7a9f62284f8c23074f9a7d226affff234186f
Chris Larsen [Wed, 19 Apr 2017 18:21:52 +0000 (18:21 +0000)]
Merge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]."
am:
88b7c37163
Change-Id: Iae649dc92794bee44aec59b000a1ae312d2093c7
Treehugger Robot [Wed, 19 Apr 2017 18:15:58 +0000 (18:15 +0000)]
Merge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]."
Mingyao Yang [Wed, 19 Apr 2017 18:05:20 +0000 (18:05 +0000)]
Merge "Fix CHA test failures under some configurations." am:
59715029ae
am:
2566578b70
Change-Id: I73941a7f22d70380a7239c78e1f6628e0d456470
Mingyao Yang [Wed, 19 Apr 2017 18:03:51 +0000 (18:03 +0000)]
Merge "Fix CHA test failures under some configurations."
am:
59715029ae
Change-Id: I2b3f997173ad4a99470333b2d1c7c5dc4ec15b6f
Mingyao Yang [Wed, 19 Apr 2017 17:59:32 +0000 (17:59 +0000)]
Merge "Fix CHA test failures under some configurations."
Josh Gao [Tue, 18 Apr 2017 03:10:29 +0000 (20:10 -0700)]
fault_handler: use SafeCopy to verify the validity of ArtMethod.
Reimplement ArtMethod::GetDeclaringClassUnchecked and VerifyClassClass
in terms of SafeCopy, to be able to safely verify the validity of
putative ArtMethods in FaultManager::IsInGeneratedCode.
Bug: http://b/
30836730
Test: m test-art-host
Change-Id: Ie3d5e176ea569cedcefd320e2480a1e1e496a53a
Aart Bik [Thu, 13 Apr 2017 00:09:20 +0000 (17:09 -0700)]
Implement halving add idiom (with checker tests).
Rationale:
First of several idioms that map to very efficient SIMD instructions.
Note that the is-zero-ext and is-sign-ext are general-purpose utilities
that will be widely used in the vectorizer to detect low precision
idioms, so expect that code to be shared with many CLs to come.
Test: test-art-host, test-art-target
Change-Id: If7dc2926c72a2e4b5cea15c44ef68cf5503e9be9
Jeff Hao [Wed, 19 Apr 2017 17:29:01 +0000 (17:29 +0000)]
Merge "Allow dex2oat to handle relative paths." am:
72fdec3928
am:
678ac3e24a
Change-Id: I0e9e9ffb6c83f1e95ad0cf36ffa0899bf7037071
Jeff Hao [Wed, 19 Apr 2017 17:20:31 +0000 (17:20 +0000)]
Merge "Allow dex2oat to handle relative paths."
am:
72fdec3928
Change-Id: I4daab86a70cde8e9d99b4e49d21e59879d2bec70
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Allow dex2oat to handle relative paths."
Alex Light [Tue, 18 Apr 2017 22:20:38 +0000 (15:20 -0700)]
Implement can_generate_native_method_bind capability
This capability lets one observe and even replace the implementations
of native methods when they are bound.
Test: ./test.py --host -j40
Bug:
37432636
Change-Id: I2432a8e4da1a677e8011ce495296f4ab9f42eb3e
David Sehr [Wed, 19 Apr 2017 16:43:47 +0000 (16:43 +0000)]
Merge "Add dexdiag_test" am:
ad70f8f997
am:
a2d4447e34
Change-Id: I773c7c41e25268a99445428d4cb3369dc66d70bb
David Sehr [Wed, 19 Apr 2017 16:41:45 +0000 (16:41 +0000)]
Merge "Add dexdiag_test"
am:
ad70f8f997
Change-Id: Ib0b515f78bf12a1c8c2aaa2394b7c9bd2eae3181
David Sehr [Wed, 19 Apr 2017 16:37:46 +0000 (16:37 +0000)]
Merge "Add dexdiag_test"
Andreas Gampe [Wed, 19 Apr 2017 16:21:58 +0000 (16:21 +0000)]
Merge "ART: Refactor run-test 924" am:
70d9cf92f6
am:
414977a488
Change-Id: Idaffab17f11b5527f289f925b159064145898a35
Andreas Gampe [Wed, 19 Apr 2017 16:21:42 +0000 (16:21 +0000)]
Merge "ART: Filter more thread roots" am:
5e2c2894dc
am:
a93ccfb3fd
Change-Id: I80d7076b65b28c99cf692554c03f59191b5a77fc
Andreas Gampe [Wed, 19 Apr 2017 16:18:33 +0000 (16:18 +0000)]
Merge "ART: Refactor run-test 924"
am:
70d9cf92f6
Change-Id: I805ddab8a1b96f53ba0f9dc67b0df98a429e088f
Andreas Gampe [Wed, 19 Apr 2017 16:18:13 +0000 (16:18 +0000)]
Merge "ART: Filter more thread roots"
am:
5e2c2894dc
Change-Id: Iabef998fd43ff59b586dc86516b6ee449781b3d4
Treehugger Robot [Wed, 19 Apr 2017 16:14:17 +0000 (16:14 +0000)]
Merge "ART: Refactor run-test 924"
Treehugger Robot [Wed, 19 Apr 2017 16:13:40 +0000 (16:13 +0000)]
Merge "ART: Filter more thread roots"
Nicolas Geoffray [Wed, 19 Apr 2017 12:40:07 +0000 (12:40 +0000)]
Merge "Record class status after verification." am:
25009fdd7a
am:
b97afc6354
Change-Id: I808bd4a2a0339ecf98ea963102b52be18d52db9a
Nicolas Geoffray [Wed, 19 Apr 2017 12:38:08 +0000 (12:38 +0000)]
Merge "Record class status after verification."
am:
25009fdd7a
Change-Id: I28f26f8df620687c3c2124812e7f228eb53d7e2e
Nicolas Geoffray [Wed, 19 Apr 2017 12:31:42 +0000 (12:31 +0000)]
Merge "Record class status after verification."
Vladimir Marko [Wed, 19 Apr 2017 11:40:32 +0000 (11:40 +0000)]
Merge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks." am:
46d342f845
am:
8e0c6dd33b
Change-Id: If21a73d638fa3427efdb62c18385e4d7f0bb1d54
Vladimir Marko [Wed, 19 Apr 2017 11:38:33 +0000 (11:38 +0000)]
Merge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks."
am:
46d342f845
Change-Id: I38dcd3f91d902c7020aa39ef3541a1868f3ee596
Vladimir Marko [Wed, 19 Apr 2017 11:32:49 +0000 (11:32 +0000)]
Merge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks."
Sebastien Hertz [Wed, 19 Apr 2017 10:24:58 +0000 (10:24 +0000)]
Merge "Follow-up to
70d60275cc2860bde50e5f9c5b151e94f745ae14" am:
bea9172064
am:
1f175053aa
Change-Id: I424fbf84a1991ea46956a53678264ec4300219ca
Sebastien Hertz [Wed, 19 Apr 2017 10:23:00 +0000 (10:23 +0000)]
Merge "Follow-up to
70d60275cc2860bde50e5f9c5b151e94f745ae14"
am:
bea9172064
Change-Id: I7c55be3340ad08e8142c39804ea2b28d8492de00
Treehugger Robot [Wed, 19 Apr 2017 10:13:12 +0000 (10:13 +0000)]
Sebastien Hertz [Wed, 19 Apr 2017 09:40:25 +0000 (09:40 +0000)]
Merge "Reduce timeout of JDWP tests" am:
aebc6870db
am:
c834f6a0a8
Change-Id: I63af58293b915f5b70430e6bd58504273f5c2781
Sebastien Hertz [Wed, 19 Apr 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Reduce timeout of JDWP tests"
am:
aebc6870db
Change-Id: I8f995fc15c007572662f65a2533d998da99c3be8
Vladimir Marko [Tue, 18 Apr 2017 12:55:13 +0000 (13:55 +0100)]
ARM64: Heap poisoning for link-time Baker CC read barrier thunks.
And fix running out of scratch registers for HArraySet
with large constant index and a reference to poison.
Test: Nexus 6P boots with heap poisoning enabled.
Test: testrunner.py --target with heap poisoning enabled on Nexus 6P.
Bug:
29516974
Bug:
30126666
Bug:
36141117
Change-Id: Ifb38f4a0e23a2963468772f34f294febfc340b8c
Sebastien Hertz [Wed, 19 Apr 2017 09:26:54 +0000 (09:26 +0000)]
Merge "Reduce timeout of JDWP tests"
Sebastien Hertz [Mon, 27 Mar 2017 09:35:54 +0000 (11:35 +0200)]
Reduce timeout of JDWP tests
This CL sets the timeout of JDWP tests to 10s (instead of the default
timeout of 60s).
This should save up time for continuous testing (~ 3min on host).
Indeed, some tests do wait until the timeout to detect that no reply
(or no event) has been received.
Test: art/tools/run-jdwp-tests.sh --mode=host --variant=X64
Change-Id: Id03c8a1d629e6da551cf8eb405cc79754a363fe0
Nicolas Geoffray [Wed, 19 Apr 2017 09:17:54 +0000 (09:17 +0000)]
Merge "Revert "Invoke dex2oat explictly before dalvikvm"" am:
75be076511
am:
1825a6ed19
Change-Id: I93aabd59c058669fe04bbad92054cb57d7fc6891
Nicolas Geoffray [Wed, 19 Apr 2017 09:15:55 +0000 (09:15 +0000)]
Merge "Revert "Invoke dex2oat explictly before dalvikvm""
am:
75be076511
Change-Id: I40d7f7b443408716de3bb04f39587b39d39c0728
Nicolas Geoffray [Wed, 19 Apr 2017 09:01:46 +0000 (09:01 +0000)]
Merge "Revert "Invoke dex2oat explictly before dalvikvm""
Nicolas Geoffray [Wed, 19 Apr 2017 09:01:29 +0000 (09:01 +0000)]
Revert "Invoke dex2oat explictly before dalvikvm"
Fails on device with:
07-13 04:35:49.410 24424 24424 F dex2oat : instruction_set_features.cc:58] static std::unique_ptr<const InstructionSetFeatures> art::InstructionSetFeatures::FromVariant(art::InstructionSet, const std::string &, std::string *) unimplemented None
Bug:
36824842
This reverts commit
4806f7afc92b1812cefaab291235d01773732400.
Change-Id: I34a23fb69b0284e6d70ec0a54d5ada9e107ffeb7
Nicolas Geoffray [Wed, 19 Apr 2017 08:36:24 +0000 (09:36 +0100)]
Record class status after verification.
The class status was recorded when doing vdex verification, or
any compilation (quickening or optimizing), but not when only doing
verification.
bug:
37446669
Test:compiler_driver_test
Change-Id: Id027c7a9776ed651de570a0f3417c969c8cff9cd
Sebastien Hertz [Tue, 18 Apr 2017 16:28:51 +0000 (18:28 +0200)]
Follow-up to
70d60275cc2860bde50e5f9c5b151e94f745ae14
Test: make -j build-art-host
Change-Id: Id6e81518041bd64dec537ff3da2fa049d39b27d0
Sebastien Hertz [Wed, 19 Apr 2017 07:33:48 +0000 (07:33 +0000)]
Merge "Always check result of Thread::ModifySuspendCount" am:
0d8cf9106c
am:
8d9802319e
Change-Id: I5483436018a3a2f2d607edde37b30ce5461196d4
Sebastien Hertz [Wed, 19 Apr 2017 07:31:49 +0000 (07:31 +0000)]
Merge "Always check result of Thread::ModifySuspendCount"
am:
0d8cf9106c
Change-Id: I782e9dc794ea46bb29a777c10cda45e36fd26a5f
Sebastien Hertz [Wed, 19 Apr 2017 07:23:36 +0000 (07:23 +0000)]
Merge "Always check result of Thread::ModifySuspendCount"
Mathieu Chartier [Wed, 19 Apr 2017 02:51:31 +0000 (02:51 +0000)]
Merge "Call mirror::CallSite::VisitRoots" am:
ea24e09568
am:
c0d731f169
Change-Id: I82ec0b00abbbdbe694bd84abc778d9e5e2a2e884
Mathieu Chartier [Wed, 19 Apr 2017 02:48:00 +0000 (02:48 +0000)]
Merge "Call mirror::CallSite::VisitRoots"
am:
ea24e09568
Change-Id: I3f1dfaac4eb3e9e2cc5cc38d68c2da84fd61ed58
Mathieu Chartier [Wed, 19 Apr 2017 02:41:02 +0000 (02:41 +0000)]
Merge "Call mirror::CallSite::VisitRoots"
Jeff Hao [Thu, 6 Apr 2017 00:05:46 +0000 (17:05 -0700)]
Allow dex2oat to handle relative paths.
During installation at compile time, the PackageManager is passing
shared libraries to dex2oat with -classpath. For split apps, we want the
splits to have the proper dependencies, and are now passing previous
parts of the split apk as shared libraries as we compile them all. These
apks are staged in a temp dir during compilation, so we pass a relative
path for them instead.
Since PackageManager can now pass relative paths to dex2oat as shared
libraries, dex2oat has an added --classpath-dir switch to specify the
directory to use for relative class paths. At runtime when checking
shared libraries, we use oat file functionality to resolve relative paths
to determine if the paths match.
Bug:
34169257
Test: cts-tradefed run singleCommand cts -d --module
CtsAppSecurityHostTestCases -t android.appsecurity.cts.SplitTests
Merged-In: I9667f0069c8d12e94598f8a78888d3855d870824
(cherry-picked from commit
f79ac83a8c18b0bd81aafc9c8823f6bed35d8847)
Change-Id: I8e4703fdd4bfeb94f982e93abb7eb0cd71060fce
Calin Juravle [Tue, 18 Apr 2017 23:36:45 +0000 (23:36 +0000)]
Merge "Invoke dex2oat explictly before dalvikvm" am:
77ced6adfd
am:
b618586399
Change-Id: I695ae1237d5206e441d82cf48d95ca74d2a70b2a
Calin Juravle [Tue, 18 Apr 2017 23:35:15 +0000 (23:35 +0000)]
Merge "Invoke dex2oat explictly before dalvikvm"
am:
77ced6adfd
Change-Id: I60b418c83278e135064e9d657d5a75d95619d854
Mathieu Chartier [Tue, 18 Apr 2017 23:14:19 +0000 (16:14 -0700)]
Call mirror::CallSite::VisitRoots
Needed to visit CallSite static class root.
Test: test/run-test --no-patchoat --relocate --host --64 --interpreter --gdb 952
Bug:
33191717
Change-Id: I1fad3df8ad810c5c7905afadfa25cdc0901ef035
Calin Juravle [Tue, 18 Apr 2017 23:20:16 +0000 (23:20 +0000)]
Merge "Invoke dex2oat explictly before dalvikvm"
Andreas Gampe [Wed, 12 Apr 2017 15:42:16 +0000 (08:42 -0700)]
ART: Refactor run-test 924
Move testing to a dedicated thread to have a known thread name.
Change event reporting to be Java-side. Use Java-side thread list
(from Thread.getAllStackTraces) as comparison for minimal expected
set of threads.
Bug:
32072923
Test: art/test/testrunner/testrunner.py -b --host -t 924
Change-Id: I238ffc202e42eea8d1788137715188d3dfbcc8fb
David Sehr [Fri, 14 Apr 2017 22:26:09 +0000 (15:26 -0700)]
Add dexdiag_test
Tests that dexdiag runs on the current process and returns with a
non-error status for a variety of command line options.
Bug:
35800981
Test: make test-art-target-gtest-dexdiag_test
Change-Id: Ib6f21a99ddec270cf8026a6123b028fe4b3fb840
Alex Light [Tue, 18 Apr 2017 22:58:24 +0000 (22:58 +0000)]
Merge "Fix obsolete method change check." am:
494505a9de
am:
fa385ddeaa
Change-Id: I31b67abe5830cf24edbe7eb0c3191f6ac984733b
Alex Light [Tue, 18 Apr 2017 22:53:54 +0000 (22:53 +0000)]
Merge "Fix obsolete method change check."
am:
494505a9de
Change-Id: Ie3dac35eb222fb3662b2588576ca71c7a029495a
Treehugger Robot [Tue, 18 Apr 2017 22:42:58 +0000 (22:42 +0000)]
Merge "Fix obsolete method change check."
Calin Juravle [Wed, 12 Apr 2017 02:04:28 +0000 (19:04 -0700)]
Invoke dex2oat explictly before dalvikvm
The goal is to stop relying on dex2oat being run when dex files are
loaded.
Test: ./out/host/linux-x86/bin/art --profile -Ximage:$PWD/out/host/linux-x86/framework/core.art -Xusejit:true -Xcompiler-option --compiler-filter=speed -Xcompiler-option --compiler-backend=Optimizing -verbose:oat -Djava.library.path=$PWD/out/x86_64/host/linux-x86/lib64 -cp $PWD/generated/benchmarks.dex benchmarks.ExoPlayerBench.java.ExoPlayerBench
Bug:
36824842
Change-Id: I9f4a1384cdc91502edea08402ee984c57ff8c37d
OSDN Git Service
