OSDN Git Service

android-x86/art.git
7 years agoMerge "Revert "Add dexdiag_test"" am: 1cfe8728e0
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

7 years agoMerge changes Ie3d5e176,Ic1fbb885,I10bafcff am: 3955baf83f
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

7 years agoMerge "Revert "Add dexdiag_test""
David Sehr [Wed, 19 Apr 2017 20:04:28 +0000 (20:04 +0000)]
Merge "Revert "Add dexdiag_test""
am: 1cfe8728e0

Change-Id: I705ab54f2a7386373be5fbb469ca1e1dfde670fe

7 years agoMerge changes Ie3d5e176,Ic1fbb885,I10bafcff
Josh Gao [Wed, 19 Apr 2017 20:04:04 +0000 (20:04 +0000)]
Merge changes Ie3d5e176,Ic1fbb885,I10bafcff
am: 3955baf83f

Change-Id: I449e532cd4061667213fea7a999278f7a52f6b9f

7 years agoMerge "Revert "Add dexdiag_test""
David Sehr [Wed, 19 Apr 2017 20:00:50 +0000 (20:00 +0000)]
Merge "Revert "Add dexdiag_test""

7 years agoMerge changes Ie3d5e176,Ic1fbb885,I10bafcff
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.

7 years agoRevert "Add dexdiag_test"
David Sehr [Wed, 19 Apr 2017 19:44:08 +0000 (19:44 +0000)]
Revert "Add dexdiag_test"

This reverts commit 2120ad43acc0ab0fa74c151069948ef9698c009f.

Change-Id: Icdb42e47eb2f099cbfbd302477ad6614bb8524f1

7 years agoMerge "Implement can_generate_native_method_bind capability" am: 9088df87d9
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

7 years agoMerge "Implement can_generate_native_method_bind capability"
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

7 years agoMerge "Implement can_generate_native_method_bind capability"
Treehugger Robot [Wed, 19 Apr 2017 19:31:06 +0000 (19:31 +0000)]
Merge "Implement can_generate_native_method_bind capability"

7 years agoMerge "Implement halving add idiom (with checker tests)." am: ed5d0ee21e
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

7 years agoMerge "Implement halving add idiom (with checker tests)."
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

7 years agoMerge "Implement halving add idiom (with checker tests)."
Treehugger Robot [Wed, 19 Apr 2017 19:19:00 +0000 (19:19 +0000)]
Merge "Implement halving add idiom (with checker tests)."

7 years agoMerge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]." am: 88b7c37163
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

7 years agoMerge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]."
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

7 years agoMerge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]."
Treehugger Robot [Wed, 19 Apr 2017 18:15:58 +0000 (18:15 +0000)]
Merge "MIPS64: java.lang.System.arraycopy() for copying char[] to char[]."

7 years agoMerge "Fix CHA test failures under some configurations." am: 59715029ae
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

7 years agoMerge "Fix CHA test failures under some configurations."
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

7 years agoMerge "Fix CHA test failures under some configurations."
Mingyao Yang [Wed, 19 Apr 2017 17:59:32 +0000 (17:59 +0000)]
Merge "Fix CHA test failures under some configurations."

7 years agofault_handler: use SafeCopy to verify the validity of ArtMethod.
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

7 years agoImplement halving add idiom (with checker tests).
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

7 years agoMerge "Allow dex2oat to handle relative paths." am: 72fdec3928
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

7 years agoMerge "Allow dex2oat to handle relative paths."
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

7 years agoMerge "Allow dex2oat to handle relative paths."
Treehugger Robot [Wed, 19 Apr 2017 17:13:11 +0000 (17:13 +0000)]
Merge "Allow dex2oat to handle relative paths."

7 years agoImplement can_generate_native_method_bind capability
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

7 years agoMerge "Add dexdiag_test" am: ad70f8f997
David Sehr [Wed, 19 Apr 2017 16:43:47 +0000 (16:43 +0000)]
Merge "Add dexdiag_test" am: ad70f8f997
am: a2d4447e34

Change-Id: I773c7c41e25268a99445428d4cb3369dc66d70bb

7 years agoMerge "Add dexdiag_test"
David Sehr [Wed, 19 Apr 2017 16:41:45 +0000 (16:41 +0000)]
Merge "Add dexdiag_test"
am: ad70f8f997

Change-Id: Ib0b515f78bf12a1c8c2aaa2394b7c9bd2eae3181

