OSDN Git Service

android-x86/art.git
8 years agoMerge \\"Optimize away useless masking operations on shift amounts.\\" am: f249230400
Alexandre Rames [Tue, 28 Jun 2016 10:42:05 +0000 (10:42 +0000)]
Merge \\"Optimize away useless masking operations on shift amounts.\\" am: f249230400
am: e3250eaf2e

Change-Id: If5eb9a5491ef3bbe0ec7308883b778f8fd9b4597

8 years agoMerge \"Optimize away useless masking operations on shift amounts.\"
Alexandre Rames [Tue, 28 Jun 2016 10:39:07 +0000 (10:39 +0000)]
Merge \"Optimize away useless masking operations on shift amounts.\"
am: f249230400

Change-Id: I7012b320625831f0cd63c5b49e545d4dc9922b18

8 years agoMerge \\"MIPS64: Remove the workaround in VisitInvokeStaticOrDirect\\" am: d5d0c7b6ab
Goran Jakovljevic [Tue, 28 Jun 2016 10:39:06 +0000 (10:39 +0000)]
Merge \\"MIPS64: Remove the workaround in VisitInvokeStaticOrDirect\\" am: d5d0c7b6ab
am: 09c82e7732

Change-Id: I600a15c245face8a86c58146017182056f3ba630

8 years agoMerge \"MIPS64: Remove the workaround in VisitInvokeStaticOrDirect\"
Goran Jakovljevic [Tue, 28 Jun 2016 10:36:19 +0000 (10:36 +0000)]
Merge \"MIPS64: Remove the workaround in VisitInvokeStaticOrDirect\"
am: d5d0c7b6ab

Change-Id: I6c720caaeee80704339c7022836707c65a4b9180

8 years agoMerge "Optimize away useless masking operations on shift amounts."
Treehugger Robot [Tue, 28 Jun 2016 10:33:35 +0000 (10:33 +0000)]
Merge "Optimize away useless masking operations on shift amounts."

8 years agoMerge "MIPS64: Remove the workaround in VisitInvokeStaticOrDirect"
Treehugger Robot [Tue, 28 Jun 2016 10:29:56 +0000 (10:29 +0000)]
Merge "MIPS64: Remove the workaround in VisitInvokeStaticOrDirect"

8 years agoMerge \\"Fix 004-ThreadStress.\\" am: 99376148af
Vladimir Marko [Tue, 28 Jun 2016 10:16:11 +0000 (10:16 +0000)]
Merge \\"Fix 004-ThreadStress.\\" am: 99376148af
am: 1171e22d7c

Change-Id: Id648563e739da8cf70acb1d2aead055eaac46582

8 years agoMerge \"Fix 004-ThreadStress.\"
Vladimir Marko [Tue, 28 Jun 2016 10:13:25 +0000 (10:13 +0000)]
Merge \"Fix 004-ThreadStress.\"
am: 99376148af

Change-Id: Ifc329644f6039a2563a8d49292f0d51faa12e2af

8 years agoMerge \\"Optimizing: Do not depend on sharpening in test 450\\" am: 3ce4f88d3c
Goran Jakovljevic [Tue, 28 Jun 2016 10:13:24 +0000 (10:13 +0000)]
Merge \\"Optimizing: Do not depend on sharpening in test 450\\" am: 3ce4f88d3c
am: 48abef53d2

Change-Id: I80eb681d9ac41452f06d9631078e6fbcc6784890

8 years agoMerge \"Optimizing: Do not depend on sharpening in test 450\"
Goran Jakovljevic [Tue, 28 Jun 2016 10:10:30 +0000 (10:10 +0000)]
Merge \"Optimizing: Do not depend on sharpening in test 450\"
am: 3ce4f88d3c

Change-Id: I511d3219d66d45afd80e3ae5da15a1b631964cda

8 years agoMerge "Fix 004-ThreadStress."
Vladimir Marko [Tue, 28 Jun 2016 10:07:38 +0000 (10:07 +0000)]
Merge "Fix 004-ThreadStress."

8 years agoMerge "Optimizing: Do not depend on sharpening in test 450"
Treehugger Robot [Tue, 28 Jun 2016 10:05:42 +0000 (10:05 +0000)]
Merge "Optimizing: Do not depend on sharpening in test 450"

