OSDN Git Service
Dave Allison [Tue, 1 Apr 2014 23:56:22 +0000 (23:56 +0000)]
am
b74a8625: Merge "Add GenBarrier() calls to terminate all IT blocks."
* commit '
b74a8625b6194fe86769416c70497e74a73a740d':
Add GenBarrier() calls to terminate all IT blocks.
Dave Allison [Tue, 1 Apr 2014 23:44:59 +0000 (23:44 +0000)]
Merge "Add GenBarrier() calls to terminate all IT blocks."
Dave Allison [Tue, 1 Apr 2014 22:14:46 +0000 (15:14 -0700)]
Add GenBarrier() calls to terminate all IT blocks.
This is needed to prevent things like load hoisting from putting
instructions inside the IT block.
Bug:
13749123
Change-Id: I98a010453b163ac20a90f626144f798fc06e65a9
Ian Rogers [Tue, 1 Apr 2014 22:56:42 +0000 (22:56 +0000)]
am
52f5ecb1: Merge "Fix ThreadStress, unify ANR lock descriptions."
* commit '
52f5ecb1714a17b72182fcdf88ae7f6d817855cc':
Fix ThreadStress, unify ANR lock descriptions.
Andreas Gampe [Tue, 1 Apr 2014 22:56:41 +0000 (22:56 +0000)]
am
f5424f29: Merge "Fix Thread offsets for ARM64 assembly"
* commit '
f5424f29709f40c2b3d98e2a5ed56c40187d368b':
Fix Thread offsets for ARM64 assembly
Mathieu Chartier [Tue, 1 Apr 2014 22:47:41 +0000 (22:47 +0000)]
am
252f848f: Merge "Fix running with DlMalloc instead of RosAlloc."
* commit '
252f848f68356551980701126481e0685bbded08':
Fix running with DlMalloc instead of RosAlloc.
Ian Rogers [Tue, 1 Apr 2014 22:46:11 +0000 (22:46 +0000)]
Merge "Fix ThreadStress, unify ANR lock descriptions."
Andreas Gampe [Tue, 1 Apr 2014 22:44:36 +0000 (22:44 +0000)]
Merge "Fix Thread offsets for ARM64 assembly"
Mathieu Chartier [Tue, 1 Apr 2014 22:37:45 +0000 (22:37 +0000)]
Merge "Fix running with DlMalloc instead of RosAlloc."
Ian Rogers [Tue, 1 Apr 2014 22:33:03 +0000 (15:33 -0700)]
Fix ThreadStress, unify ANR lock descriptions.
Bug:
13323656
Change-Id: I902825a847af9aa570ed79701409298e3532bebf
Mathieu Chartier [Tue, 1 Apr 2014 22:01:46 +0000 (15:01 -0700)]
Fix running with DlMalloc instead of RosAlloc.
Bug:
13748830
Bug:
13744490
Change-Id: Ieec97cf58ebf9864a40ee85aae582cdcf3f27c0c
Andreas Gampe [Tue, 1 Apr 2014 21:22:53 +0000 (21:22 +0000)]
am
b3d7eed9: Merge "Build changes to build multilib tests"
* commit '
b3d7eed9f760fa22e3a8e87ec2c8ff3fe50a1f50':
Build changes to build multilib tests
Andreas Gampe [Tue, 1 Apr 2014 21:18:21 +0000 (14:18 -0700)]
Fix Thread offsets for ARM64 assembly
Change-Id: I8d0516091b5a865f415e1446425203785e607f8a
Andreas Gampe [Tue, 1 Apr 2014 21:13:05 +0000 (21:13 +0000)]
Merge "Build changes to build multilib tests"
buzbee [Tue, 1 Apr 2014 21:04:14 +0000 (21:04 +0000)]
am
a1dbc55d: Merge "Quick compiler: add comment to Arm encoding"
* commit '
a1dbc55dcbeb0e91f1c3a68b94ee6d06d5d216f7':
Quick compiler: add comment to Arm encoding
Andreas Gampe [Wed, 26 Mar 2014 01:09:32 +0000 (18:09 -0700)]
Build changes to build multilib tests
Test files will be emitted into directories for both first and second
target architectures. Going with the naming scheme for binaries,
single-architecture and 32b cases have the standard name, and
64b goes into a directory with "64" suffix.
In multi-architecture setups, the default concrete test targets are
extended with a "32" and "64" suffix, e.g., test-art-target-oat-JniTest64.
The suffix-less form is linked to the primary architecture target (usually 64).
That means running combined targets, e.g., test-art-target-oat, will only
test the primary architecture right now.
Fixed target run tests calling the right dalvikvm. Fixed library search
path for tests derived from CommonRuntimeTest.
Missing in this work-in-progress is correct handling of dex2oat for the
secondary architecture. To make it work on 64b, comment out line 101
in build/Android.executable.mk
Change-Id: I3d260994e6efe8b73b56c71994053cc9392943a9
buzbee [Tue, 1 Apr 2014 20:56:35 +0000 (20:56 +0000)]
Merge "Quick compiler: add comment to Arm encoding"
buzbee [Tue, 1 Apr 2014 19:42:20 +0000 (12:42 -0700)]
Quick compiler: add comment to Arm encoding
A question from an AOSP contributer demonstrated the need for
explanation of a seemingly odd encoding for vldrd/vldrs. In short,
we add a "def" bit for lr on those instructions to cover the cases
in which we have to materialize a new base pointer at assembly
time using lr as a temp register.
Change-Id: I22c5740218a90e0ff387c6aac2bd20cc98eece85
Jeff Hao [Tue, 1 Apr 2014 18:42:46 +0000 (18:42 +0000)]
am
8ce67ac1: Merge "Fix reflection access checks for app compatibility."
* commit '
8ce67ac16abcd25b376be622cbd20a34aec4a59d':
Fix reflection access checks for app compatibility.
Jeff Hao [Tue, 1 Apr 2014 18:33:31 +0000 (18:33 +0000)]
Merge "Fix reflection access checks for app compatibility."
buzbee [Tue, 1 Apr 2014 18:31:02 +0000 (18:31 +0000)]
am
d265a8ab: Merge "Quick compiler, MIPS resource cleanup"
* commit '
d265a8ab12e1b783af42bf07a264edbb86826d2c':
Quick compiler, MIPS resource cleanup
Jeff Hao [Tue, 1 Apr 2014 18:21:30 +0000 (11:21 -0700)]
Fix reflection access checks for app compatibility.
Also updates field access test.
Bug:
13740995
Change-Id: I224712cfcb0c05429b831c26980cabad7bdef49a
Jeff Hao [Tue, 1 Apr 2014 18:24:06 +0000 (18:24 +0000)]
am
14f8807a: Merge "Revert "Fix access checks for app compatibility.""
* commit '
14f8807ae14798e48cfe3d5ae6156a613a720dc0':
Revert "Fix access checks for app compatibility."
buzbee [Tue, 1 Apr 2014 18:15:02 +0000 (18:15 +0000)]
Merge "Quick compiler, MIPS resource cleanup"
Mathieu Chartier [Tue, 1 Apr 2014 18:08:01 +0000 (18:08 +0000)]
am
1ad45ef9: Merge "Add handler for printing java stack traces for compiled code SIGSEGV."
* commit '
1ad45ef91afc64174004485f88efd4b7cea516fc':
Add handler for printing java stack traces for compiled code SIGSEGV.
Jeff Hao [Tue, 1 Apr 2014 18:07:55 +0000 (18:07 +0000)]
am
9c60d7d8: Merge "Fix access checks for app compatibility."
* commit '
9c60d7d8598d1d9df19970c20bf92ff3c3e38920':
Fix access checks for app compatibility.
Hiroshi Yamauchi [Tue, 1 Apr 2014 18:07:54 +0000 (18:07 +0000)]
am
79b1bf0b: Merge "Make the support code for read barriers a bit more general."
* commit '
79b1bf0ba1580cef94412ac3a62904ac89e6dfbc':
Make the support code for read barriers a bit more general.
Ian Rogers [Tue, 1 Apr 2014 18:07:53 +0000 (18:07 +0000)]
am
e0309ad3: Merge "Calling convention support for cross 64/32 compilation."
* commit '
e0309ad355e778fe692beb8968bf8aa7edbd3302':
Calling convention support for cross 64/32 compilation.
Jeff Hao [Tue, 1 Apr 2014 18:04:42 +0000 (18:04 +0000)]
Merge "Revert "Fix access checks for app compatibility.""
Jeff Hao [Tue, 1 Apr 2014 18:04:24 +0000 (18:04 +0000)]
Revert "Fix access checks for app compatibility."
This reverts commit
b59b2c8dbdea2a6a3086378f2cf65adc9bc282cd.
Change-Id: I718658b8450a5ce6249df317b635f63356b1ce3c
Mathieu Chartier [Tue, 1 Apr 2014 18:01:23 +0000 (18:01 +0000)]
Merge "Add handler for printing java stack traces for compiled code SIGSEGV."
Jeff Hao [Tue, 1 Apr 2014 18:01:17 +0000 (18:01 +0000)]
Merge "Fix access checks for app compatibility."
Hiroshi Yamauchi [Tue, 1 Apr 2014 17:58:30 +0000 (17:58 +0000)]
Merge "Make the support code for read barriers a bit more general."
Jeff Hao [Tue, 1 Apr 2014 17:58:29 +0000 (10:58 -0700)]
Fix access checks for app compatibility.
Change-Id: I3191e5e92d30e9bee24051fd305296ddcf143e18
Mathieu Chartier [Sun, 30 Mar 2014 22:25:44 +0000 (15:25 -0700)]
Add handler for printing java stack traces for compiled code SIGSEGV.
Added a new FaultHandler which attempts to print a java stack trace
when a SIGSEGV occurse in generated code. This should help debugging
compiler and GC related heap corruption.
Bug:
13725693
Bug:
12934910
Change-Id: Id54d83ea180c222eb86d449c61926e83f0b026ad
Ian Rogers [Tue, 1 Apr 2014 17:57:01 +0000 (17:57 +0000)]
Merge "Calling convention support for cross 64/32 compilation."
Ian Rogers [Tue, 1 Apr 2014 17:36:00 +0000 (10:36 -0700)]
Calling convention support for cross 64/32 compilation.
Add REX support for x86-64 operands.
Change-Id: I093ae26fb8c111d54b8c72166f054984564c04c6
Brian Carlstrom [Tue, 1 Apr 2014 16:45:49 +0000 (16:45 +0000)]
am
a1289ada: No longer restrict to -source 1.5 since it causes a warning with 1.7
* commit '
a1289ada8138efaf638548b414a45437c2bbbdef':
No longer restrict to -source 1.5 since it causes a warning with 1.7
Mathieu Chartier [Tue, 1 Apr 2014 16:44:26 +0000 (16:44 +0000)]
am
7ea687d8: Merge "Fix stack overflow slow path error."
* commit '
7ea687d886be7b8c106b0e0190dab299d14adcad':
Fix stack overflow slow path error.
Mathieu Chartier [Tue, 1 Apr 2014 16:30:24 +0000 (16:30 +0000)]
Merge "Fix stack overflow slow path error."
Ian Rogers [Tue, 1 Apr 2014 15:46:34 +0000 (15:46 +0000)]
am
88e0463f: Merge "Revert "Revert "Optimize easy multiply and easy div remainder."""
* commit '
88e0463fa7e8ea7b427b65a07cd7b28111575174':
Revert "Revert "Optimize easy multiply and easy div remainder.""
Ian Rogers [Tue, 1 Apr 2014 15:46:28 +0000 (15:46 +0000)]
am
e931e21c: Merge "Allow mixing of thread offsets between 32 and 64bit architectures."
* commit '
e931e21c485b514faed71c2a1b4a091f97f15827':
Allow mixing of thread offsets between 32 and 64bit architectures.
Ian Rogers [Tue, 1 Apr 2014 15:38:25 +0000 (15:38 +0000)]
Merge "Revert "Revert "Optimize easy multiply and easy div remainder."""
Ian Rogers [Tue, 1 Apr 2014 15:33:07 +0000 (15:33 +0000)]
Merge "Allow mixing of thread offsets between 32 and 64bit architectures."
Ian Rogers [Sat, 15 Mar 2014 00:43:00 +0000 (17:43 -0700)]
Allow mixing of thread offsets between 32 and 64bit architectures.
Begin a more full implementation x86-64 REX prefixes.
Doesn't implement 64bit thread offset support for the JNI compiler.
Change-Id: If9af2f08a1833c21ddb4b4077f9b03add1a05147
Andreas Gampe [Tue, 1 Apr 2014 15:08:36 +0000 (15:08 +0000)]
am
8464a64a: Merge "art: Make calling convention immune to SIRT structure change"
* commit '
8464a64a50190c06e95015a932eda9511fa6473d':
art: Make calling convention immune to SIRT structure change
Andreas Gampe [Tue, 1 Apr 2014 14:57:22 +0000 (14:57 +0000)]
Merge "art: Make calling convention immune to SIRT structure change"
Andreas Gampe [Tue, 1 Apr 2014 14:47:29 +0000 (14:47 +0000)]
am
382028d0: Merge "Fix instruction printing for filled-new-array"
* commit '
382028d0c0dfeab66428759c0740921c404b8ed3':
Fix instruction printing for filled-new-array
Bill Buzbee [Tue, 1 Apr 2014 14:47:29 +0000 (14:47 +0000)]
am
d0b86c7e: Merge "Use ResetDef to prevent from removing necessary stores for x86 long-to-fp."
* commit '
d0b86c7ec593a552f726a15e532bb48170fbf487':
Use ResetDef to prevent from removing necessary stores for x86 long-to-fp.
Andreas Gampe [Tue, 1 Apr 2014 14:39:24 +0000 (14:39 +0000)]
Merge "Fix instruction printing for filled-new-array"
Bill Buzbee [Tue, 1 Apr 2014 14:38:36 +0000 (14:38 +0000)]
Merge "Use ResetDef to prevent from removing necessary stores for x86 long-to-fp."
Nicolas Geoffray [Tue, 1 Apr 2014 09:22:05 +0000 (09:22 +0000)]
am
70f9ebf7: Merge "Disable timing sensitive tests on dist builds."
* commit '
70f9ebf7ca95f9d4ab4818849e4fa825b545e192':
Disable timing sensitive tests on dist builds.
Sebastien Hertz [Tue, 1 Apr 2014 09:18:30 +0000 (09:18 +0000)]
am
6c90df9d: Merge "Return correct JDWP type tag for array class"
* commit '
6c90df9d49b29bddc1e3d27ff2698ae1df89d517':
Return correct JDWP type tag for array class
Nicolas Geoffray [Tue, 1 Apr 2014 09:14:51 +0000 (09:14 +0000)]
Merge "Disable timing sensitive tests on dist builds."
Nicolas Geoffray [Tue, 1 Apr 2014 09:08:07 +0000 (09:08 +0000)]
am
e18b0273: Merge "Art script: Use PWD for android-data and cleanup after running."
* commit '
e18b027344e521e1b374d967948c7dd55cc02c8a':
Art script: Use PWD for android-data and cleanup after running.
Andrew Hsieh [Tue, 1 Apr 2014 09:08:06 +0000 (09:08 +0000)]
am
9f3139c0: Merge "Add -lpthread -ldl to link executable/tests"
* commit '
9f3139c0da1006d27c30f2f8f614f653faf14c5f':
Add -lpthread -ldl to link executable/tests
Sebastien Hertz [Tue, 1 Apr 2014 09:07:49 +0000 (09:07 +0000)]
Merge "Return correct JDWP type tag for array class"
Nicolas Geoffray [Tue, 1 Apr 2014 08:28:39 +0000 (08:28 +0000)]
Merge "Art script: Use PWD for android-data and cleanup after running."
Andrew Hsieh [Tue, 1 Apr 2014 08:23:38 +0000 (08:23 +0000)]
Merge "Add -lpthread -ldl to link executable/tests"
Brian Carlstrom [Mon, 31 Mar 2014 21:00:52 +0000 (14:00 -0700)]
Disable timing sensitive tests on dist builds.
Change-Id: I94ebeb5009fac7026bd157a12bdf39e392665a3a
Andrew Hsieh [Tue, 1 Apr 2014 03:52:01 +0000 (11:52 +0800)]
Add -lpthread -ldl to link executable/tests
The new binutils-2.23 based linker in
prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.11-4.6
no longer implicity adds dependencies on *so an executable needs.
eg.
ld -o barrier_test barrier_test.o common_runtime_test.o ... -lartd
produces error messages read
art/runtime/thread-inl.h:43: error: undefined reference to 'pthread_getspecific'
art/runtime/common_runtime_test.h:219: error: undefined reference to 'dlsym'
external/gtest/src/../include/gtest/internal/gtest-port.h:1482: error: undefined reference to 'pthread_getspecific'
because libartd.so DT_NEEDED libdl.so and libpthread.so, and new linker no longer
implicitly add both to dependencies. Explicitly add -lpthread -ldl to fix the issue
Change-Id: Ic29c68480b2ed55d282be949640b9158411f213d
Dmitry Petrochenko [Mon, 31 Mar 2014 02:12:31 +0000 (09:12 +0700)]
art: Make calling convention immune to SIRT structure change
Introduce stack_indirect_reference_table::referencesOffset and
rely on it in calling convention to avoid issues if SIRT structure
change.
Change-Id: Icc0c5c5b1313173df2ee519ab8934183074fdfb6
Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Dave Allison [Tue, 1 Apr 2014 01:17:07 +0000 (01:17 +0000)]
am
81ed34e6: Merge "Implement implicit stack overflow checks"
* commit '
81ed34e686532cebc1e17a273110decf0dd24e81':
Implement implicit stack overflow checks
Andreas Gampe [Tue, 1 Apr 2014 01:10:53 +0000 (18:10 -0700)]
Fix instruction printing for filled-new-array
Only print the registers that are actually used. The rest is
garbage.
Change-Id: Ic9f03a51f81b95f7c70cf3e19122c8980003ae36
Dave Allison [Tue, 1 Apr 2014 01:07:45 +0000 (01:07 +0000)]
Merge "Implement implicit stack overflow checks"
Dave Allison [Thu, 27 Mar 2014 22:10:22 +0000 (15:10 -0700)]
Implement implicit stack overflow checks
This also fixes some failing run tests due to missing
null pointer markers.
The implementation of the implicit stack overflow checks introduces
the ability to have a gap in the stack that is skipped during
stack walk backs. This gap is protected against read/write and
is used to trigger a SIGSEGV at function entry if the stack
will overflow.
Change-Id: I0c3e214c8b87dc250cf886472c6d327b5d58653e
Hiroshi Yamauchi [Mon, 31 Mar 2014 22:14:47 +0000 (15:14 -0700)]
Make the support code for read barriers a bit more general.
Add an option for Baker in addition to Brooks.
Bug:
12687968
Change-Id: I8a31db817ff6686c72951b6534f588228e270b11
Brian Carlstrom [Sun, 30 Mar 2014 23:17:42 +0000 (16:17 -0700)]
No longer restrict to -source 1.5 since it causes a warning with 1.7
(cherry picked from commit
e17838ffedee1796920636c2f99c933aa1ce4b3c)
Change-Id: I25de5bf2f49bcf831a572af799fd718c32c907c5
Mathieu Chartier [Mon, 31 Mar 2014 23:11:41 +0000 (16:11 -0700)]
Fix stack overflow slow path error.
The frame size without spill was being passed into the slow path
instead of the spill size. This was incorrect since only the spills
will have been pushed at the point of the overflow check.
Also addressed an other comment.
Change-Id: Ic6e455122473a8f796b291d71f945bcf72788662
Hiroshi Yamauchi [Mon, 31 Mar 2014 18:44:52 +0000 (18:44 +0000)]
am
cfd5acf2: Merge "Fix a DCHECK failure when causing GC from DDMS."
* commit '
cfd5acf281b0c509f86b13d73c6a8dfa3ea9922c':
Fix a DCHECK failure when causing GC from DDMS.
Hiroshi Yamauchi [Mon, 31 Mar 2014 18:34:45 +0000 (18:34 +0000)]
Merge "Fix a DCHECK failure when causing GC from DDMS."
Vladimir Marko [Mon, 31 Mar 2014 16:47:49 +0000 (16:47 +0000)]
am
9f42a5b8: Merge "Mark ScopedArenaAllocator\'s allocations undefined for Valgrind."
* commit '
9f42a5b81d4e6ff20a588c70f17c21da04c29123':
Mark ScopedArenaAllocator's allocations undefined for Valgrind.
Vladimir Marko [Mon, 31 Mar 2014 16:36:03 +0000 (16:36 +0000)]
Merge "Mark ScopedArenaAllocator's allocations undefined for Valgrind."
Vladimir Marko [Mon, 31 Mar 2014 16:30:55 +0000 (16:30 +0000)]
am
01df0159: Merge "Faster AssembleLIR for ARM."
* commit '
01df0159162fd559af2bcd6f53130096c533fe9c':
Faster AssembleLIR for ARM.
Vladimir Marko [Mon, 31 Mar 2014 16:16:36 +0000 (16:16 +0000)]
Merge "Faster AssembleLIR for ARM."
Vladimir Marko [Mon, 31 Mar 2014 14:32:56 +0000 (15:32 +0100)]
Mark ScopedArenaAllocator's allocations undefined for Valgrind.
Bug:
13659516
Change-Id: Id538c1bb1d256173a1f3db5ae0be920420da6d5d
Vladimir Marko [Tue, 7 Jan 2014 18:21:20 +0000 (18:21 +0000)]
Faster AssembleLIR for ARM.
This also reduces sizeof(LIR) by 4 bytes (32-bit builds).
Change-Id: I0cb81f9bf098dfc50050d5bc705c171af26464ce
Nicolas Geoffray [Mon, 31 Mar 2014 11:29:52 +0000 (11:29 +0000)]
am
7414375a: Merge "Add support for adding two integers in optimizing compiler."
* commit '
7414375acad6170606903013d331f653173c299f':
Add support for adding two integers in optimizing compiler.
Nicolas Geoffray [Mon, 31 Mar 2014 10:44:46 +0000 (10:44 +0000)]
Merge "Add support for adding two integers in optimizing compiler."
Nicolas Geoffray [Fri, 28 Mar 2014 15:43:40 +0000 (15:43 +0000)]
Add support for adding two integers in optimizing compiler.
Change-Id: I5524e193cd07f2692a57c6b4f8069904471b2928
Narayan Kamath [Mon, 31 Mar 2014 10:12:28 +0000 (10:12 +0000)]
am
8732bf96: Merge "Remove use of pthread_cond_timedwait_monotonic."
* commit '
8732bf96433bbc177de509390d285b2d5477c83d':
Remove use of pthread_cond_timedwait_monotonic.
Narayan Kamath [Mon, 31 Mar 2014 10:03:07 +0000 (10:03 +0000)]
Merge "Remove use of pthread_cond_timedwait_monotonic."
Nicolas Geoffray [Mon, 31 Mar 2014 09:27:17 +0000 (09:27 +0000)]
am
7f466c08: Merge "Add support for invoke-static in optimizing compiler."
* commit '
7f466c08888129a9923cb973a4dc73ee4a71574e':
Add support for invoke-static in optimizing compiler.
Nicolas Geoffray [Mon, 31 Mar 2014 09:15:30 +0000 (09:15 +0000)]
Merge "Add support for invoke-static in optimizing compiler."
Sebastien Hertz [Fri, 28 Mar 2014 15:29:41 +0000 (16:29 +0100)]
Return correct JDWP type tag for array class
Uses GetTypeTag function to get JDWP type tag for a class. This fixes the
returned type tag in ClassObjectReference.ReflectedType command.
Bug:
13689172
Change-Id: Ibb9006eb604d84cfb8e279eaeed1982a136d6510
Nicolas Geoffray [Wed, 19 Mar 2014 10:34:11 +0000 (10:34 +0000)]
Add support for invoke-static in optimizing compiler.
Support is limited to calls without parameters and returning
void. For simplicity, we currently follow the Quick ABI.
Change-Id: I54805161141b7eac5959f1cae0dc138dd0b2e8a5
Brian Carlstrom [Sun, 30 Mar 2014 23:44:10 +0000 (23:44 +0000)]
am
dd3c9a0f: Merge "No longer restrict to -source 1.5 since it causes a warning with 1.7"
* commit '
dd3c9a0f4bf07f3347b2ef25e795492abaaaecde':
No longer restrict to -source 1.5 since it causes a warning with 1.7
Brian Carlstrom [Sun, 30 Mar 2014 23:34:51 +0000 (23:34 +0000)]
Merge "No longer restrict to -source 1.5 since it causes a warning with 1.7"
Brian Carlstrom [Sun, 30 Mar 2014 23:17:42 +0000 (16:17 -0700)]
No longer restrict to -source 1.5 since it causes a warning with 1.7
(cherry picked from commit
e17838ffedee1796920636c2f99c933aa1ce4b3c)
Change-Id: Ied11738da9621280185a62f267a5d527e6ed927b
Chao-ying Fu [Sat, 29 Mar 2014 01:14:36 +0000 (18:14 -0700)]
Use ResetDef to prevent from removing necessary stores for x86 long-to-fp.
X86 long-to-fp needs the source operand in the memory.
Later on, NullifyRange may remove the stores and then lead to incorrect
long-to-fp conversions.
To fix this bug, ResetDef is called after flushing source to the memory
for x86 long-to-fp.
Change-Id: I3510739294dc2e5ffb3d76d7651880fae63f2382
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Mathieu Chartier [Fri, 28 Mar 2014 23:46:21 +0000 (23:46 +0000)]
am
3f96751d: Merge "Fix non concurrent mark sweep ergonomics."
* commit '
3f96751de2de942570d321a7435815804a0dbf6a':
Fix non concurrent mark sweep ergonomics.
Mathieu Chartier [Fri, 28 Mar 2014 23:34:51 +0000 (23:34 +0000)]
Merge "Fix non concurrent mark sweep ergonomics."
Mathieu Chartier [Fri, 28 Mar 2014 23:22:20 +0000 (16:22 -0700)]
Fix non concurrent mark sweep ergonomics.
Previously we would continue to do sticky GC until the sticky GC did
not free enough memory for the allocation, this was excessive since it
could do one sticky GC per allocation. The new logic uses the next GC
type before trying all the GCs in the plan.
Before memalloc benchmark (non concurrent mark sweep):
Total time spent in GC: 11.212701s
Score: 7790
After:
Total time spent in GC: 9.422676s
Score: 6870
Change-Id: Iba75b70ea825ef3fd4b3e064d4f12c2fe5a3b176
Jeff Hao [Fri, 28 Mar 2014 23:13:29 +0000 (23:13 +0000)]
am
11a8497d: Merge "Some fixes for comments and implied conversions."
* commit '
11a8497d17af1cd11450d6ee9851a116c9389c37':
Some fixes for comments and implied conversions.
Mathieu Chartier [Fri, 28 Mar 2014 23:10:04 +0000 (23:10 +0000)]
am
17b3fb82: Merge "Swap allocation stacks in pause."
* commit '
17b3fb82db845bae4713ca9cbe2f0c9a2dd2abc2':
Swap allocation stacks in pause.
Jeff Hao [Fri, 28 Mar 2014 23:05:48 +0000 (23:05 +0000)]
am
e759c9f0: Merge "Add access checks to Method and Field reflection."
* commit '
e759c9f01b558093466fc78f01900042120cd832':
Add access checks to Method and Field reflection.
Jeff Hao [Fri, 28 Mar 2014 23:03:21 +0000 (23:03 +0000)]
Merge "Some fixes for comments and implied conversions."
Jeff Hao [Fri, 28 Mar 2014 22:43:37 +0000 (15:43 -0700)]
Some fixes for comments and implied conversions.
Addresses comments in:
https://android-review.googlesource.com/#/c/89148/3
Change-Id: If21cfaa541210c8702371efd1e6d4f071a7b9ec3
Hiroshi Yamauchi [Fri, 28 Mar 2014 22:26:48 +0000 (15:26 -0700)]
Fix a DCHECK failure when causing GC from DDMS.
Bug:
13647069
Change-Id: Iae2746b2b7b4493fcf5f0d40d2bf36a9b2d2efc8
Mathieu Chartier [Fri, 28 Mar 2014 22:20:25 +0000 (22:20 +0000)]
Merge "Swap allocation stacks in pause."