7 years agoMerge "Add dexdiag_test"
David Sehr [Wed, 19 Apr 2017 16:37:46 +0000 (16:37 +0000)]
Merge "Add dexdiag_test"

7 years agoMerge "ART: Refactor run-test 924" am: 70d9cf92f6
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

7 years agoMerge "ART: Filter more thread roots" am: 5e2c2894dc
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

7 years agoMerge "ART: Refactor run-test 924"
Andreas Gampe [Wed, 19 Apr 2017 16:18:33 +0000 (16:18 +0000)]
Merge "ART: Refactor run-test 924"
am: 70d9cf92f6

Change-Id: I805ddab8a1b96f53ba0f9dc67b0df98a429e088f

7 years agoMerge "ART: Filter more thread roots"
Andreas Gampe [Wed, 19 Apr 2017 16:18:13 +0000 (16:18 +0000)]
Merge "ART: Filter more thread roots"
am: 5e2c2894dc

Change-Id: Iabef998fd43ff59b586dc86516b6ee449781b3d4

7 years agoMerge "ART: Refactor run-test 924"
Treehugger Robot [Wed, 19 Apr 2017 16:14:17 +0000 (16:14 +0000)]
Merge "ART: Refactor run-test 924"

7 years agoMerge "ART: Filter more thread roots"
Treehugger Robot [Wed, 19 Apr 2017 16:13:40 +0000 (16:13 +0000)]
Merge "ART: Filter more thread roots"

7 years agoMerge "Record class status after verification." am: 25009fdd7a
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

7 years agoMerge "Record class status after verification."
Nicolas Geoffray [Wed, 19 Apr 2017 12:38:08 +0000 (12:38 +0000)]
Merge "Record class status after verification."
am: 25009fdd7a

Change-Id: I28f26f8df620687c3c2124812e7f228eb53d7e2e

7 years agoMerge "Record class status after verification."
Nicolas Geoffray [Wed, 19 Apr 2017 12:31:42 +0000 (12:31 +0000)]
Merge "Record class status after verification."

7 years agoMerge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks." am: 46d342f845
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

7 years agoMerge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks."
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

7 years agoMerge "ARM64: Heap poisoning for link-time Baker CC read barrier thunks."
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."

7 years agoMerge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14" am: bea9172064
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

7 years agoMerge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14"
Sebastien Hertz [Wed, 19 Apr 2017 10:23:00 +0000 (10:23 +0000)]
Merge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14"
am: bea9172064

Change-Id: I7c55be3340ad08e8142c39804ea2b28d8492de00

7 years agoMerge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14"
Treehugger Robot [Wed, 19 Apr 2017 10:13:12 +0000 (10:13 +0000)]
Merge "Follow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14"

7 years agoMerge "Reduce timeout of JDWP tests" am: aebc6870db
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

7 years agoMerge "Reduce timeout of JDWP tests"
Sebastien Hertz [Wed, 19 Apr 2017 09:38:26 +0000 (09:38 +0000)]
Merge "Reduce timeout of JDWP tests"
am: aebc6870db

Change-Id: I8f995fc15c007572662f65a2533d998da99c3be8

7 years agoARM64: Heap poisoning for link-time Baker CC read barrier thunks.
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

7 years agoMerge "Reduce timeout of JDWP tests"
Sebastien Hertz [Wed, 19 Apr 2017 09:26:54 +0000 (09:26 +0000)]
Merge "Reduce timeout of JDWP tests"

7 years agoReduce 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

7 years agoMerge "Revert "Invoke dex2oat explictly before dalvikvm"" am: 75be076511
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

7 years agoMerge "Revert "Invoke dex2oat explictly before dalvikvm""
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

7 years agoMerge "Revert "Invoke dex2oat explictly before dalvikvm""
Nicolas Geoffray [Wed, 19 Apr 2017 09:01:46 +0000 (09:01 +0000)]
Merge "Revert "Invoke dex2oat explictly before dalvikvm""

7 years agoRevert "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

7 years agoRecord class status after verification.
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

7 years agoFollow-up to 70d60275cc2860bde50e5f9c5b151e94f745ae14
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

7 years agoMerge "Always check result of Thread::ModifySuspendCount" am: 0d8cf9106c
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

7 years agoMerge "Always check result of Thread::ModifySuspendCount"
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

7 years agoMerge "Always check result of Thread::ModifySuspendCount"
Sebastien Hertz [Wed, 19 Apr 2017 07:23:36 +0000 (07:23 +0000)]
Merge "Always check result of Thread::ModifySuspendCount"