8 years agoMerge \\"MIPS32: Drop redundant moves in integer conversions\\" am: 47fe36d8de
Alexey Frunze [Tue, 28 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge \\"MIPS32: Drop redundant moves in integer conversions\\" am: 47fe36d8de
am: c8305b4578

Change-Id: I404f23c318dcd7c2aafb878a65285b3cf4a3e7ea

8 years agoMerge \"MIPS32: Drop redundant moves in integer conversions\"
Alexey Frunze [Tue, 28 Jun 2016 09:56:12 +0000 (09:56 +0000)]
Merge \"MIPS32: Drop redundant moves in integer conversions\"
am: 47fe36d8de

Change-Id: I35818e12007d2e651c23154e9dd8229e9013a1e2

8 years agoMerge "MIPS32: Drop redundant moves in integer conversions"
Treehugger Robot [Tue, 28 Jun 2016 09:49:33 +0000 (09:49 +0000)]
Merge "MIPS32: Drop redundant moves in integer conversions"

8 years agoMerge \\"Clean up StringReferenceValueComparator and DexFile.\\" am: 05f0167cdd
Vladimir Marko [Tue, 28 Jun 2016 09:08:20 +0000 (09:08 +0000)]
Merge \\"Clean up StringReferenceValueComparator and DexFile.\\" am: 05f0167cdd
am: 38a7126105

Change-Id: Iccfa0b4c195216fa2c5de32aeb2bd66623336b89

8 years agoMerge \"Clean up StringReferenceValueComparator and DexFile.\"
Vladimir Marko [Tue, 28 Jun 2016 09:05:49 +0000 (09:05 +0000)]
Merge \"Clean up StringReferenceValueComparator and DexFile.\"
am: 05f0167cdd

Change-Id: I58076c6c5df6c5765d565505909f17499281950a

8 years agoMerge "Clean up StringReferenceValueComparator and DexFile."
Vladimir Marko [Tue, 28 Jun 2016 08:57:50 +0000 (08:57 +0000)]
Merge "Clean up StringReferenceValueComparator and DexFile."

8 years agoMerge \\"Revert \\"Gray only immune objects mutators access.\\"\\" am: 105683791e
Nicolas Geoffray [Tue, 28 Jun 2016 08:34:37 +0000 (08:34 +0000)]
Merge \\"Revert \\"Gray only immune objects mutators access.\\"\\" am: 105683791e
am: d3b2b36186

Change-Id: I317a09cbf2bfc5e431fca4e4d4a1a575a9c7516c

8 years agoOptimize away useless masking operations on shift amounts.
Alexandre Rames [Mon, 27 Jun 2016 10:39:19 +0000 (11:39 +0100)]
Optimize away useless masking operations on shift amounts.

Change-Id: I90d69757cc45312eda3d57cc2d32bfb4e47963f5

8 years agoMerge \"Revert \"Gray only immune objects mutators access.\"\"
Nicolas Geoffray [Tue, 28 Jun 2016 08:32:13 +0000 (08:32 +0000)]
Merge \"Revert \"Gray only immune objects mutators access.\"\"
am: 105683791e

Change-Id: I4e8861233e18706fc6a5cf4dfeb7c04288d73d16

8 years agoMerge "Revert "Gray only immune objects mutators access.""
Nicolas Geoffray [Tue, 28 Jun 2016 08:26:16 +0000 (08:26 +0000)]
Merge "Revert "Gray only immune objects mutators access.""

8 years agoRevert "Gray only immune objects mutators access."
Nicolas Geoffray [Tue, 28 Jun 2016 08:25:59 +0000 (08:25 +0000)]
Revert "Gray only immune objects mutators access."

Fails with:
    art F 11338 11338 art/runtime/gc/collector/concurrent_copying-inl.h:83] Check failed: !kGrayImmuneObject || updated_all_immune_objects_.LoadRelaxed() || gc_grays_immune_objects_

Bug: 29516465
Bug: 12687968

This reverts commit 16292fcc98f03690576d0739b2e5fb04b375933c.

Change-Id: I1d2d988b7707e03cc94f019cf8bef5b9a9099060

8 years agoMerge \\"Gray only immune objects mutators access.\\" am: 450ee8fe76
Hiroshi Yamauchi [Tue, 28 Jun 2016 01:30:08 +0000 (01:30 +0000)]
Merge \\"Gray only immune objects mutators access.\\" am: 450ee8fe76
am: 021a3dc9ee

Change-Id: Ib7b18a58f16bf14260921aac4c0cddbf0a2acb5c

8 years agoMerge \"Gray only immune objects mutators access.\"
Hiroshi Yamauchi [Tue, 28 Jun 2016 01:27:47 +0000 (01:27 +0000)]
Merge \"Gray only immune objects mutators access.\"
am: 450ee8fe76

Change-Id: I366757c58818264ce10f30cb6d6b7aacdd9e6be4

8 years agoMerge "Gray only immune objects mutators access."
Treehugger Robot [Tue, 28 Jun 2016 01:20:50 +0000 (01:20 +0000)]
Merge "Gray only immune objects mutators access."

8 years agoGray only immune objects mutators access.
Hiroshi Yamauchi [Tue, 21 Jun 2016 03:23:34 +0000 (20:23 -0700)]
Gray only immune objects mutators access.

To reduce image/zygote dirty pages.

