OSDN Git Service
Jeff Hao [Wed, 31 Aug 2016 20:21:21 +0000 (20:21 +0000)]
Merge changes Idfd8ac9f,I3dacb78f am:
244d105f68 am:
801d035a29
am:
3e638a0e7d
Change-Id: Ib6bd14e80c44dd3e918fd229d37169710fe3d96e
Jeff Hao [Wed, 31 Aug 2016 20:18:46 +0000 (20:18 +0000)]
Merge changes Idfd8ac9f,I3dacb78f am:
244d105f68
am:
801d035a29
Change-Id: Ieccbf2646bc95a61dae9b4c27083ff6aa549174f
Hiroshi Yamauchi [Wed, 31 Aug 2016 20:15:50 +0000 (20:15 +0000)]
Merge "Fix a check failure in the CC background transition." am:
14a4fdc6d7 am:
a49b8539fc
am:
3fd09a13f0
Change-Id: I487cf9c4af8c0af0efc1131dbfb5956295d57f48
Jeff Hao [Wed, 31 Aug 2016 20:15:47 +0000 (20:15 +0000)]
Merge changes Idfd8ac9f,I3dacb78f
am:
244d105f68
Change-Id: I3e3dfd52a6aa687cf7a18997448e7d25bc6a57ff
Hiroshi Yamauchi [Wed, 31 Aug 2016 20:12:50 +0000 (20:12 +0000)]
Merge "Fix a check failure in the CC background transition." am:
14a4fdc6d7
am:
a49b8539fc
Change-Id: Icb38c1a31d36622e425cf311e4e821e4f38cdeb2
Jeff Hao [Wed, 31 Aug 2016 20:09:58 +0000 (20:09 +0000)]
Merge changes Idfd8ac9f,I3dacb78f
* changes:
Finish dexlayout dumping of dex files and added test.
Add dex file intermediate representation
Hiroshi Yamauchi [Wed, 31 Aug 2016 20:09:48 +0000 (20:09 +0000)]
Merge "Fix a check failure in the CC background transition."
am:
14a4fdc6d7
Change-Id: Ib0ebcdf8458804b51bc031fc643610ac9516b69b
Treehugger Robot [Wed, 31 Aug 2016 19:59:39 +0000 (19:59 +0000)]
Merge "Fix a check failure in the CC background transition."
Mathieu Chartier [Wed, 31 Aug 2016 19:51:48 +0000 (19:51 +0000)]
Merge "Fix unnecessary read barrier for resolved/initialized allocations" am:
43ac11487e am:
2ea52d8c52
am:
ef2e118cfb
Change-Id: I18840f52cd34e0794cac82ac2f8bfc0392d09b91
Andreas Gampe [Wed, 31 Aug 2016 19:48:50 +0000 (19:48 +0000)]
Merge "ART: Use libbase" am:
e534a16033 am:
376d85fdd9
am:
67821d2b61
Change-Id: I5334e48aede207915249e87b407f688301017d8c
Mathieu Chartier [Wed, 31 Aug 2016 19:48:44 +0000 (19:48 +0000)]
Merge "Fix unnecessary read barrier for resolved/initialized allocations" am:
43ac11487e
am:
2ea52d8c52
Change-Id: I9793fbbfd30093c74395c4790b062806bfa431dc
Mathieu Chartier [Wed, 31 Aug 2016 19:45:46 +0000 (19:45 +0000)]
Merge "Fix unnecessary read barrier for resolved/initialized allocations"
am:
43ac11487e
Change-Id: I35dae15712893b7006c6cde6a5444a11b9ae3c13
Andreas Gampe [Wed, 31 Aug 2016 19:45:44 +0000 (19:45 +0000)]
Merge "ART: Use libbase" am:
e534a16033
am:
376d85fdd9
Change-Id: If11435ce5dacf5cf0872153f814392f116c0bc45
Andreas Gampe [Wed, 31 Aug 2016 19:42:47 +0000 (19:42 +0000)]
Merge "ART: Use libbase"
am:
e534a16033
Change-Id: I13bc0b06b63d2ad6c69936d8e8e896873c700a41
Mathieu Chartier [Wed, 31 Aug 2016 19:41:03 +0000 (19:41 +0000)]
Merge "Fix unnecessary read barrier for resolved/initialized allocations"
Treehugger Robot [Wed, 31 Aug 2016 19:37:50 +0000 (19:37 +0000)]
Merge "ART: Use libbase"
Vladimir Marko [Wed, 31 Aug 2016 18:46:14 +0000 (18:46 +0000)]
Merge "Remove workarounds for [D]CHECK()s in constexpr functions." am:
a2ab404b62 am:
3a45473207
am:
a8d8f6c314
Change-Id: I18a972d910152960956c7f351a6af182a2d0d5de
Vladimir Marko [Wed, 31 Aug 2016 18:43:39 +0000 (18:43 +0000)]
Merge "Remove workarounds for [D]CHECK()s in constexpr functions." am:
a2ab404b62
am:
3a45473207
Change-Id: Iab11b3ad627e18fb727dd16ebacaf59d7b9f5702
Vladimir Marko [Wed, 31 Aug 2016 18:40:41 +0000 (18:40 +0000)]
Merge "Remove workarounds for [D]CHECK()s in constexpr functions."
am:
a2ab404b62
Change-Id: I9e4b187fe4b3faacf0d26abb807becad977ed50f
Vladimir Marko [Wed, 31 Aug 2016 18:30:22 +0000 (18:30 +0000)]
Merge "Remove workarounds for [D]CHECK()s in constexpr functions."
Jeff Hao [Mon, 29 Aug 2016 21:18:26 +0000 (14:18 -0700)]
Finish dexlayout dumping of dex files and added test.
The test runs dexdump and dexlayout over the first core library jar file
and diffs the output, checking that they're the same. More dex files
will be added later for better coverage.
Bug:
29921113
Test: mm test-art-host-gtest-dexlayout_test
(cherry-picked from commit
a378e88db648cf19e771714dd1059cf3d41d4753)
Change-Id: Idfd8ac9f069885b675a4a2f0c70aef2cbef5a9b8
Andreas Gampe [Wed, 31 Aug 2016 18:08:08 +0000 (18:08 +0000)]
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED" am:
3d08238729 am:
e4386ec9b3
am:
716e99929e
Change-Id: I17ef2f2b444323fdd08fbe9606d69db0e110a8b1
Andreas Gampe [Wed, 31 Aug 2016 18:05:37 +0000 (18:05 +0000)]
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED" am:
3d08238729
am:
e4386ec9b3
Change-Id: I536714eb659acff91512bc1c220044cfacc44681
Andreas Gampe [Wed, 31 Aug 2016 18:02:38 +0000 (18:02 +0000)]
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
am:
3d08238729
Change-Id: I16b33765c4f4649471a66b7e816b326a89c684a3
Andreas Gampe [Wed, 31 Aug 2016 17:49:55 +0000 (17:49 +0000)]
Merge "ART: SHARED_REQUIRES to REQUIRES_SHARED"
David Sehr [Sun, 7 Aug 2016 23:01:51 +0000 (16:01 -0700)]
Add dex file intermediate representation
Add an intermediate representation, constructed from the DexFile
utilities, that can be used to optimize the layout and re-emit dex
files.
BUG:
29921113
TEST: TODO: Add dex files to compare output with dexdump
(cherry-picked from commit
af14d9f551e6169c201dc7981d9cfbcb53c7d2c7)
Change-Id: I3dacb78fad5228e43d77f20b110bd40e0e116cdb
Vladimir Marko [Wed, 31 Aug 2016 14:25:25 +0000 (15:25 +0100)]
Remove workarounds for [D]CHECK()s in constexpr functions.
We're now using C++14, so we can use [D]CHECK()s directly
in constexpr functions. Remove the C++11 workaround macros
([D]CHECK_CONSTEXPR) and C++ version checks. Also remove the
'static' qualifier from inline functions in affected files.
Test: m test-art-host
Change-Id: I0f962ad75e4efe9b65325d022cd272b229574222
Vladimir Marko [Wed, 31 Aug 2016 13:32:50 +0000 (13:32 +0000)]
Merge "MIPS32: Fill branch delay slots" am:
081e7a16c4 am:
8e7f306a8b
am:
7cf540cdcf
Change-Id: I1fcfa0744da3960a4c40d2a4f65d06927022da07
Vladimir Marko [Wed, 31 Aug 2016 13:32:49 +0000 (13:32 +0000)]
Merge "Re-enable boot image string sharpening." am:
d707979dd4 am:
2bad8ad499
am:
25d9c86381
Change-Id: I7063a8a6dd646768b991dca660b8b4fe502e539d
Vladimir Marko [Wed, 31 Aug 2016 13:29:49 +0000 (13:29 +0000)]
Merge "MIPS32: Fill branch delay slots" am:
081e7a16c4
am:
8e7f306a8b
Change-Id: Ic3bd7451480685d9be55f0f15eed0ae0b89b1a01
Vladimir Marko [Wed, 31 Aug 2016 13:29:48 +0000 (13:29 +0000)]
Merge "Re-enable boot image string sharpening." am:
d707979dd4
am:
2bad8ad499
Change-Id: If95fb6177d6c51d4e2bfc92702f6a314f79b092d
Vladimir Marko [Wed, 31 Aug 2016 13:27:09 +0000 (13:27 +0000)]
Merge "MIPS32: Fill branch delay slots"
am:
081e7a16c4
Change-Id: I07a12eda51374e6eb37cc8243358a7f4a64ba86f
Vladimir Marko [Wed, 31 Aug 2016 13:27:07 +0000 (13:27 +0000)]
Merge "Re-enable boot image string sharpening."
am:
d707979dd4
Change-Id: I73edbe78a9ee86600a034bc2bb1d3230af7bfc88
Vladimir Marko [Wed, 31 Aug 2016 13:17:44 +0000 (13:17 +0000)]
Merge "MIPS32: Fill branch delay slots"
Vladimir Marko [Wed, 31 Aug 2016 13:16:57 +0000 (13:16 +0000)]
Merge "Re-enable boot image string sharpening."
Roland Levillain [Wed, 31 Aug 2016 09:51:35 +0000 (09:51 +0000)]
Merge "Add entrypoint type information." am:
19a3f556e7 am:
526b769046
am:
6d0947ead3
Change-Id: Id6854e385bd5353e6bbb16e92565be2da2787c62
Roland Levillain [Wed, 31 Aug 2016 09:48:35 +0000 (09:48 +0000)]
Merge "Add entrypoint type information." am:
19a3f556e7
am:
526b769046
Change-Id: I0db220e4a1c61f214fb21b7138a85d261b4b8276
Roland Levillain [Wed, 31 Aug 2016 09:45:37 +0000 (09:45 +0000)]
Merge "Add entrypoint type information."
am:
19a3f556e7
Change-Id: Ibd4571cc6cc960e6b114de1837d4b180aaf6787d
Roland Levillain [Wed, 31 Aug 2016 09:41:23 +0000 (09:41 +0000)]
Merge "Add entrypoint type information."
Hiroshi Yamauchi [Wed, 31 Aug 2016 00:44:41 +0000 (17:44 -0700)]
Fix a check failure in the CC background transition.
If there's a process state update from jank perceptible to jank
in-perceptible and a reverse update right after it, there's a chance
that the heap task daemon sees desired_collector_type ==
kCollectorTypeCC rather than kCollectorTypeCCBackground in
DoPendingCollectorTransition() which leads to a !kUseReadBarrier check
failure in TransitionCollector(). The fix is to move this check after
the early return case where collector_type == collector_type_ in
TransitionCollector() like the CMS/Hspace case.
Bug:
31039431
Bug:
12687968
Test: test-art-host, aosp boot with CC, master boot with CC.
Change-Id: I5fe34cb41eaa01c6d8bf80a185253fde6778e852
Andreas Gampe [Tue, 30 Aug 2016 23:38:47 +0000 (16:38 -0700)]
ART: SHARED_REQUIRES to REQUIRES_SHARED
This coincides with the actual attribute name and upstream usage.
Preparation for deferring to libbase.
Test: m
Test: m test-art-host
Change-Id: Ia8986b5dfd926ba772bf00b0a35eaf83596d8518
Alexey Frunze [Sat, 30 Jul 2016 05:04:46 +0000 (22:04 -0700)]
MIPS32: Fill branch delay slots
Test: booted MIPS32 in QEMU
Test: test-art-host-gtest
Test: test-art-target-gtest
Test: test-art-target-run-test-optimizing on CI20
Change-Id: I727e80753395ab99fff004cb5d2e0a06409150d7
Mathieu Chartier [Tue, 30 Aug 2016 22:06:54 +0000 (15:06 -0700)]
Fix unnecessary read barrier for resolved/initialized allocations
The caller is responsible for the read barrier for these entrypoints.
No measured change in benchmarks, tested MemAllocTest.
Bug:
12687968
Test: test-art-host CC baker, N6P booting with CC
Change-Id: If6b00fa2c31ff51b943dbbe6caea2ef0a3fa1ae0
Vladimir Marko [Tue, 30 Aug 2016 16:36:24 +0000 (17:36 +0100)]
Re-enable boot image string sharpening.
Test: Run ART test suite with ART_TEST_PIC_IMAGE=true on host and Nexus 9.
Bug:
20323084
Change-Id: Ifc10e4b6f5078f599711bd84be0cec53494af3af
David Sehr [Tue, 30 Aug 2016 17:24:56 +0000 (17:24 +0000)]
Merge "Save environment snapshot and use at fork/exec" am:
d7eabc2cc1 am:
2bbfaf15f7
am:
9a45bff53b
Change-Id: I08c3c9c9586c5769f7c40ea6842d936dfeceb2bd
David Sehr [Tue, 30 Aug 2016 17:22:26 +0000 (17:22 +0000)]
Merge "Save environment snapshot and use at fork/exec" am:
d7eabc2cc1
am:
2bbfaf15f7
Change-Id: I4827b1d35cae05cd216d53d53332f02b8c426853
David Sehr [Tue, 30 Aug 2016 17:20:30 +0000 (17:20 +0000)]
Merge "Save environment snapshot and use at fork/exec"
am:
d7eabc2cc1
Change-Id: If50f0c6f5ece39d4d6467a4f47e5393b88d2b267
Treehugger Robot [Tue, 30 Aug 2016 17:15:26 +0000 (17:15 +0000)]
Merge "Save environment snapshot and use at fork/exec"
Chih-hung Hsieh [Tue, 30 Aug 2016 16:33:24 +0000 (16:33 +0000)]
Merge "Fix clang-tidy warnings in art." am:
99fd9f39f2 am:
61d57349e9
am:
53aa6f6a8d
Change-Id: Iff5afbaa0361624111425e1aa3d4862e5edcde5a
David Sehr [Wed, 17 Aug 2016 02:22:57 +0000 (19:22 -0700)]
Save environment snapshot and use at fork/exec
Some applications may inadvertently or maliciously set of environment
variables such as LD_LIBRARY_PATH before spawning subprocesses.
To make this more difficult, save the environment at the time the
runtime starts and use the saved copy anytime Exec is called.
BUG:
30160149
TEST: make test-art-{host,target}
Change-Id: I887b78bdb21ab20855636a96da14a74c767bbfef
Chih-hung Hsieh [Tue, 30 Aug 2016 16:30:23 +0000 (16:30 +0000)]
Merge "Fix clang-tidy warnings in art." am:
99fd9f39f2
am:
61d57349e9
Change-Id: I15768744f309e7bcc06fba17065e0eda6bb57793
Chih-hung Hsieh [Tue, 30 Aug 2016 16:27:56 +0000 (16:27 +0000)]
Merge "Fix clang-tidy warnings in art."
am:
99fd9f39f2
Change-Id: I72008565498b7e0b62d668d83b89c752b6e1515e
Chih-hung Hsieh [Tue, 30 Aug 2016 16:20:55 +0000 (16:20 +0000)]
Merge "Fix clang-tidy warnings in art."
Neil Fuller [Tue, 30 Aug 2016 14:44:10 +0000 (14:44 +0000)]
Merge "Track addition of Class.toGenericString() method" am:
66d4779c83 am:
f0ec999f0f
am:
4662da424a
Change-Id: I6f550af5ae7e4de14f31d5fb4cc4540629cbe9ff
Neil Fuller [Tue, 30 Aug 2016 14:38:09 +0000 (14:38 +0000)]
Merge "Track addition of Class.toGenericString() method" am:
66d4779c83
am:
f0ec999f0f
Change-Id: I86f506ace4fd642ebe23de0f2739c2f769ce4486
Neil Fuller [Tue, 30 Aug 2016 14:32:38 +0000 (14:32 +0000)]
Merge "Track addition of Class.toGenericString() method"
am:
66d4779c83
Change-Id: Iee8f7b450999f8767eab1f48db22b60b1fdd5a4b
Neil Fuller [Tue, 30 Aug 2016 14:26:34 +0000 (14:26 +0000)]
Merge "Track addition of Class.toGenericString() method"
Neil Fuller [Tue, 23 Aug 2016 13:32:21 +0000 (14:32 +0100)]
Track addition of Class.toGenericString() method
Increasing the vtable size for class by one.
Bug:
28666126
Change-Id: I89019d5f1b65725180b409decbd5b2570e24f5fe
Test: cts ran for libcore (libcore, harmony_java_lang, org) and host art tests.
Mathieu Chartier [Tue, 30 Aug 2016 01:21:27 +0000 (01:21 +0000)]
Merge "Re-enable evacuation of recently allocated regions" am:
9495e0c56b am:
7b7561f3f2
am:
b68a3e0da7
Change-Id: I66f172e76066df758fe882d956757a8683157dd5
Mathieu Chartier [Tue, 30 Aug 2016 01:19:04 +0000 (01:19 +0000)]
Merge "Re-enable evacuation of recently allocated regions" am:
9495e0c56b
am:
7b7561f3f2
Change-Id: I2f378e0a0578fe05d37214d15e27bc0b4994929b
Mathieu Chartier [Tue, 30 Aug 2016 00:21:02 +0000 (00:21 +0000)]
Merge "Re-enable evacuation of recently allocated regions"
am:
9495e0c56b
Change-Id: I7fcd3228062ab84888fb27d5af3501393d968655
Mathieu Chartier [Tue, 30 Aug 2016 00:14:53 +0000 (00:14 +0000)]
Merge "Re-enable evacuation of recently allocated regions"
Nicolas Geoffray [Mon, 29 Aug 2016 23:35:07 +0000 (23:35 +0000)]
Pass the right class loader when inlining. am:
c770fe0480 am:
5b5ee2a89f am:
91373ca410
am:
92cf5792ce
Change-Id: I01977fd546eaebb78854ca071f482e8d94ba4326
Nicolas Geoffray [Mon, 29 Aug 2016 23:25:25 +0000 (23:25 +0000)]
Pass the right class loader when inlining. am:
c770fe0480 am:
5b5ee2a89f
am:
91373ca410
Change-Id: I3d75cc076f4d7eb9db65ed686a8e27f6e93afa76
Nicolas Geoffray [Mon, 29 Aug 2016 22:50:54 +0000 (22:50 +0000)]
Pass the right class loader when inlining. am:
c770fe0480
am:
5b5ee2a89f
Change-Id: I47bfba0654850a6e15ef0337556ed6a12e02fb90
Nicolas Geoffray [Mon, 29 Aug 2016 22:47:31 +0000 (22:47 +0000)]
Pass the right class loader when inlining.
am:
c770fe0480
Change-Id: If6f2946d649addef8381079eb0132d35ee1fd62f
Nicolas Geoffray [Mon, 29 Aug 2016 22:38:46 +0000 (22:38 +0000)]
Pass the right class loader when inlining. am:
c770fe0480
am:
19af431e5b
Change-Id: Ib44abb1cb7277feba8f908025746c38a765e898b
Nicolas Geoffray [Mon, 29 Aug 2016 22:29:53 +0000 (22:29 +0000)]
Pass the right class loader when inlining.
am:
c770fe0480
Change-Id: Ie1cc6d7b272cb9ae9033b2133271618f33703fa0
Andreas Gampe [Mon, 29 Aug 2016 20:09:12 +0000 (20:09 +0000)]
Merge "ART: Fix libnativebridgetest dependencies" am:
3079bc2b73 am:
b45a1bdd8d
am:
74c87c57c8
Change-Id: Ie6aa6b505eeaa54981cd862daecc6595d94e8f65
Andreas Gampe [Mon, 29 Aug 2016 20:05:42 +0000 (20:05 +0000)]
Merge "ART: Fix libnativebridgetest dependencies" am:
3079bc2b73
am:
b45a1bdd8d
Change-Id: I98521fabb319468985e25b43e84c026ce0492b04
Andreas Gampe [Mon, 29 Aug 2016 20:02:43 +0000 (20:02 +0000)]
Merge "ART: Fix libnativebridgetest dependencies"
am:
3079bc2b73
Change-Id: Ie83f6d0041e981fb9d09431318104b57fcdcd239
Andreas Gampe [Mon, 29 Aug 2016 16:53:48 +0000 (09:53 -0700)]
ART: Use libbase
Move to using standard macros from libbase. Required so that we
can use libbase in libart-disassembler to disconnect from libart.
Bug:
15436106
Test: m
Test: m ART_BUILD_HOST_STATIC=true
Test: m test-art-host
Change-Id: I1f1723d875d20689d73835f6ab78c27a8efcf27a
Treehugger Robot [Mon, 29 Aug 2016 19:51:04 +0000 (19:51 +0000)]
Merge "ART: Fix libnativebridgetest dependencies"
Andreas Gampe [Mon, 29 Aug 2016 18:47:07 +0000 (18:47 +0000)]
Merge "ART: Fix symbols" am:
13339f92a3 am:
630e6efe2b
am:
0a6b75024e
Change-Id: I127602e5f96e53b2a84ea5cf350e8498143ca780
Andreas Gampe [Mon, 29 Aug 2016 18:43:11 +0000 (18:43 +0000)]
Merge "ART: Fix symbols" am:
13339f92a3
am:
630e6efe2b
Change-Id: I97b16ad545683816de6a8fcb3ade2f35d52b56cf
Andreas Gampe [Mon, 29 Aug 2016 18:38:47 +0000 (18:38 +0000)]
Merge "ART: Fix symbols"
am:
13339f92a3
Change-Id: I15ee278130232cea6d31a42762adaa0d0dcb1c80
Treehugger Robot [Mon, 29 Aug 2016 18:27:39 +0000 (18:27 +0000)]
Merge "ART: Fix symbols"
Andreas Gampe [Mon, 29 Aug 2016 18:18:37 +0000 (11:18 -0700)]
ART: Fix libnativebridgetest dependencies
Fix typo.
Test: m test-art-host
Change-Id: I1a272a8aa2a114c108cc306164df78f568be20d7
Mathieu Chartier [Sat, 27 Aug 2016 20:27:06 +0000 (13:27 -0700)]
Re-enable evacuation of recently allocated regions
Reduces RAM since these regions usually have a low live % per
the generational hypothesis. Since these get collected earlier it
means the average heap size goes down.
60s after booting N6P CC before (average of 8 samples):
Dalvik .Heap PSS system wide: 28711K
After:
Dalvik .Heap PSS system wide: 18757.5K
EAAC: 1305 -> 1274 (30 samples)
Test: test-art-host CC baker and debug phone bootin
Bug:
12687968
Bug:
30124683
Change-Id: I30465be4525855ee3b78e6fafa5577a78d365bf4
Andreas Gampe [Mon, 29 Aug 2016 15:51:15 +0000 (08:51 -0700)]
ART: Fix symbols
Follow-up to
1f7f3bd26ecad4366c904b7e7d05587fc7a83ea2
Test: m test-art-host
Test: readelf -s $OUT/system/lib/libart.so
Change-Id: I70b25bf65e09eb984d0f533fa19638ffbec12b3c
Narayan Kamath [Mon, 29 Aug 2016 10:00:34 +0000 (10:00 +0000)]
Merge "Revert "Blacklist failing libcore tests."" am:
04bbe22d21 am:
c2a5c6e71c
am:
a78ca5007c
Change-Id: Ie42139bde71dc6fe3cd54eadae06a23497d082a7
Narayan Kamath [Mon, 29 Aug 2016 09:57:33 +0000 (09:57 +0000)]
Merge "Revert "Blacklist failing libcore tests."" am:
04bbe22d21
am:
c2a5c6e71c
Change-Id: I417e09281711bd4c301d406ed8d9999662b18049
Narayan Kamath [Mon, 29 Aug 2016 09:54:05 +0000 (09:54 +0000)]
Merge "Revert "Blacklist failing libcore tests.""
am:
04bbe22d21
Change-Id: I720597e86307551e986e72acb2112a7382f0f447
Treehugger Robot [Mon, 29 Aug 2016 09:46:02 +0000 (09:46 +0000)]
Merge "Revert "Blacklist failing libcore tests.""
Narayan Kamath [Wed, 24 Aug 2016 08:16:23 +0000 (08:16 +0000)]
Revert "Blacklist failing libcore tests."
This reverts commit
fb7658b728690592938dfedc57231ade4e7bd870.
Fixed by commit
856bdfb2bd47e91950182d0c1427944e8e2ab771
Change-Id: I5977cc63f867c51c62de61dbed64cdb444d0dfbf
bug:
30917411
test: run cts -c org.apache.harmony.tests.java.math.BigIntegerTest
Mathieu Chartier [Sat, 27 Aug 2016 20:31:51 +0000 (20:31 +0000)]
Merge "WIP: ART: Clean p x86_64 string dex cache asm." am:
12c4a28167 am:
7de714083b
am:
3d6c121f1f
Change-Id: I21cbe6c50e1bc087c8851f47f969b0ab7cceffa9
Mathieu Chartier [Sat, 27 Aug 2016 20:31:50 +0000 (20:31 +0000)]
Merge "ART: Add STRING_DEX_CACHE_ELEMENT_SIZE" am:
0e1ad6145a am:
30a304cb0f
am:
2bbd282476
Change-Id: Id491bef6b70198f71cd4c56061a4226f608062ac
Mathieu Chartier [Sat, 27 Aug 2016 20:28:50 +0000 (20:28 +0000)]
Merge "WIP: ART: Clean p x86_64 string dex cache asm." am:
12c4a28167
am:
7de714083b
Change-Id: Id4aacfa81b8fec54da3f4f243e301eefd87f7c5f
Mathieu Chartier [Sat, 27 Aug 2016 20:28:50 +0000 (20:28 +0000)]
Merge "ART: Add STRING_DEX_CACHE_ELEMENT_SIZE" am:
0e1ad6145a
am:
30a304cb0f
Change-Id: I764fea1cded3f0af23908491b2d95fab3a8cd836
Mathieu Chartier [Sat, 27 Aug 2016 20:25:24 +0000 (20:25 +0000)]
Merge "WIP: ART: Clean p x86_64 string dex cache asm."
am:
12c4a28167
Change-Id: If728e388581945c3ffbe0454c2a1634400d64b70
Mathieu Chartier [Sat, 27 Aug 2016 20:25:22 +0000 (20:25 +0000)]
Merge "ART: Add STRING_DEX_CACHE_ELEMENT_SIZE"
am:
0e1ad6145a
Change-Id: I7e274aedaf95fcf6b26a1542fb40b36a40abd4a7
Mathieu Chartier [Sat, 27 Aug 2016 20:19:40 +0000 (20:19 +0000)]
Merge "WIP: ART: Clean p x86_64 string dex cache asm."
Mathieu Chartier [Sat, 27 Aug 2016 20:19:10 +0000 (20:19 +0000)]
Merge "ART: Add STRING_DEX_CACHE_ELEMENT_SIZE"
Nicolas Geoffray [Thu, 28 Jul 2016 02:49:14 +0000 (03:49 +0100)]
Pass the right class loader when inlining.
Otherwise, method and type resolution can resolve to the wrong
things and as a side effect update the dex cache with wrong data.
bug:
30403437
Change-Id: I23f94486f51c65e0a1328c6185b36084627e09b3
test:./art/test/run-test --host --jit --dev --no-prebuild 613
(cherry picked from commit
0a210d9b108c87c0e7c1d430a92ce6fc89790c95)
Chih-Hung Hsieh [Fri, 26 Aug 2016 22:06:11 +0000 (15:06 -0700)]
Fix clang-tidy warnings in art.
* Add parentheses around macro parameters, or
use NOLINT to suppress warning.
Bug:
28705665
Test: build with WITH_TIDY=1
Change-Id: Ifc922c2e66215772042bac372754ea70074f0053
Pirama Arumuga Nainar [Fri, 26 Aug 2016 22:45:34 +0000 (22:45 +0000)]
Merge "Ignore -Wunreachable-code for ClassTable::UpdateClass" am:
de35bb7ece am:
fbf7c591e6
am:
55663c3e3b
Change-Id: I250496aa36ab06320526598cacbe9b9d77a0252f
Pirama Arumuga Nainar [Fri, 26 Aug 2016 22:43:02 +0000 (22:43 +0000)]
Merge "Ignore -Wunreachable-code for ClassTable::UpdateClass" am:
de35bb7ece
am:
fbf7c591e6
Change-Id: Ib48f375cbceca3e4d9d491fb812f3cf61104719a
Pirama Arumuga Nainar [Fri, 26 Aug 2016 22:40:34 +0000 (22:40 +0000)]
Merge "Ignore -Wunreachable-code for ClassTable::UpdateClass"
am:
de35bb7ece
Change-Id: I6704f7d40fda0d0dee9e284d0308d4a0c687b56e
Pirama Arumuga Nainar [Fri, 26 Aug 2016 22:38:00 +0000 (22:38 +0000)]
Merge "Ignore -Wunreachable-code for ClassTable::UpdateClass"
Pirama Arumuga Nainar [Fri, 26 Aug 2016 06:42:50 +0000 (23:42 -0700)]
Ignore -Wunreachable-code for ClassTable::UpdateClass
Bug: http://b/
30421084
Bug: http://b/
31104323
Clang triggers -Wunreachable-code in runtime/class_table.cc. Disable
the one instance of this warning until we can investigate (and fix) the
Clang regression.
Change-Id: Ib292009c6d639f540d6b31e793d8aa89dd861b9e
Test: Tested build, boot and common usage for several devices images in
AOSP and internal branch.