7 years agoMerge "Call mirror::CallSite::VisitRoots" am: ea24e09568
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

7 years agoMerge "Call mirror::CallSite::VisitRoots"
Mathieu Chartier [Wed, 19 Apr 2017 02:48:00 +0000 (02:48 +0000)]
Merge "Call mirror::CallSite::VisitRoots"
am: ea24e09568

Change-Id: I3f1dfaac4eb3e9e2cc5cc38d68c2da84fd61ed58

7 years agoMerge "Call mirror::CallSite::VisitRoots"
Mathieu Chartier [Wed, 19 Apr 2017 02:41:02 +0000 (02:41 +0000)]
Merge "Call mirror::CallSite::VisitRoots"

7 years agoAllow dex2oat to handle relative paths.
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

7 years agoMerge "Invoke dex2oat explictly before dalvikvm" am: 77ced6adfd
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

7 years agoMerge "Invoke dex2oat explictly before dalvikvm"
Calin Juravle [Tue, 18 Apr 2017 23:35:15 +0000 (23:35 +0000)]
Merge "Invoke dex2oat explictly before dalvikvm"
am: 77ced6adfd

Change-Id: I60b418c83278e135064e9d657d5a75d95619d854

7 years agoCall mirror::CallSite::VisitRoots
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

7 years agoMerge "Invoke dex2oat explictly before dalvikvm"
Calin Juravle [Tue, 18 Apr 2017 23:20:16 +0000 (23:20 +0000)]
Merge "Invoke dex2oat explictly before dalvikvm"

7 years agoART: Refactor run-test 924
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

7 years agoAdd dexdiag_test
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

7 years agoMerge "Fix obsolete method change check." am: 494505a9de
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

7 years agoMerge "Fix obsolete method change check."
Alex Light [Tue, 18 Apr 2017 22:53:54 +0000 (22:53 +0000)]
Merge "Fix obsolete method change check."
am: 494505a9de

Change-Id: Ie3dac35eb222fb3662b2588576ca71c7a029495a

7 years agoMerge "Fix obsolete method change check."
Treehugger Robot [Tue, 18 Apr 2017 22:42:58 +0000 (22:42 +0000)]
Merge "Fix obsolete method change check."

7 years agoInvoke dex2oat explictly before dalvikvm
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

7 years agofault_handler: use SafeCopy to decode x86 instruction length.
Josh Gao [Tue, 18 Apr 2017 18:18:56 +0000 (11:18 -0700)]
fault_handler: use SafeCopy to decode x86 instruction length.

Prevent a crash in the x86 fault handler when pc points to garbage and
we try to figure out its instruction length.

Bug: http://b/30836730
Test: m test-art-host
Change-Id: Ic1fbb8856e30140f0e1ebc9caccf9559e88ff137

7 years agobase: add SafeCopy.
Josh Gao [Tue, 18 Apr 2017 01:31:26 +0000 (18:31 -0700)]
base: add SafeCopy.

Add a function that uses process_vm_readv on Linux to safely
dereference pointers without the risk of segfault.

Bug: http://b/30836730
Test: safe_copy_test on host
Change-Id: I10bafcffe2172e17b00f65455d1dd6a08aa631d7

7 years agoART: Filter more thread roots
Andreas Gampe [Tue, 18 Apr 2017 20:59:09 +0000 (13:59 -0700)]
ART: Filter more thread roots

Also filter interface classes that may be held by the JIT.

Bug: 31385354
Test: art/test/testrunner/testrunner.py --host -b -t 913
Change-Id: I129ab8c28e398d779d9d43b03358aa54a9a14c8c

7 years agoFix obsolete method change check.
Alex Light [Tue, 18 Apr 2017 20:03:31 +0000 (13:03 -0700)]
Fix obsolete method change check.

We were incorrectly checking for changes in the obsolete-method map.
This could cause issues if a class was redefined multiple times.

Bug: 37475600

Test: ./test.py --host -j40
Test: cts-tradefed run cts-dev --module CtsJvmtiRedefineClassesHostTestCases

Change-Id: Icf39d5154c0e48461405b700bf1fa20830195fc1

7 years agoMerge "Make ART build/test configurations use the CC collector by default." am: 741a8...
Roland Levillain [Tue, 18 Apr 2017 18:33:39 +0000 (18:33 +0000)]
Merge "Make ART build/test configurations use the CC collector by default." am: 741a81af44
am: e692b7db5a