GC doesn't gray immune space objects except when visiting the thread
GC roots of suspended threads during the thread flip. GC updates the
fields of immune space objects without pushing/popping them through
the mark stack. GC sets a bool flag after updating the fields of
immune space objects. After this point, mutators don't need gray to
immune space objects. Removed the mark bitmaps for immune spaces.

Bug: 29516465
Bug: 12687968
Test: art tests, libartd device boot, ritzperf.
Change-Id: Idfcffbdb94dfc8bfc89c30d6aff8888f04990a56

8 years agoART: Disable no-prebuild test for run-test 608
Andreas Gampe [Mon, 27 Jun 2016 23:04:02 +0000 (23:04 +0000)]
ART: Disable no-prebuild test for run-test 608
am: 0748ed9fcf

Change-Id: Iadcc7929cc22f4f5b1425b76cd5908ffed010e9c

8 years agoMerge \\"ART: Disable no-prebuild test for run-test 608\\" am: 6023704356
Andreas Gampe [Mon, 27 Jun 2016 23:01:32 +0000 (23:01 +0000)]
Merge \\"ART: Disable no-prebuild test for run-test 608\\" am: 6023704356
am: 77b5f1872e

Change-Id: Ib68392eebfeef1d0454ac66a8076508c94c6c097

8 years agoMerge \"ART: Disable no-prebuild test for run-test 608\"
Andreas Gampe [Mon, 27 Jun 2016 22:58:49 +0000 (22:58 +0000)]
Merge \"ART: Disable no-prebuild test for run-test 608\"
am: 6023704356

Change-Id: I4bea5c202a2dbe53f2f8409876da6eff03e0c066

8 years agoDo not remove loads/store with unresolved accesses.
Nicolas Geoffray [Mon, 27 Jun 2016 22:58:49 +0000 (22:58 +0000)]
Do not remove loads/store with unresolved accesses.
am: c2f1735e04

Change-Id: Iec193d6177f3b7a6115e6828aa83c73d3593dfc7

8 years agoART: Disable no-prebuild test for run-test 608
Andreas Gampe [Mon, 27 Jun 2016 21:55:02 +0000 (14:55 -0700)]
ART: Disable no-prebuild test for run-test 608

This test relies on unresolved types, which is not the case in a
no-prebuild setting (as all parts will be on the classpath).

Bug: 29433999
Change-Id: I11b1c6b446905aacd7a520796d0b2217319cefc7
Test: m ART_TEST_RUN_TEST_NO_PREBUILD=true test-art-host-run-test
(cherry picked from commit 06b7c4de44979f1cb51707d2236142bc733ebf75)

8 years agoMerge "ART: Disable no-prebuild test for run-test 608"
Andreas Gampe [Mon, 27 Jun 2016 22:52:38 +0000 (22:52 +0000)]
Merge "ART: Disable no-prebuild test for run-test 608"

8 years agoMIPS32: Drop redundant moves in integer conversions
Alexey Frunze [Mon, 27 Jun 2016 22:20:11 +0000 (15:20 -0700)]
MIPS32: Drop redundant moves in integer conversions

Change-Id: I0e3f393d87538eb9e35b3012ea36e81c8b7a225e

8 years agoART: Disable no-prebuild test for run-test 608
Andreas Gampe [Mon, 27 Jun 2016 21:55:02 +0000 (14:55 -0700)]
ART: Disable no-prebuild test for run-test 608

This test relies on unresolved types, which is not the case in a
no-prebuild setting (as all parts will be on the classpath).

Bug: 29433999
Change-Id: I11b1c6b446905aacd7a520796d0b2217319cefc7
Test: m ART_TEST_RUN_TEST_NO_PREBUILD=true test-art-host-run-test

8 years agoDo not remove loads/store with unresolved accesses.
Nicolas Geoffray [Mon, 27 Jun 2016 09:03:29 +0000 (10:03 +0100)]
Do not remove loads/store with unresolved accesses.

Due to AOT and compiling classes that are not ready yet
(eg missing a super class), we need to be conservative when
accessing fields and can end up in a situation where the same
field can be resolved and unresolved within the same method
(because of inlining). Therefore, disable removing loads and
stores in a method when there are unresolved accesses.

bug:29433999

(cherry picked from commit b93a16517dce12b83e9d5d3b599446e25fcc157a)

Change-Id: I8fcfb52c584222474a8220eb16c6581350b702e0

8 years agoMerge \\"Do not remove loads/store with unresolved accesses.\\" am: 779743a90d
Nicolas Geoffray [Mon, 27 Jun 2016 18:50:37 +0000 (18:50 +0000)]
Merge \\"Do not remove loads/store with unresolved accesses.\\" am: 779743a90d
am: d8331886e6

Change-Id: I7160d5123c0da9a66db2cd1fba892ad9b5aebd4c

8 years agoMerge \"Do not remove loads/store with unresolved accesses.\"
Nicolas Geoffray [Mon, 27 Jun 2016 18:46:46 +0000 (18:46 +0000)]
Merge \"Do not remove loads/store with unresolved accesses.\"
am: 779743a90d

