OSDN Git Service
Andreas Gampe [Mon, 18 Aug 2014 05:19:46 +0000 (05:19 +0000)]
am
d75383af: am
5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
* commit '
d75383af2f0843ecd2f493fd64b4eb38630c6071':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Mon, 18 Aug 2014 05:12:55 +0000 (05:12 +0000)]
am
5e8a63ae: Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
* commit '
5e8a63ae39cb5db996229c6c4a1a21a4b8dec5a2':
ART: Do not recursively abort when visiting locks in a bad state
Andreas Gampe [Sun, 17 Aug 2014 09:54:48 +0000 (09:54 +0000)]
am
73386e5e: am
d84f916d: ART: Avoid expensive class lookup in compiler driver
* commit '
73386e5e0358a43c18bd0952a36ef5d4f89ed02b':
ART: Avoid expensive class lookup in compiler driver
Andreas Gampe [Sun, 17 Aug 2014 09:39:32 +0000 (09:39 +0000)]
am
d84f916d: ART: Avoid expensive class lookup in compiler driver
* commit '
d84f916d35bb0dc74d7daa075b883e5ee1ce1109':
ART: Avoid expensive class lookup in compiler driver
Andreas Gampe [Sat, 16 Aug 2014 05:35:46 +0000 (22:35 -0700)]
ART: Avoid expensive class lookup in compiler driver
When we are not compiling multidex, avoid an expensive by-descriptor
lookup for classes when deciding whether to skip compilation.
Bug:
17072698
Change-Id: I19bcb2a2928207fcae0badd466cdc52945bd37c4
Andreas Gampe [Mon, 18 Aug 2014 05:06:15 +0000 (05:06 +0000)]
Merge "ART: Do not recursively abort when visiting locks in a bad state" into lmp-dev
Andreas Gampe [Sat, 16 Aug 2014 20:41:10 +0000 (13:41 -0700)]
ART: Do not recursively abort when visiting locks in a bad state
This avoids a nested abort in VisitLocks.
Bug:
17080621,
16382675
Change-Id: Id604976ac9dcac0e319fb25cab4d2cbc98d7ee24
Ian Rogers [Fri, 15 Aug 2014 23:35:16 +0000 (23:35 +0000)]
am
aa1ed01d: Merge "ART source line debug info in OAT files"
* commit '
aa1ed01d119ee6d93e6254789c79246e91fcec32':
ART source line debug info in OAT files
Ian Rogers [Fri, 15 Aug 2014 23:22:59 +0000 (23:22 +0000)]
am
c28d8a6f: Merge "x86_64: Use RegClassBySize() for field accesses"
* commit '
c28d8a6f0fbfbec8993854b1a9be08af7d506e7b':
x86_64: Use RegClassBySize() for field accesses
Ian Rogers [Fri, 15 Aug 2014 22:13:31 +0000 (22:13 +0000)]
am
2b2148e8: Merge "Tidy up monitor comments."
* commit '
2b2148e89ac3852f29b96c3d0629d3344229ba00':
Tidy up monitor comments.
Ian Rogers [Fri, 15 Aug 2014 23:14:01 +0000 (23:14 +0000)]
Merge "x86_64: Use RegClassBySize() for field accesses"
Nicolas Geoffray [Fri, 15 Aug 2014 21:16:38 +0000 (21:16 +0000)]
am
de941877: am
ebee8de7: Fix bugs in the x86 and arm versions of generic JNI.
* commit '
de94187722a762aab48cc1ca28e959d481116ee5':
Fix bugs in the x86 and arm versions of generic JNI.
Nicolas Geoffray [Fri, 15 Aug 2014 21:16:38 +0000 (21:16 +0000)]
am
a0d73331: (-s ours) am
9c290012: Execute an application even when dex2oat crashes.
* commit '
a0d733319bfa3293e4e51db28832022b96f8620d':
Execute an application even when dex2oat crashes.
Ian Rogers [Fri, 15 Aug 2014 20:59:04 +0000 (20:59 +0000)]
am
02d4602b: am
378fe3d3: Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
* commit '
02d4602bc98f3214c721f7a5787a3cf1dc670700':
Make Monitor::Wait more robust to spurious Inflate failures.
Mathieu Chartier [Fri, 15 Aug 2014 20:58:33 +0000 (20:58 +0000)]
am
220dfee8: am
bb6eccca: Merge "Use handle in one case that spans a gc-point." into lmp-dev
* commit '
220dfee8bc87789d4b2be6352541d5e5770cb4cb':
Use handle in one case that spans a gc-point.
Jeff Hao [Fri, 15 Aug 2014 20:58:30 +0000 (20:58 +0000)]
am
574760b6: am
95b4c65d: Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
* commit '
574760b603d27a42f3eacee3a1c7368faf61a18b':
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
Jeff Hao [Fri, 15 Aug 2014 20:58:30 +0000 (20:58 +0000)]
am
549c9b17: am
4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.
* commit '
549c9b1776c03789699f0fa6b7b0c90d7fcca019':
Fix proxy tracing and enable tests that now work with tracing.
Jeff Hao [Fri, 15 Aug 2014 20:54:24 +0000 (13:54 -0700)]
resolved conflicts for merge of
549c9b17 to lmp-dev-plus-aosp
Change-Id: Icea7763c830aeefa02d6a86c960c4b41148d397b
Nicolas Geoffray [Fri, 15 Aug 2014 19:39:31 +0000 (19:39 +0000)]
am
ebee8de7: Fix bugs in the x86 and arm versions of generic JNI.
* commit '
ebee8de725d5fa83483642786b19ea453d865762':
Fix bugs in the x86 and arm versions of generic JNI.
Nicolas Geoffray [Fri, 15 Aug 2014 19:39:31 +0000 (19:39 +0000)]
am
9c290012: Execute an application even when dex2oat crashes.
* commit '
9c290012b7f505ae1943ab87236f775b97a46e2d':
Execute an application even when dex2oat crashes.
Brian Carlstrom [Fri, 15 Aug 2014 19:26:03 +0000 (19:26 +0000)]
am
9dcf75c8: Merge "Make gdb fixup work with multiple DWARF Compilation Units"
* commit '
9dcf75c80187504ec88e7ef91d64a6a68279eb9d':
Make gdb fixup work with multiple DWARF Compilation Units
Nicolas Geoffray [Wed, 13 Aug 2014 02:40:45 +0000 (03:40 +0100)]
Fix bugs in the x86 and arm versions of generic JNI.
Also fix the run script of 116-nodex2oat to use the non-prebuild
script for target.
Bug:
17000769
(cherry-picked from commit
54accbca0b549b1b1ad3ef09655dad438bc1e104)
Change-Id: I439fcd710fb8bb408f3288ff8fb34fef23890adb
Nicolas Geoffray [Tue, 22 Jul 2014 09:48:00 +0000 (10:48 +0100)]
Execute an application even when dex2oat crashes.
Bug:
17000769
(cherry picked from commit
4fcdc94d22a4608e355aa8df36240181149d10e8)
Change-Id: Iccb1fec94fe64ce4c3097510952f275482b86aa9
Brian Carlstrom [Fri, 15 Aug 2014 19:05:09 +0000 (19:05 +0000)]
Merge "Make gdb fixup work with multiple DWARF Compilation Units"
Ian Rogers [Fri, 15 Aug 2014 18:52:43 +0000 (18:52 +0000)]
am
ee736b29: Merge "Make Monitor::Wait more robust to spurious Inflate failures."
* commit '
ee736b29675455ab0be615581145aa239ce7a6b3':
Make Monitor::Wait more robust to spurious Inflate failures.
Ian Rogers [Fri, 15 Aug 2014 23:27:29 +0000 (23:27 +0000)]
Merge "ART source line debug info in OAT files"
Yevgeny Rouban [Fri, 8 Aug 2014 09:29:38 +0000 (16:29 +0700)]
ART source line debug info in OAT files
OAT files have source line information enough for ART runtime needs like
jump to/from interpreter and thread suspension. But this information
is not enough for finer grained source level debugging and low-level
profiling (VTune or perf).
This patch adds to OAT files two additional sections:
.debug_line - DWARF formatted Elf32 section with detailed source line
information (mapping from native PC to Java source lines).
In addition to the debugging symbols added using the dex2oat option
--include-debug-symbols, the source line information is added to
the section .debug_line.
The source line info can be read by many Elf reading tools like objdump,
readelf, dwarfdump, gdb, perf, VTune, ...
gdb can use this debug line information in x86. In 64-bit mode
the information can be used if the oat file is mapped in the lower
address space (address has higher 32 bits zeroed). Relocation works.
Testing:
1. art/test/run-test --host --gdb [--64] 001-HelloWorld
2. in gdb: break Main.java:19
3. in gdb: break Runtime.java:111
4. in gdb: run - stops at void java.lang.Runtime.<init>()
5. in gdb: backtrace - shows call stack down to main()
6. in gdb: continue - stops at void Main.main() (only in 32-bit mode)
7. in gdb: backtrace - shows call stack down to main()
8. objdump -W <oat-file> - addresses are from VMA range of .text
section reported by objdump -h <file>
9. dwarfdump -ka <oat-file> - no errors expected
Size of aosp-x86-eng boot.oat increased by 11% from 80.5Mb to 89.2Mb
with two sections added .debug_line (7.2Mb) and .rel.debug (1.5Mb).
Change-Id: Ib8828832686e49782a63d5529008ff4814ed9cda
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
Ian Rogers [Fri, 15 Aug 2014 21:47:37 +0000 (21:47 +0000)]
Merge "Tidy up monitor comments."
Ian Rogers [Fri, 15 Aug 2014 20:39:34 +0000 (13:39 -0700)]
Tidy up monitor comments.
Change-Id: Ib9d993f964ba6e2bec1979b486c26d3920a4a40c
Ian Rogers [Fri, 15 Aug 2014 18:42:34 +0000 (18:42 +0000)]
am
378fe3d3: Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
* commit '
378fe3d39d3a55f61d82ea482b8ce3082aee0e21':
Make Monitor::Wait more robust to spurious Inflate failures.
Mathieu Chartier [Fri, 15 Aug 2014 17:51:28 +0000 (17:51 +0000)]
am
bb6eccca: Merge "Use handle in one case that spans a gc-point." into lmp-dev
* commit '
bb6eccca7dcd673e24eed2fe95915780aa38a5d6':
Use handle in one case that spans a gc-point.
Jeff Hao [Fri, 15 Aug 2014 17:38:50 +0000 (17:38 +0000)]
am
95b4c65d: Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
* commit '
95b4c65da93500cdbdcaa3e01010771ef3f466f1':
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
Jeff Hao [Fri, 15 Aug 2014 17:38:49 +0000 (17:38 +0000)]
am
4bf8d11d: Fix proxy tracing and enable tests that now work with tracing.
* commit '
4bf8d11df5dccc1b276cd9c40a98e8a14d79a9c8':
Fix proxy tracing and enable tests that now work with tracing.
Jeff Hao [Fri, 15 Aug 2014 00:18:52 +0000 (17:18 -0700)]
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
This CL is a better fix for proxy tracing and undoes the changes in
https://android-review.googlesource.com/#/c/103025/
Bug:
16386215
(cherry picked from commit
db8a664e0b68c7c4d36270cd21dce8de1912d7f9)
Change-Id: Ic9e0ea2af7cb2da5d90c56aa009de92dba14cc47
Jeff Hao [Fri, 15 Aug 2014 16:51:42 +0000 (16:51 +0000)]
am
90a51f2c: Merge "Prevent stubs from being installed in java.lang.reflect.Proxy.<init>."
* commit '
90a51f2c42500c591780f6b4991234374fb6a88f':
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
Ian Rogers [Fri, 15 Aug 2014 16:51:41 +0000 (16:51 +0000)]
am
da316afe: Merge "Fix the THREAD_ offsets for MIPS."
* commit '
da316afe7228d70db0b359c579baa06b2e52be24':
Fix the THREAD_ offsets for MIPS.
Alex Light [Thu, 14 Aug 2014 00:15:38 +0000 (17:15 -0700)]
Make gdb fixup work with multiple DWARF Compilation Units
Change-Id: I83042362fc199ca48c8452230709a377e52a2cf5
Jeff Hao [Thu, 24 Jul 2014 23:26:09 +0000 (16:26 -0700)]
Fix proxy tracing and enable tests that now work with tracing.
Also updates proxy_test to generate an image for GetQuickOatCodeFor.
Bug:
16386215
(cherry picked from commit
f0a3f09c3d54646166a55c05a6b39c7dd504129c)
Change-Id: I138edbad9e1646db8590f2b1b73f2788d9710e68
Calin Juravle [Fri, 15 Aug 2014 13:41:48 +0000 (14:41 +0100)]
resolved conflicts for merge of
d3db28a4 to lmp-dev-plus-aosp
Change-Id: Ibc0771343762a8d1bf875c36262d9cda896e4d2b
Calin Juravle [Fri, 15 Aug 2014 13:16:47 +0000 (13:16 +0000)]
am
93de4273: [ART] Move to system/core native bridge library
* commit '
93de4273d72a2558a7b3423547b5074cd76c5796':
[ART] Move to system/core native bridge library
Calin Juravle [Tue, 12 Aug 2014 19:55:20 +0000 (20:55 +0100)]
[ART] Move to system/core native bridge library
Some cleanups on the way:
- move NativeBridgeRuntimeCallbacks from a global to a field
- rename native_bridge_library_string to the more suggestive
navtive_bridge_library_path
- clean up imports
Bug:
16884833
(cherry picked from commit I73aab8e212860ba5aee9444d801806d3da326a41)
Change-Id: I67f037ea81d2a4ede4294afd8b84b7640e534a13
Narayan Kamath [Fri, 15 Aug 2014 11:51:03 +0000 (11:51 +0000)]
am
d9a879fa: am
4f1d05f0: Merge "More efficient stack walk in exception throwing." into lmp-dev
* commit '
d9a879fa3acc97b2d010031e06c2bb6b68a11043':
More efficient stack walk in exception throwing.
Andreas Gampe [Fri, 15 Aug 2014 11:48:13 +0000 (11:48 +0000)]
am
e7f5af4d: am
b84d7a22: Revert "Revert "ART: Fix mac build""
* commit '
e7f5af4d27f39aca4e00e89085a932055427da40':
Revert "Revert "ART: Fix mac build""
Calin Juravle [Fri, 15 Aug 2014 11:45:03 +0000 (11:45 +0000)]
am
37f048b1: Merge "[ART] Move to system/core native bridge library"
* commit '
37f048b19da5ac245a6b2a8473b326d2167cc692':
[ART] Move to system/core native bridge library
Torne (Richard Coles) [Fri, 15 Aug 2014 11:42:47 +0000 (12:42 +0100)]
Skip merge of
3cc928f6 into lmp-dev-plus-aosp.
Commit was already cherrypicked to lmp-dev-plus-aosp as
b038ba6.
Mathieu Chartier [Fri, 15 Aug 2014 11:34:49 +0000 (11:34 +0000)]
am
34f18696: am
b162bf5a: Use homogeneous space compaction if proper flag is set.
* commit '
34f186960f5f7bcf40be94379c2944591b3c4c2d':
Use homogeneous space compaction if proper flag is set.
Andreas Gampe [Fri, 15 Aug 2014 11:33:42 +0000 (11:33 +0000)]
am
bdeac834: am
1d778570: Merge "ART: Fix run-test in case of relative TMPDIR" into lmp-dev
* commit '
bdeac834300ab07b741eb2fe685b1ec3e273262a':
ART: Fix run-test in case of relative TMPDIR
Andreas Gampe [Fri, 15 Aug 2014 11:33:24 +0000 (11:33 +0000)]
am
38cc2035: am
0b6952ca: Merge "Revert "ART: Fix mac build"" into lmp-dev
* commit '
38cc20356499d7d7c1c5d916a3596614a5634870':
Revert "ART: Fix mac build"
Vladimir Marko [Fri, 15 Aug 2014 11:33:03 +0000 (11:33 +0000)]
am
16bf1aed: am
e470a027: Merge "Fix intrinsic Math.abs(double) for ARM." into lmp-dev
* commit '
16bf1aeda6e441e163fd40f8dbcaee171357a4fb':
Fix intrinsic Math.abs(double) for ARM.
Torne (Richard Coles) [Fri, 15 Aug 2014 11:22:53 +0000 (12:22 +0100)]
Skip merge of
10fe7dca into lmp-dev-plus-aosp.
Commit was already cherrypicked to lmp-dev-plus-aosp as
4cf00ba.
Narayan Kamath [Fri, 15 Aug 2014 09:12:08 +0000 (09:12 +0000)]
am
4f1d05f0: Merge "More efficient stack walk in exception throwing." into lmp-dev
* commit '
4f1d05f0531b980b16dbff18161f02160919ec31':
More efficient stack walk in exception throwing.
Jeff Hao [Fri, 15 Aug 2014 16:40:10 +0000 (16:40 +0000)]
Merge "Prevent stubs from being installed in java.lang.reflect.Proxy.<init>."
Jeff Hao [Fri, 15 Aug 2014 00:18:52 +0000 (17:18 -0700)]
Prevent stubs from being installed in java.lang.reflect.Proxy.<init>.
This CL is a better fix for proxy tracing and undoes the changes in
https://android-review.googlesource.com/#/c/103025/
Change-Id: Ie82bb49f07774bd08a6720ddbe5b1f8ee9363acf
Ian Rogers [Fri, 15 Aug 2014 18:34:19 +0000 (18:34 +0000)]
Merge "Make Monitor::Wait more robust to spurious Inflate failures." into lmp-dev
Ian Rogers [Fri, 15 Aug 2014 18:09:28 +0000 (11:09 -0700)]
Make Monitor::Wait more robust to spurious Inflate failures.
Bug:
17062710
Change-Id: Ife5f6b335caacc70cab543cd568676d277d3beb6
Calin Juravle [Fri, 15 Aug 2014 11:35:52 +0000 (11:35 +0000)]
Merge "[ART] Move to system/core native bridge library"
Calin Juravle [Tue, 12 Aug 2014 19:55:20 +0000 (20:55 +0100)]
[ART] Move to system/core native bridge library
Some cleanups on the way:
- move NativeBridgeRuntimeCallbacks from a global to a field
- rename native_bridge_library_string to the more suggestive
navtive_bridge_library_path
- clean up imports
Bug:
16884833
Change-Id: I73aab8e212860ba5aee9444d801806d3da326a41
Ian Rogers [Fri, 15 Aug 2014 16:33:41 +0000 (16:33 +0000)]
Merge "Fix the THREAD_ offsets for MIPS."
Raghu Gandham [Thu, 14 Aug 2014 23:45:56 +0000 (16:45 -0700)]
Fix the THREAD_ offsets for MIPS.
Change-Id: Iafa5a470d3910e819f8c8cf976213d228b8805d9
Narayan Kamath [Fri, 15 Aug 2014 09:08:15 +0000 (09:08 +0000)]
Merge "More efficient stack walk in exception throwing." into lmp-dev
Mathieu Chartier [Fri, 15 Aug 2014 17:45:30 +0000 (17:45 +0000)]
Merge "Use handle in one case that spans a gc-point." into lmp-dev
Mingyao Yang [Wed, 13 Aug 2014 21:51:03 +0000 (14:51 -0700)]
Use handle in one case that spans a gc-point.
Bug:
16689428
(cherry picked from commit
38eecb0f4288a374c9b0b4b4df8793eb5fc6697c)
Change-Id: Id4a1bde9012e4dd333493e46997c200537c9cf55
Ian Rogers [Fri, 15 Aug 2014 18:39:31 +0000 (18:39 +0000)]
Merge "Make Monitor::Wait more robust to spurious Inflate failures."
Ian Rogers [Fri, 15 Aug 2014 18:09:28 +0000 (11:09 -0700)]
Make Monitor::Wait more robust to spurious Inflate failures.
Bug:
17062710
Change-Id: Ife5f6b335caacc70cab543cd568676d277d3beb6
(cherry picked from commit
6f22fc166ed6c11cad229bff442c064e704de101)
Dave Allison [Thu, 14 Aug 2014 17:02:48 +0000 (17:02 +0000)]
Revert "Revert "Reduce stack usage for overflow checks""
Fixes stack protection issue.
Fixes mac build issue.
This reverts commit
83b1940e6482b9d8feba5c492507735686650ea5.
Change-Id: I7ba17252882b23a740bcda2ea94aacf398255406
Mathieu Chartier [Thu, 14 Aug 2014 01:07:31 +0000 (18:07 -0700)]
Use homogeneous space compaction if proper flag is set.
If the flag ART_USE_HSPACE_COMPACT is set then we use
hspace compaction.
Bug:
16401001
Change-Id: I74e1db764f9ff16c007fa3bd16cb2c9b468ec83c
Andreas Gampe [Thu, 14 Aug 2014 18:04:12 +0000 (18:04 +0000)]
Revert "ART: Fix mac build"
The underlying CL was reverted.
This reverts commit
564f58305961986591ccb2fff04b9ccdd430a6db.
Change-Id: Ic9fe93a95c4357d0045a430713be7da517f626b5
Dave Allison [Thu, 14 Aug 2014 16:54:09 +0000 (16:54 +0000)]
Revert "Reduce stack usage for overflow checks"
This reverts commit
63c051a540e6dfc806f656b88ac3a63e99395429.
Change-Id: I282a048994fcd130fe73842b16c21680053c592f
Mathieu Chartier [Thu, 14 Aug 2014 23:35:10 +0000 (23:35 +0000)]
am
31ddbf0f: am
a73a8b55: Move explicit GC after we are done initalizing all classes.
* commit '
31ddbf0f54faa6d72a3663e71ec0771ca18c08a2':
Move explicit GC after we are done initalizing all classes.
Andreas Gampe [Thu, 14 Aug 2014 23:34:57 +0000 (23:34 +0000)]
am
f3f4742e: am
0c2a6d76: Merge "ART: Fix another potential N-th visitor issue" into lmp-dev
* commit '
f3f4742e669f7b32c0cd4b9295dcc172275a39f4':
ART: Fix another potential N-th visitor issue
Andreas Gampe [Thu, 14 Aug 2014 23:34:49 +0000 (23:34 +0000)]
am
22ebd85f: am
564f5830: ART: Fix mac build
* commit '
22ebd85fe7ba7776c995114f9241f9b62fb703f7':
ART: Fix mac build
Andreas Gampe [Thu, 14 Aug 2014 23:34:44 +0000 (23:34 +0000)]
am
50acbfe8: am
c483a73c: Merge "ART: Fix class-linker handling" into lmp-dev
* commit '
50acbfe83fed79263dd0af97e8767f5df6e4b6c7':
ART: Fix class-linker handling
Andreas Gampe [Thu, 14 Aug 2014 23:34:01 +0000 (23:34 +0000)]
am
479b244c: am
f8c4ed08: ART: Fix wrong command line parameter
* commit '
479b244ce8fb59f63f3984389bd55528589f6474':
ART: Fix wrong command line parameter
Calin Juravle [Thu, 14 Aug 2014 23:34:00 +0000 (23:34 +0000)]
am
58a2d441: am
4c37afb7: Get the native bridge library from the framework.
* commit '
58a2d4418ffa1c811d8982182d288a5a0c23a51c':
Get the native bridge library from the framework.
Chao-ying Fu [Thu, 14 Aug 2014 22:59:17 +0000 (15:59 -0700)]
x86_64: Use RegClassBySize() for field accesses
This patch optimizes x86_64 field accesses to use kAnyReg whenever possible
via RegClassBySize(). Previously, using kCoreReg is too strict.
Change-Id: I55a48765b9bfe6b11c4b09f85c4eb08a6e269f98
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Ian Rogers [Thu, 14 Aug 2014 23:11:33 +0000 (16:11 -0700)]
resolved conflicts for merge of
b03bd88d to lmp-dev-plus-aosp
Change-Id: I10a96805dab30faea84d790c181c28c967cc038e
Andreas Gampe [Thu, 14 Aug 2014 22:51:43 +0000 (22:51 +0000)]
am
b84d7a22: Revert "Revert "ART: Fix mac build""
* commit '
b84d7a226399dcc60bc0a421715ffc90ce9213f7':
Revert "Revert "ART: Fix mac build""
Andreas Gampe [Thu, 14 Aug 2014 22:40:19 +0000 (22:40 +0000)]
Revert "Revert "ART: Fix mac build""
This reverts commit
350b03bca65f87895275d1ed4bb895d5afeeeff1.
Also fixes a fault_handler symbol.
Change-Id: I1315527400bffc8ded9f2a7e7fdb1c8a6c104b96
Ian Rogers [Thu, 14 Aug 2014 22:32:54 +0000 (22:32 +0000)]
am
d684cbfb: Merge "Implement inlined shift long for 32bit"
* commit '
d684cbfbe8abfb9aea4de27687041243217295c7':
Implement inlined shift long for 32bit
Ian Rogers [Thu, 14 Aug 2014 22:28:03 +0000 (22:28 +0000)]
am
6324ca47: Merge "ART: Inline implementation of min() and max() for long in x86"
* commit '
6324ca4706de44b75e5b8ba55473766809c4f132':
ART: Inline implementation of min() and max() for long in x86
Dave Allison [Thu, 14 Aug 2014 22:07:57 +0000 (22:07 +0000)]
am
03c9785a: Revert "Revert "Reduce stack usage for overflow checks""
* commit '
03c9785a8a6d712775cf406c4371d0227c44148f':
Revert "Revert "Reduce stack usage for overflow checks""
Dave Allison [Thu, 14 Aug 2014 17:02:48 +0000 (17:02 +0000)]
Revert "Revert "Reduce stack usage for overflow checks""
Fixes stack protection issue.
Fixes mac build issue.
This reverts commit
83b1940e6482b9d8feba5c492507735686650ea5.
Change-Id: I7ba17252882b23a740bcda2ea94aacf398255406
Ian Rogers [Thu, 14 Aug 2014 20:19:15 +0000 (20:19 +0000)]
am
ecb01120: Merge "Make OatClass and OatMethod immutable once more."
* commit '
ecb01120ac3b16758146de6f2297ff80083668ec':
Make OatClass and OatMethod immutable once more.
Hiroshi Yamauchi [Wed, 13 Aug 2014 18:12:22 +0000 (11:12 -0700)]
More efficient stack walk in exception throwing.
In the exception handling code, we currently walk down the stack
twice, once to get the stack height which we use to compute frame IDs
(the bottom frame is zero), and once more to find the catch block to
jump to.
For a deep stack, this could result in very slow exception
handling. That is, if have a lot of finally or catch blocks that we
end up jumping to in a deep stack, we need to do a lot of
catch/rethrow chains. Since we'd need to walk down to the bottom each
time to compute frames IDs in each catch/rethrow, we'd need to walk
down O(N^2) frames at the worst case.
Instead of frames IDs ((the bottom frame is zero), we will use the
frame depth (the top frame is zero) and no longer need to walk down
the stack just to get the stack height. We walk down O(N) frames.
This was what was happening with
code.google.gson.functional.CircularReferenceTest. With this change,
the test run time went from ~120s down to ~3s on N5 and it no longer
crashes due to the thread suspension timeout.
(cherry pick commit
649278cec7119cdd1bea3d0b710dbb2aa7c650b6)
Bug:
16800209
Change-Id: Ie815df1e3e8fb9d82e40685d4cc2b8838fd8aa07
Mathieu Chartier [Thu, 14 Aug 2014 20:12:07 +0000 (20:12 +0000)]
am
b162bf5a: Use homogeneous space compaction if proper flag is set.
* commit '
b162bf5af5c2e508c6947471ceffaa98991794f4':
Use homogeneous space compaction if proper flag is set.
Andreas Gampe [Thu, 14 Aug 2014 19:09:21 +0000 (19:09 +0000)]
am
a7101c17: Merge "ART: Fix mac build"
* commit '
a7101c17fd8b3dd960d4ffde3d89b1c89134dba2':
ART: Fix mac build
Mathieu Chartier [Thu, 14 Aug 2014 01:07:31 +0000 (18:07 -0700)]
Use homogeneous space compaction if proper flag is set.
If the flag ART_USE_HSPACE_COMPACT is set then we use
hspace compaction.
Bug:
16401001
Change-Id: I74e1db764f9ff16c007fa3bd16cb2c9b468ec83c
Andreas Gampe [Thu, 14 Aug 2014 18:47:06 +0000 (18:47 +0000)]
am
0cde7da9: Merge "ART: Fix run-test in case of relative TMPDIR"
* commit '
0cde7da99fe4a0874934ccd3a28fc4bc19197ff7':
ART: Fix run-test in case of relative TMPDIR
Andreas Gampe [Thu, 14 Aug 2014 18:40:01 +0000 (18:40 +0000)]
am
1d778570: Merge "ART: Fix run-test in case of relative TMPDIR" into lmp-dev
* commit '
1d7785704cafca20629c4bfb87c60d99dd69f72a':
ART: Fix run-test in case of relative TMPDIR
Nicolas Geoffray [Thu, 14 Aug 2014 18:30:55 +0000 (18:30 +0000)]
am
078f4ea9: Merge "Mark ParallelGC with gcstress failing."
* commit '
078f4ea927b3259d698ca3dd542a096943e2cccd':
Mark ParallelGC with gcstress failing.
Hiroshi Yamauchi [Thu, 14 Aug 2014 18:27:16 +0000 (18:27 +0000)]
am
2a516974: Merge "More efficient stack walk in exception throwing."
* commit '
2a516974f998fb71514c3160b125032e2bcc4e04':
More efficient stack walk in exception throwing.
Andreas Gampe [Thu, 14 Aug 2014 18:08:53 +0000 (18:08 +0000)]
am
0b6952ca: Merge "Revert "ART: Fix mac build"" into lmp-dev
* commit '
0b6952cac86de294fb01898694b6a55f0a162a43':
Revert "ART: Fix mac build"
Andreas Gampe [Thu, 14 Aug 2014 18:00:31 +0000 (11:00 -0700)]
resolved conflicts for merge of
dbe5f5ce to lmp-dev-plus-aosp
Change-Id: I85cb01de20f4c1b691db2813d21cb472db26edfc
Vladimir Marko [Thu, 14 Aug 2014 17:59:50 +0000 (17:59 +0000)]
am
e470a027: Merge "Fix intrinsic Math.abs(double) for ARM." into lmp-dev
* commit '
e470a02792ce584fe0ff1b9a7dd6aebe62ca9be5':
Fix intrinsic Math.abs(double) for ARM.
Vladimir Marko [Thu, 14 Aug 2014 17:57:06 +0000 (17:57 +0000)]
am
a855db47: Merge "Fix intrinsic Math.abs(double) for ARM."
* commit '
a855db47575817164ed02c105d225292928940e4':
Fix intrinsic Math.abs(double) for ARM.
Dan Albert [Thu, 14 Aug 2014 17:47:43 +0000 (17:47 +0000)]
am
b6c7f62b: am
c85a899b: Revert "Revert "Remove GCC atomic workarounds.""
* commit '
b6c7f62b2c4a048003ce792d82d3aefb5bc96404':
Revert "Revert "Remove GCC atomic workarounds.""
Dan Albert [Thu, 14 Aug 2014 17:47:42 +0000 (17:47 +0000)]
am
b5f27b87: am
f0a37663: Initialize art::Atomic\'s value to 0.
* commit '
b5f27b87a46f754839ce2ea79d6a5d62a335aad0':
Initialize art::Atomic's value to 0.
Dave Allison [Thu, 14 Aug 2014 17:47:42 +0000 (17:47 +0000)]
am
ba5137ba: (-s ours) am
63c051a5: Reduce stack usage for overflow checks
* commit '
ba5137baa9bcebbc603a686ecebb664483b5257f':
Reduce stack usage for overflow checks
Dave Allison [Thu, 14 Aug 2014 17:00:55 +0000 (17:00 +0000)]
am
b0bf089c: Merge "Revert "Reduce stack usage for overflow checks"" into lmp-dev
* commit '
b0bf089c2d80f861e4d8798e97828452b2e0b99b':
Revert "Reduce stack usage for overflow checks"
Mathieu Chartier [Thu, 14 Aug 2014 17:00:54 +0000 (17:00 +0000)]
am
a73a8b55: Move explicit GC after we are done initalizing all classes.
* commit '
a73a8b55415b544355438522524a640378698d85':
Move explicit GC after we are done initalizing all classes.