Change-Id: I171f391688967c00861c83ed4965eab135bae5d8

7 years agoMerge "Differentiate between native alloc and normal background GC" am: e4e7d601ef
Mathieu Chartier [Tue, 18 Apr 2017 18:33:24 +0000 (18:33 +0000)]
Merge "Differentiate between native alloc and normal background GC" am: e4e7d601ef
am: 197bc62104

Change-Id: I19fc5b3038a09cc096cc272e2c53343cc80f66ae

7 years agoMerge "ART: Make less lock-level noise on abort" am: 2888e85164
Andreas Gampe [Tue, 18 Apr 2017 18:33:09 +0000 (18:33 +0000)]
Merge "ART: Make less lock-level noise on abort" am: 2888e85164
am: a41f563e62

Change-Id: I099770d25ac0e2105cb3cc91407b0ac1b4fc0297

7 years agoMerge "Make ART build/test configurations use the CC collector by default."
Roland Levillain [Tue, 18 Apr 2017 18:28:13 +0000 (18:28 +0000)]
Merge "Make ART build/test configurations use the CC collector by default."
am: 741a81af44

Change-Id: Ica953a72f63c07fb551b75b2f0448bb1212d792f

7 years agoMerge "Differentiate between native alloc and normal background GC"
Mathieu Chartier [Tue, 18 Apr 2017 18:27:53 +0000 (18:27 +0000)]
Merge "Differentiate between native alloc and normal background GC"
am: e4e7d601ef

Change-Id: I26f9a501d9da8b5d9cdefc08ae1a4fa394a533b6

7 years agoMerge "ART: Make less lock-level noise on abort"
Andreas Gampe [Tue, 18 Apr 2017 18:27:38 +0000 (18:27 +0000)]
Merge "ART: Make less lock-level noise on abort"
am: 2888e85164

Change-Id: I58b17056982de8e306ab6e0dfef430f74b5ec11f

7 years agoMerge "Make ART build/test configurations use the CC collector by default."
Treehugger Robot [Tue, 18 Apr 2017 18:25:01 +0000 (18:25 +0000)]
Merge "Make ART build/test configurations use the CC collector by default."

7 years agoMerge "Differentiate between native alloc and normal background GC"
Mathieu Chartier [Tue, 18 Apr 2017 18:24:00 +0000 (18:24 +0000)]
Merge "Differentiate between native alloc and normal background GC"

7 years agoMerge "ART: Make less lock-level noise on abort"
Treehugger Robot [Tue, 18 Apr 2017 18:21:41 +0000 (18:21 +0000)]
Merge "ART: Make less lock-level noise on abort"

7 years agoDifferentiate between native alloc and normal background GC
Mathieu Chartier [Mon, 17 Apr 2017 22:24:43 +0000 (15:24 -0700)]
Differentiate between native alloc and normal background GC

Added a new GC cause kGcCauseForNativeAllocBackground.

Bug: 35872915

Test: test-art-host

Change-Id: I94e17f8bd53af29f2862b9910bd8abd2df97e229

7 years agoMerge "Use correct type for GetValueFromShadowFrame" am: c36a970fcd
Mathieu Chartier [Tue, 18 Apr 2017 17:22:17 +0000 (17:22 +0000)]
Merge "Use correct type for GetValueFromShadowFrame" am: c36a970fcd
am: d70097de7f

Change-Id: I08d16238a82fc03a39c96922b7236a00cadccce1

7 years agoMerge "Use WARN_UNUSED consistently in ART." am: b2410c931a
Roland Levillain [Tue, 18 Apr 2017 17:22:03 +0000 (17:22 +0000)]
Merge "Use WARN_UNUSED consistently in ART." am: b2410c931a
am: 8e9691c069

Change-Id: Ib4c2777edf7f7490191e92bc9b76dce90bda5e52

7 years agoMerge "Use correct type for GetValueFromShadowFrame"
Mathieu Chartier [Tue, 18 Apr 2017 17:16:48 +0000 (17:16 +0000)]
Merge "Use correct type for GetValueFromShadowFrame"
am: c36a970fcd

Change-Id: I7ae578e671658c4790aaaf67aac22adfded9b5df

7 years agoMerge "Use WARN_UNUSED consistently in ART."
Roland Levillain [Tue, 18 Apr 2017 17:16:33 +0000 (17:16 +0000)]
Merge "Use WARN_UNUSED consistently in ART."
am: b2410c931a