Change-Id: I4e0048ef5043e86cb5cced5c2af5db4a1c78eb58

8 years agoMerge "Do not remove loads/store with unresolved accesses."
Treehugger Robot [Mon, 27 Jun 2016 18:36:47 +0000 (18:36 +0000)]
Merge "Do not remove loads/store with unresolved accesses."

8 years agoDo not remove loads/store with unresolved accesses.
Nicolas Geoffray [Mon, 27 Jun 2016 09:03:29 +0000 (10:03 +0100)]
Do not remove loads/store with unresolved accesses.

Due to AOT and compiling classes that are not ready yet
(eg missing a super class), we need to be conservative when
accessing fields and can end up in a situation where the same
field can be resolved and unresolved within the same method
(because of inlining). Therefore, disable removing loads and
stores in a method when there are unresolved accesses.

bug:29433999

Change-Id: I8fcfb52c584222474a8220eb16c6581350b702e0

8 years agoClean up StringReferenceValueComparator and DexFile.
Vladimir Marko [Mon, 27 Jun 2016 12:50:16 +0000 (13:50 +0100)]
Clean up StringReferenceValueComparator and DexFile.

Add a helper function to StringReference, so that the
StringReferenceValueComparator doesn't need to repeatedly
reference the same StringReference variable which led to
the bug 29602109.

Also clean up the DexFile, moving definitions of functions
that depend on the dex_file-inl.h from dex_file.h also to
the dex_file-inl.h.

Test: Run standard ART test suite on host and Nexus 5.
Bug: 29602109
Change-Id: I83e2aa67173c62b3432c26478e528bbb53b6d09f

8 years agoOptimizing: Do not depend on sharpening in test 450
Goran Jakovljevic [Mon, 27 Jun 2016 12:12:48 +0000 (14:12 +0200)]
Optimizing: Do not depend on sharpening in test 450

The sharpening may or may not remove the ArtMethod*
parameter, so the test must not depend on its absence.
This fixes the test 450 checker test on mips/mips64.

Change-Id: Ie62c5a7da5994c3b0c6f0452c9abb37575216806

8 years agoMerge \\"Fixes and cleaning for test/458-checker-instruction-simplification.\\" am...
Roland Levillain [Mon, 27 Jun 2016 12:40:18 +0000 (12:40 +0000)]
Merge \\"Fixes and cleaning for test/458-checker-instruction-simplification.\\" am: 337fcb78e2
am: 887537bc3a

Change-Id: If55a6b9246f964f43e75263937feec0475f4c9e1

8 years agoMerge \"Fixes and cleaning for test/458-checker-instruction-simplification.\"
Alexandre Rames [Mon, 27 Jun 2016 12:36:56 +0000 (12:36 +0000)]
Merge \"Fixes and cleaning for test/458-checker-instruction-simplification.\"
am: 337fcb78e2

Change-Id: I8aa22fc03dd4586c63487c9839a36399b87d3ce7

8 years agoMerge "Fixes and cleaning for test/458-checker-instruction-simplification."
Roland Levillain [Mon, 27 Jun 2016 12:29:37 +0000 (12:29 +0000)]
Merge "Fixes and cleaning for test/458-checker-instruction-simplification."

8 years agoFix 004-ThreadStress.
Vladimir Marko [Tue, 21 Jun 2016 17:21:53 +0000 (18:21 +0100)]
Fix 004-ThreadStress.

Synchronize the start of performing the tasks after all
threads have been created and runners reported their start.
This prevents a daemon thread from allocating all memory
before the main thread tries to allocate the next daemon
thread, which is the likely culprit of failing to print any
output whatsoever (the main thread exits due to an uncaught
OOME and printing the message also fails due to OOME).

Instead of repeating attempts to print "Finishing worker"
until it succeeds, print the message through JNI which does
not require any Java heap memory. Similarly, print caught
Throwables through JNI. Also make sure to preallocate
Strings that are used once we start running tasks to avoid
const-string throwing OOME. This also prevents a partial
success followed by a retry; we have seen a failure to
print the EOL, yielding "Finishing workerFinishing worker".

Change the "Thread exited..." message to be printed only in
DEBUG mode and compare the full output, ignoring different
numbers as the "Starting worker for <id>" may be reordered.

Test: "make -j 32 test-art-host-run-test-004-ThreadStress"
    (4 configs: with or without gcstress, 32-bit and 64-bit)
    100 times while also keeping the machine under load with
    "make -j 32" to repeatedly build another full AOSP tree.
Bug: 27371304
Change-Id: I28286d70a08be64c36d0e49dd5558686813ff264

8 years agoFixes and cleaning for test/458-checker-instruction-simplification.
Alexandre Rames [Mon, 27 Jun 2016 10:13:34 +0000 (11:13 +0100)]
Fixes and cleaning for test/458-checker-instruction-simplification.

- Use the `doThrow` trick to defeat inlining.
- Fix the order of `expected` and `found` arguments for a few tests.

Change-Id: Id8e5041993d72f61e75b4586b49180006cda4b5c

8 years agoMerge \\"ART: OneBit intrinsics should use 1ULL for 64-bit shift\\" am: 1e28d1e145
Pavel Vyssotski [Fri, 24 Jun 2016 19:11:02 +0000 (19:11 +0000)]
Merge \\"ART: OneBit intrinsics should use 1ULL for 64-bit shift\\" am: 1e28d1e145
am: 90685485df

Change-Id: Ie3269e263cb146a655217e348ae1cd5e146c7a91

8 years agoMerge \\"Adjust ART tests expectations after libcore changes.\\" am: 7caad2a084
Roland Levillain [Fri, 24 Jun 2016 19:11:02 +0000 (19:11 +0000)]
Merge \\"Adjust ART tests expectations after libcore changes.\\" am: 7caad2a084
am: f44e3d662a

Change-Id: I7b28ce4b8111d19db941d9fdee349b09efde15ca

8 years agoMerge \"ART: OneBit intrinsics should use 1ULL for 64-bit shift\"
Pavel Vyssotski [Fri, 24 Jun 2016 19:08:35 +0000 (19:08 +0000)]
Merge \"ART: OneBit intrinsics should use 1ULL for 64-bit shift\"
am: 1e28d1e145

Change-Id: Ifca8f91f444537704477824a52ae50309db93858

8 years agoMerge \"Adjust ART tests expectations after libcore changes.\"
Roland Levillain [Fri, 24 Jun 2016 19:08:34 +0000 (19:08 +0000)]
Merge \"Adjust ART tests expectations after libcore changes.\"
am: 7caad2a084

Change-Id: I0c2666a36e76c6faccbf0fb265d198c8dd77f431

8 years agoMerge "ART: OneBit intrinsics should use 1ULL for 64-bit shift"
Treehugger Robot [Fri, 24 Jun 2016 18:58:53 +0000 (18:58 +0000)]
Merge "ART: OneBit intrinsics should use 1ULL for 64-bit shift"

8 years agoMerge "Adjust ART tests expectations after libcore changes."
Treehugger Robot [Fri, 24 Jun 2016 18:53:48 +0000 (18:53 +0000)]
Merge "Adjust ART tests expectations after libcore changes."

8 years agoAdjust ART tests expectations after libcore changes.
Roland Levillain [Fri, 24 Jun 2016 17:44:36 +0000 (18:44 +0100)]
Adjust ART tests expectations after libcore changes.

Test: test/100-reflect2, test/201-built-in-exception-detail-messages
Change-Id: I0c13e37973d0b954cbafa15b049cb8934b88ebe5

8 years agoMerge \\"Fix StringReferenceValueComparator.\\" am: 8543d324d1
Vladimir Marko [Fri, 24 Jun 2016 16:01:01 +0000 (16:01 +0000)]
Merge \\"Fix StringReferenceValueComparator.\\" am: 8543d324d1
am: 88ca66a386

Change-Id: I82d33dece4ea64aed7ce428200b9cf7658bfcf8d

8 years agoMerge \"Fix StringReferenceValueComparator.\"
Vladimir Marko [Fri, 24 Jun 2016 15:56:33 +0000 (15:56 +0000)]
Merge \"Fix StringReferenceValueComparator.\"
am: 8543d324d1

Change-Id: Ie45f9019bf8189029efc74d1a09dce5e62c923d4

8 years agoMerge "Fix StringReferenceValueComparator."
Vladimir Marko [Fri, 24 Jun 2016 15:48:31 +0000 (15:48 +0000)]
Merge "Fix StringReferenceValueComparator."

8 years agoFix StringReferenceValueComparator.
Vladimir Marko [Fri, 24 Jun 2016 10:56:59 +0000 (11:56 +0100)]
Fix StringReferenceValueComparator.

Test: Added a regression test in string_reference_test.cc,
run the standard ART test suite on host and Nexus 5.

Bug: 29602109
Change-Id: Idcc059a07df048a0e3ece257b16b6556f242243e