Change-Id: I9bc56ed10c7c4b7d72b89f5cfc95ac964b3e4138

7 years agoMerge "Use correct type for GetValueFromShadowFrame"
Mathieu Chartier [Tue, 18 Apr 2017 17:14:00 +0000 (17:14 +0000)]
Merge "Use correct type for GetValueFromShadowFrame"

7 years agoMerge "Use WARN_UNUSED consistently in ART."
Roland Levillain [Tue, 18 Apr 2017 17:06:25 +0000 (17:06 +0000)]
Merge "Use WARN_UNUSED consistently in ART."

7 years agoUse correct type for GetValueFromShadowFrame
Mathieu Chartier [Tue, 18 Apr 2017 03:12:29 +0000 (20:12 -0700)]
Use correct type for GetValueFromShadowFrame

The field type is not necessarily the input type for boxed
primitives. If the field type is < 32 bits, it means there will be
partial object pointer in the JValue. If a conversion check is
later needed in GetUnboxedTypeAndValue, it will crash. The fix is
to use the PTypes.

Bug: 37446461
Test: test-art-host
Change-Id: I0c4b405f0c13910523b98a87ef12b9f302a5e241

7 years agoMerge "JDWP: fix Dbg::ResumeThread" am: 2203253254
Sebastien Hertz [Tue, 18 Apr 2017 16:27:30 +0000 (16:27 +0000)]
Merge "JDWP: fix Dbg::ResumeThread" am: 2203253254
am: e320fb8224

Change-Id: I3a0d9ace36d8213dc35090ab750c449d5efcb281

7 years agoMerge "JDWP: fix Dbg::ResumeThread"
Sebastien Hertz [Tue, 18 Apr 2017 16:22:31 +0000 (16:22 +0000)]
Merge "JDWP: fix Dbg::ResumeThread"
am: 2203253254

Change-Id: Ie4f5a2ce448d182eb306b59f718a52a86b999bf7

7 years agoMerge "JDWP: fix Dbg::ResumeThread"
Sebastien Hertz [Tue, 18 Apr 2017 16:11:55 +0000 (16:11 +0000)]
Merge "JDWP: fix Dbg::ResumeThread"

7 years agoAlways check result of Thread::ModifySuspendCount
Sebastien Hertz [Fri, 14 Apr 2017 13:05:12 +0000 (15:05 +0200)]
Always check result of Thread::ModifySuspendCount

Ensures that we never ignore the result of ModifySuspendCount so that
we can react if the suspend count is not updated as expected.

This CL does the following:
* Adds __attribute__((warn_unused_result)) on the method to raise an
  error at compilation time if the result is ignored.
* Wraps calls with DCHECK where the result used to be ignored.

Bug: 27385848
Test: make -j test-art-host
Test: art/tools/run-jdwp-tests.sh --mode=host --variant=X64
Change-Id: I2d0e1ab7158c70ec8076c8bae6e4b814aee75af6

7 years agoMerge "ART: Call ThreadGroup.add in Thread::FinishStartup" am: 2aac653df7
Andreas Gampe [Tue, 18 Apr 2017 15:27:57 +0000 (15:27 +0000)]
Merge "ART: Call ThreadGroup.add in Thread::FinishStartup" am: 2aac653df7
am: 37bd1c0928

Change-Id: I9b8d740f661f3135b5c54df1482a1bef906c0d39

7 years agoMerge "ART: Call ThreadGroup.add in Thread::FinishStartup"
Andreas Gampe [Tue, 18 Apr 2017 15:22:26 +0000 (15:22 +0000)]
Merge "ART: Call ThreadGroup.add in Thread::FinishStartup"
am: 2aac653df7

Change-Id: Ia457840ddc3c96eb3271dde5e210db26df404a58

7 years agoMerge "ART: Call ThreadGroup.add in Thread::FinishStartup"
Treehugger Robot [Tue, 18 Apr 2017 15:12:58 +0000 (15:12 +0000)]
Merge "ART: Call ThreadGroup.add in Thread::FinishStartup"

7 years agoMerge "Fix ARM64 SystemArrayCopy intrinsic with large constant dest position." am...
Roland Levillain [Tue, 18 Apr 2017 12:51:15 +0000 (12:51 +0000)]
Merge "Fix ARM64 SystemArrayCopy intrinsic with large constant dest position." am: 1cae72e6cf
am: 918f1f4f14

Change-Id: I821cf312acf1dd0539f706da20000087a7b262b1