8 years agoMerge changes I4d8da7ce,I4da5be01,Idfbead82 am: 31167a5785
Roland Levillain [Fri, 24 Jun 2016 13:17:01 +0000 (13:17 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82 am: 31167a5785
am: f7511ac497

Change-Id: I0bc49fd2385ef240f5fc477c01495148b4de319b

8 years agoMerge changes I4d8da7ce,I4da5be01,Idfbead82
Roland Levillain [Fri, 24 Jun 2016 13:12:47 +0000 (13:12 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82
am: 31167a5785

Change-Id: Id0131ff628a47b611e39c026243cf5f11ce9bc49

8 years agoMerge changes I4d8da7ce,I4da5be01,Idfbead82
Roland Levillain [Fri, 24 Jun 2016 13:04:36 +0000 (13:04 +0000)]
Merge changes I4d8da7ce,I4da5be01,Idfbead82

* changes:
  Re-enable most intrinsics with read barriers.
  Fix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.
  Fix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.

8 years agoMerge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: bad21cb538
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:33:14 +0000 (11:33 +0000)]
Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: bad21cb538
am: a5364b014b

Change-Id: I9a5755da3aba9b370b35bac17e184de58f7a27be

8 years agoMerge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:20:49 +0000 (11:20 +0000)]
Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: bad21cb538

Change-Id: I327c5c1d906f5fea59797bc7ff79578dcef510b4

8 years agoMerge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Merge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"

8 years agoART: OneBit intrinsics should use 1ULL for 64-bit shift
Pavel Vyssotski [Wed, 22 Jun 2016 06:36:10 +0000 (12:36 +0600)]
ART: OneBit intrinsics should use 1ULL for 64-bit shift

Change-Id: I91cbe769081045e6a45a95154a8a8acf1ec352ef
Signed-off-by: Pavel Vyssotski <pavel.n.vyssotski@intel.com>
8 years agoMerge \\"ART: Run RTP if invoke inputs have more specific type\\" am: 79fb0a294c
David Brazdil [Thu, 23 Jun 2016 17:55:11 +0000 (17:55 +0000)]
Merge \\"ART: Run RTP if invoke inputs have more specific type\\" am: 79fb0a294c
am: 4b2b05def9

Change-Id: Ia31e98ecef103e445878d79bbf8d312b38d489ee

8 years agoMerge \"ART: Run RTP if invoke inputs have more specific type\"
David Brazdil [Thu, 23 Jun 2016 17:50:05 +0000 (17:50 +0000)]
Merge \"ART: Run RTP if invoke inputs have more specific type\"
am: 79fb0a294c

Change-Id: I59d5146cfedd244f2d9aa77d0cd83602d320b4e0

8 years agoMerge "ART: Run RTP if invoke inputs have more specific type"
David Brazdil [Thu, 23 Jun 2016 17:37:51 +0000 (17:37 +0000)]
Merge "ART: Run RTP if invoke inputs have more specific type"

8 years agoMerge \\"elf_builder: Fix Mips header flags\\" am: 156d8ca8c1
Greg Kaiser [Thu, 23 Jun 2016 16:34:35 +0000 (16:34 +0000)]
Merge \\"elf_builder: Fix Mips header flags\\" am: 156d8ca8c1
am: 4dec26879b

Change-Id: I1c36d1390d6ce518baf8ffefd238c2eb2dc3aa69

8 years agoMerge \"elf_builder: Fix Mips header flags\"
Greg Kaiser [Thu, 23 Jun 2016 16:30:51 +0000 (16:30 +0000)]
Merge \"elf_builder: Fix Mips header flags\"
am: 156d8ca8c1

Change-Id: I1f076879a3e294a24a208a13d6923915736d1cc2

8 years agoMerge \\"OatFileAssistantTest: do not relocate image randomly.\\" am: 9822f6b81f
Richard Uhler [Thu, 23 Jun 2016 16:26:53 +0000 (16:26 +0000)]
Merge \\"OatFileAssistantTest: do not relocate image randomly.\\" am: 9822f6b81f
am: 05ca4b8dd1

Change-Id: Ic7655644b16450efa2b93cfd35b07748ef548994

8 years agoMerge "elf_builder: Fix Mips header flags"
Greg Kaiser [Thu, 23 Jun 2016 16:26:24 +0000 (16:26 +0000)]
Merge "elf_builder: Fix Mips header flags"

8 years agoMerge \"OatFileAssistantTest: do not relocate image randomly.\"
Richard Uhler [Thu, 23 Jun 2016 16:22:45 +0000 (16:22 +0000)]
Merge \"OatFileAssistantTest: do not relocate image randomly.\"
am: 9822f6b81f

Change-Id: I4c443278e4a7af5de0831dacf60164b4c709077d

8 years agoMerge "OatFileAssistantTest: do not relocate image randomly."
Richard Uhler [Thu, 23 Jun 2016 16:14:58 +0000 (16:14 +0000)]
Merge "OatFileAssistantTest: do not relocate image randomly."

8 years agoMIPS64: Remove the workaround in VisitInvokeStaticOrDirect
Goran Jakovljevic [Thu, 23 Jun 2016 09:49:30 +0000 (11:49 +0200)]
MIPS64: Remove the workaround in VisitInvokeStaticOrDirect

This is not needed since $s2-$s8 are not blocked any more. This is
follow-up change for I325ab403752c6b9cd788147cb8b21d42aaff629e.

Change-Id: I934a21adb85581e137a6dcb3355605742b085d83

8 years agoART: Run RTP if invoke inputs have more specific type
David Brazdil [Tue, 21 Jun 2016 16:48:19 +0000 (17:48 +0100)]
ART: Run RTP if invoke inputs have more specific type

Moving RTP inside the graph builder introduced a regression where
replacing the inner parameters with the actual arguments of the
HInvoke would not build the inner graph with types more specific
than the method's signature.

This patch runs RTP on the inner graph again when it is detected
that RTP may improve typing precision.

Bug: 29595335
Change-Id: I351babc8497c83c2fba589aa51f46eaa0b7ab33c

8 years agoRe-enable most intrinsics with read barriers.
Roland Levillain [Thu, 23 Jun 2016 12:53:42 +0000 (13:53 +0100)]
Re-enable most intrinsics with read barriers.

Also extend sun.misc.Unsafe test coverage to exercise
sun.misc.Unsafe.{get,put}{Int,Long,Object}Volatile.

Bug: 26205973
Bug: 29516905
Change-Id: I4d8da7cee5c8a310c8825c1631f71e5cb2b80b30
Test: Covered by ART's run-tests.

8 years agoFix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.
Roland Levillain [Thu, 23 Jun 2016 12:48:47 +0000 (13:48 +0100)]
Fix ARM & ARM64 UnsafeGetObject intrinsics with read barriers.

The implementation was incorrectly interpreting the 'offset'
input as an index in a (4-byte) object reference array,
whereas it is a (1-byte) offset to an object reference field
within the 'base' (object) input.

Bug: 29516905
Change-Id: I4da5be0193217965f25e5d141c242592dea6ffe8
Test: Covered by test/004-UnsafeTest.

8 years agoFix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.
Sang, Chunlei [Tue, 5 Apr 2016 09:12:59 +0000 (17:12 +0800)]
Fix x86 & x86-64 UnsafeGetObject intrinsics with read barriers.

The implementation was incorrectly interpreting the 'offset'
input as an index in a (4-byte) object reference array,
whereas it is a (1-byte) offset to an object reference field
within the 'base' (object) input.

Bug: 29516905
Change-Id: Idfbead8289222b55069816a81284401eff791e85
Test: Covered by test/004-UnsafeTest.

8 years agoMerge \\"Fixed typo in comment.\\" am: ee2d222cc5
Aart Bik [Thu, 23 Jun 2016 00:53:32 +0000 (00:53 +0000)]
Merge \\"Fixed typo in comment.\\" am: ee2d222cc5
am: 4db3563589

Change-Id: I67e08946d15e71495a0d4df035bb2f34bd6ef76a

8 years agoMerge \"Fixed typo in comment.\"
Aart Bik [Thu, 23 Jun 2016 00:51:01 +0000 (00:51 +0000)]
Merge \"Fixed typo in comment.\"
am: ee2d222cc5

Change-Id: Icb3370b74afd36a350df351181a5d6df36a1918d

8 years agoMerge "Fixed typo in comment."
Treehugger Robot [Thu, 23 Jun 2016 00:39:49 +0000 (00:39 +0000)]
Merge "Fixed typo in comment."

8 years agoMerge \\"Support the -i flag in the new dexdump.\\" am: f4c7dd6658
Aart Bik [Thu, 23 Jun 2016 00:01:56 +0000 (00:01 +0000)]
Merge \\"Support the -i flag in the new dexdump.\\" am: f4c7dd6658
am: 0bac5583e5

Change-Id: I4363e83090ce335f7594e344c8d2d4ccd4e0851e

8 years agoMerge \"Support the -i flag in the new dexdump.\"
Aart Bik [Wed, 22 Jun 2016 23:58:59 +0000 (23:58 +0000)]
Merge \"Support the -i flag in the new dexdump.\"
am: f4c7dd6658

Change-Id: I1c964998a08043addc79f10546bca7659c6bac73

8 years agoMerge "Support the -i flag in the new dexdump."
Aart Bik [Wed, 22 Jun 2016 23:50:52 +0000 (23:50 +0000)]
Merge "Support the -i flag in the new dexdump."

8 years agoFixed typo in comment.
Aart Bik [Wed, 22 Jun 2016 23:34:46 +0000 (16:34 -0700)]
Fixed typo in comment.

Change-Id: I818e5e67d664dfd2bddd464ed8e4f5efceb1fb22

8 years agoMerge \"Call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable.\" into...
Oleksiy Vyalov [Wed, 22 Jun 2016 22:56:03 +0000 (22:56 +0000)]
Merge \"Call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable.\" into nyc-dev
am: f7a0543d88

Change-Id: I418ae6112bae0158327f075a1a8120ca66ef5751

8 years agoMerge "Call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable." into...
Oleksiy Vyalov [Wed, 22 Jun 2016 22:43:47 +0000 (22:43 +0000)]
Merge "Call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable." into nyc-dev

8 years agoSupport the -i flag in the new dexdump.
Aart Bik [Wed, 22 Jun 2016 01:30:10 +0000 (18:30 -0700)]
Support the -i flag in the new dexdump.

Rationale:
The old dexdump supported the -i feature (ignore checksum failures).
This CL adds the same functionality to the new dexdump. Note that
this feature is, for example, useful to inspect DEX files that are
extracted from images (with quickened instructions), since the
checksum is not always valid in those cases.

BUG=29548017

Change-Id: I6017b2f3d789f450560b568297f43c62bf9453b1

8 years agoOatFileAssistantTest: do not relocate image randomly.
Richard Uhler [Tue, 26 Apr 2016 17:24:38 +0000 (10:24 -0700)]
OatFileAssistantTest: do not relocate image randomly.

Manually relocate the boot image to a known location before starting
the runtime so that the image won't be randomly relocated. This fixes
flaky test failures due to the image randomly being relocated by 0.

Bug: 28294887
Change-Id: I05a7961f1237a05e89d3f631c959e260ccfe0b70

8 years agoCall prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable.
Oleksiy Vyalov [Tue, 21 Jun 2016 23:21:37 +0000 (16:21 -0700)]
Call prctl(PR_SET_PTRACER, PR_SET_PTRACER_ANY) if app is debuggable.

Enabled Yama security may prevent non-privileged debugger from
attaching to the app. However, if app is marked is debuggable
then it should acceptable to allow debugger with arbitrary pid
to connect the app.

Bug: 29549463

Change-Id: I50c79dbca272dc473e489cc61471628e2fdc4a03

8 years agoMerge \\"Revert \\"Revert \\"Revert \\"Revert \\"Disable 149-suspend-all-stress,...
Nicolas Geoffray [Wed, 22 Jun 2016 13:20:54 +0000 (13:20 +0000)]
Merge \\"Revert \\"Revert \\"Revert \\"Revert \\"Disable 149-suspend-all-stress, its output is flaky.\\"\\"\\"\\"\\" am: 739dc72773
am: 0ed278ea17

Change-Id: I0f6f4539e48e3d8d128cc2210f18e4963add24cf

8 years agoMerge \"Revert \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its outpu...
Nicolas Geoffray [Wed, 22 Jun 2016 13:18:05 +0000 (13:18 +0000)]
Merge \"Revert \"Revert \"Revert \"Revert \"Disable 149-suspend-all-stress, its output is flaky.\"\"\"\"\"
am: 739dc72773

Change-Id: I8d553a1122a801c92ff13311c6a342df7640a003

8 years agoMerge "Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output...
Nicolas Geoffray [Wed, 22 Jun 2016 13:14:21 +0000 (13:14 +0000)]
Merge "Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky."""""

8 years agoRevert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky...
Nicolas Geoffray [Wed, 22 Jun 2016 13:13:59 +0000 (13:13 +0000)]
Revert "Revert "Revert "Revert "Disable 149-suspend-all-stress, its output is flaky.""""

Bug: 29387050

This reverts commit 0b8a91477a3cd3357e89c20d78726728cf897246.

Change-Id: Ie349d70ee489fd4b9065df4a445bbf8ef42ae911

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
Przemyslaw Szczepaniak [Wed, 22 Jun 2016 12:30:36 +0000 (13:30 +0100)]
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a

Added new method to string class, resized the mirror object.

Bug: 28666126
Change-Id: Ibed4e134c16512bde5183e73e130534f08256888

8 years agoFix braino in the test to make it work on target.
Nicolas Geoffray [Wed, 22 Jun 2016 08:55:02 +0000 (08:55 +0000)]
Fix braino in the test to make it work on target.
am: af17a5e38a

Change-Id: I1d2a29d36c745484c61913936177a4ca8e642770

8 years agoMerge \\"Number of unique strings loaded from dex code added to oatdump\\" am: 12e6e9f3f1
Mathieu Chartier [Tue, 21 Jun 2016 21:51:03 +0000 (21:51 +0000)]
Merge \\"Number of unique strings loaded from dex code added to oatdump\\" am: 12e6e9f3f1
am: 342ab5c560

Change-Id: I701a6e5251790c41a04ea36b4b7daddbddaf5271

8 years agoMerge \"Number of unique strings loaded from dex code added to oatdump\"
Christina Wadsworth [Tue, 21 Jun 2016 21:48:00 +0000 (21:48 +0000)]
Merge \"Number of unique strings loaded from dex code added to oatdump\"
am: 12e6e9f3f1

Change-Id: I45b0660d4864d4721fe6327f7d55c5cc2cc28bb8

8 years agoMerge "Number of unique strings loaded from dex code added to oatdump"
Mathieu Chartier [Tue, 21 Jun 2016 21:39:06 +0000 (21:39 +0000)]
Merge "Number of unique strings loaded from dex code added to oatdump"