OSDN Git Service
Andreas Gampe [Sun, 27 Jul 2014 01:43:52 +0000 (01:43 +0000)]
am
b97df048: Merge "ART: Native bridge command-line parameter"
* commit '
b97df0488b5391564b5ea195a0765c943787f88d':
ART: Native bridge command-line parameter
Andreas Gampe [Sun, 27 Jul 2014 01:39:57 +0000 (01:39 +0000)]
am
22e59fd2: ART: Allow arrays with erroneous component type
* commit '
22e59fd2861a4aab16adb2b80a1d5166382a6617':
ART: Allow arrays with erroneous component type
Andreas Gampe [Sun, 27 Jul 2014 01:38:09 +0000 (01:38 +0000)]
am
0db2c431: Merge "ART: Allow arrays with erroneous component type"
* commit '
0db2c431a3971781a52629be62f572cc5b0d35df':
ART: Allow arrays with erroneous component type
Andreas Gampe [Thu, 24 Jul 2014 03:18:36 +0000 (20:18 -0700)]
ART: Allow arrays with erroneous component type
Array classes must tolerate having component type classes that are
erroneous. Change CreateArrayClass to use LookupClass when FindClass
failed.
Bug:
16019155
(cherry picked from commit
dc13d7df5da49e93963035633a82699c68fa0971)
Change-Id: I506250949a1802898433e9099dcb8ef31dd89659
Andreas Gampe [Sat, 26 Jul 2014 20:06:46 +0000 (20:06 +0000)]
am
0237ac84: ART: Special-case cb(n)z even for in-reg constant
* commit '
0237ac84b1459cb1718dce23f3572ae2fe1bd77e':
ART: Special-case cb(n)z even for in-reg constant
Andreas Gampe [Sat, 26 Jul 2014 20:05:21 +0000 (20:05 +0000)]
am
c4a5f588: Merge "ART: Special-case cb(n)z even for in-reg constant"
* commit '
c4a5f588c5c17ae226b56d25539ea4672f0ea9a3':
ART: Special-case cb(n)z even for in-reg constant
Andreas Gampe [Sat, 26 Jul 2014 08:40:39 +0000 (01:40 -0700)]
ART: Special-case cb(n)z even for in-reg constant
Call out to OpCmpImmBranch in GenCompareAndBranch if the constant
is zero and we are testing == or !=, even when zero has been loaded
to a register already. This avoids a register size mismatch on 64b
architectures when basically doing a null check, and generally
squashes a cmp + branch to a cbz or cbnz on Arm and Mips. X86 is
not degraded.
Bug:
16562601
(cherry picked from commit
b07c1f9f4d6088ca2d4c1a10819e57b19acf7f22)
Change-Id: I42701e827feb848470aa991297755d808fa0a077
Andreas Gampe [Sat, 26 Jul 2014 13:14:46 +0000 (13:14 +0000)]
am
9646172b: Merge "ART: Rewrite ParallelGC run-test"
* commit '
9646172b4e04f981a3b1cd3af0e8c9e8a610bfd1':
ART: Rewrite ParallelGC run-test
Andreas Gampe [Sat, 26 Jul 2014 13:14:45 +0000 (13:14 +0000)]
am
ff9d95d5: Merge "Tweaks to patchoat and other related things."
* commit '
ff9d95d58ea9c36d26b96f52c9a7ac4bf92fed2d':
Tweaks to patchoat and other related things.
Andreas Gampe [Sat, 26 Jul 2014 04:18:01 +0000 (04:18 +0000)]
am
f071e86c: Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev
* commit '
f071e86c901a230f55e76bc6b55e19cca16a74cb':
ART: Use array-inl.h in reference_table_test
Andreas Gampe [Fri, 25 Jul 2014 23:50:07 +0000 (23:50 +0000)]
am
3bcac48f: Merge "ART: Fix run-test 114 ParallelGC to account for OOM"
* commit '
3bcac48f23094fa0f46315a080ec47fc368fd4c2':
ART: Fix run-test 114 ParallelGC to account for OOM
Andreas Gampe [Fri, 25 Jul 2014 23:04:22 +0000 (23:04 +0000)]
am
698d79d1: ART: Clean up API after change 102631
* commit '
698d79d1e3f348102deaa03b5e0fc23641107239':
ART: Clean up API after change 102631
Andreas Gampe [Fri, 25 Jul 2014 23:04:03 +0000 (23:04 +0000)]
am
4dd37adc: Merge "ART: Clean up API after change 102631"
* commit '
4dd37adcf68a72758236ca770272a5597cd84767':
ART: Clean up API after change 102631
Andreas Gampe [Fri, 25 Jul 2014 20:36:56 +0000 (13:36 -0700)]
ART: Clean up API after change 102631
This adds an abort_on_error parameter to GetCurrentMethod, which is
by default true. This restores all previous behavior, except for
monitor installation, where it follows 101639.
Bug:
16556938
(cherry picked from commit
6ec8ebd178ed39aa09e4c7fad194900114c4121a)
Change-Id: I2dee19d30674f2ffda33b3dc963e12470f39edb9
Andreas Gampe [Sun, 27 Jul 2014 01:31:16 +0000 (01:31 +0000)]
Merge "ART: Allow arrays with erroneous component type"
Andreas Gampe [Thu, 24 Jul 2014 03:18:36 +0000 (20:18 -0700)]
ART: Allow arrays with erroneous component type
Array classes must tolerate having component type classes that are
erroneous. Change CreateArrayClass to use LookupClass when FindClass
failed.
Bug:
16019155
Change-Id: Id4868c5498431c85c199aa3cbecd23566dce3601
Andreas Gampe [Sat, 26 Jul 2014 19:57:14 +0000 (19:57 +0000)]
Merge "ART: Special-case cb(n)z even for in-reg constant"
Andreas Gampe [Sat, 26 Jul 2014 08:40:39 +0000 (01:40 -0700)]
ART: Special-case cb(n)z even for in-reg constant
Call out to OpCmpImmBranch in GenCompareAndBranch if the constant
is zero and we are testing == or !=, even when zero has been loaded
to a register already. This avoids a register size mismatch on 64b
architectures when basically doing a null check, and generally
squashes a cmp + branch to a cbz or cbnz on Arm and Mips. X86 is
not degraded.
Bug:
16562601
Change-Id: I1997760f43dc186a84247ad30ae91053f71d102d
Mathieu Chartier [Fri, 25 Jul 2014 19:39:37 +0000 (19:39 +0000)]
am
9c81c0cb: Merge "Fix main space memory leak and add checks."
* commit '
9c81c0cb0dc8c8d8ae5dca3d2d82b0eec7af589f':
Fix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 19:19:15 +0000 (19:19 +0000)]
am
b2ac1ab4: Fix main space memory leak and add checks.
* commit '
b2ac1ab47f84bd989fb2c94a532f5dc7d177ebe4':
Fix main space memory leak and add checks.
Mathieu Chartier [Fri, 25 Jul 2014 19:19:04 +0000 (19:19 +0000)]
am
5d790444: Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev
* commit '
5d79044420e2cb03c0cd27c47f834943983aeb4b':
Fix dangling pointer bug when transitioning to background.
Will Leshner [Fri, 25 Jul 2014 19:12:13 +0000 (19:12 +0000)]
Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/art into lmp-dev-plus-aosp
Mathieu Chartier [Fri, 25 Jul 2014 19:02:23 +0000 (19:02 +0000)]
am
d190d989: Merge "Fix dangling pointer bug when transitioning to background."
* commit '
d190d989ac92d2a5b9a342692564f40bd2080895':
Fix dangling pointer bug when transitioning to background.
Stephen Hines [Fri, 25 Jul 2014 18:57:53 +0000 (18:57 +0000)]
am
3847d663: Merge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev
* commit '
3847d66393a9b14ae9b896543780dc02c038d3fa':
Increase limit to 2600 on host clang builds for frame size.
Mathieu Chartier [Fri, 25 Jul 2014 18:50:47 +0000 (11:50 -0700)]
Fix main space memory leak and add checks.
The hypothesis is that we were leaking the main space and its
bitmaps, then eventually we would run out of virtual address space,
which would cause a null bitmap (DCHECK). Finally when we tried
adding the space with a null bitmap to the heap bitmap it segfaulted.
Changed some non performance critical DCHECK -> CHECK.
Bug:
16563323
(cherry picked from commit
2796a1669ae0f3b96db8432fbd8be1b93bf335c4)
Change-Id: Ifa9d866c6c89eff22a547af4db70bc79a77690ed
Stephen Hines [Fri, 25 Jul 2014 18:53:48 +0000 (11:53 -0700)]
resolved conflicts for merge of
76fb6019 to lmp-dev-plus-aosp
Change-Id: Ifc9f9fa95dda1dbe60b3be35ef30d2ca707c72d5
Stephen Hines [Fri, 25 Jul 2014 18:50:20 +0000 (18:50 +0000)]
am
bacabce9: Merge "Add back a deleted check related to verification." into lmp-dev
* commit '
bacabce9abe54e67192f835ebd4e013728a2121e':
Add back a deleted check related to verification.
Mathieu Chartier [Fri, 25 Jul 2014 19:06:45 +0000 (19:06 +0000)]
Merge "Fix main space memory leak and add checks."
Mathieu Chartier [Fri, 25 Jul 2014 18:50:47 +0000 (11:50 -0700)]
Fix main space memory leak and add checks.
The hypothesis is that we were leaking the main space and its
bitmaps, then eventually we would run out of virtual address space,
which would cause a null bitmap (DCHECK). Finally when we tried
adding the space with a null bitmap to the heap bitmap it segfaulted.
Changed some non performance critical DCHECK -> CHECK.
Bug:
16563323
Change-Id: I08a1f873752e28ebcf63ebbd90f92d994d7ca96b
Mathieu Chartier [Fri, 25 Jul 2014 18:42:53 +0000 (18:42 +0000)]
Merge "Fix dangling pointer bug when transitioning to background."
Mathieu Chartier [Fri, 25 Jul 2014 17:13:51 +0000 (10:13 -0700)]
Fix dangling pointer bug when transitioning to background.
Dangling pointer left behind from the old rosalloc / dlmalloc
spaces. We now avoid using this pointer by using main_space_
and non_moving_space_ as well as clear the pointer when we remove
the space.
Bug:
16567203
Change-Id: Ida9ff30783e89cd4a4d86a4d0e912701692101f1
Mathieu Chartier [Fri, 25 Jul 2014 18:50:34 +0000 (18:50 +0000)]
Merge "Fix dangling pointer bug when transitioning to background." into lmp-dev
Mathieu Chartier [Fri, 25 Jul 2014 17:13:51 +0000 (10:13 -0700)]
Fix dangling pointer bug when transitioning to background.
Dangling pointer left behind from the old rosalloc / dlmalloc
spaces. We now avoid using this pointer by using main_space_
and non_moving_space_ as well as clear the pointer when we remove
the space.
Bug:
16567203
(cherry picked from commit
00b5915828f89daaefd9e8fb215658360f76762c)
Change-Id: I5962929e4a0bb4db6f531d25ee322da7ab3f5dd4
Stephen Hines [Fri, 25 Jul 2014 18:48:31 +0000 (18:48 +0000)]
Merge "resolved conflicts for merge of
9ef2ec9b to lmp-dev-plus-aosp" into lmp-dev-plus-aosp
Vladimir Marko [Fri, 25 Jul 2014 18:45:05 +0000 (18:45 +0000)]
am
9fbe946f: Merge "Fix JNI compiler frame size adjustments."
* commit '
9fbe946f49724ff7ae30da5d366a002d1e6addfa':
Fix JNI compiler frame size adjustments.
Narayan Kamath [Fri, 25 Jul 2014 18:45:04 +0000 (18:45 +0000)]
am
1ad334e6: Merge "Rename openDexFileNative to openDexFile."
* commit '
1ad334e6519c274b504c4d5d222c8e40920d02ee':
Rename openDexFileNative to openDexFile.
Nicolas Geoffray [Fri, 25 Jul 2014 18:45:03 +0000 (18:45 +0000)]
am
86507ed4: Merge "Add a new stack map scheme that encodes compilation info per pc."
* commit '
86507ed48af6046ee9e5bc84daeb795fc8acc3bf':
Add a new stack map scheme that encodes compilation info per pc.
Andreas Gampe [Fri, 25 Jul 2014 18:45:00 +0000 (18:45 +0000)]
am
e2f654a4: Merge "ART: Fix wrong CHECK in GetCurrentLocationForThrow"
* commit '
e2f654a463976f811c5358fc0de68c0492601274':
ART: Fix wrong CHECK in GetCurrentLocationForThrow
Andreas Gampe [Fri, 25 Jul 2014 18:44:59 +0000 (18:44 +0000)]
am
b7563b64: Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars"
* commit '
b7563b641059bcff82eb4624edb806a7ce7f39c0':
ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars
Stephen Hines [Fri, 25 Jul 2014 18:44:37 +0000 (11:44 -0700)]
resolved conflicts for merge of
9ef2ec9b to lmp-dev-plus-aosp
Change-Id: I22a24179518bf5de94a22b21cb4c86fce3e012e6
Andreas Gampe [Fri, 25 Jul 2014 18:38:28 +0000 (11:38 -0700)]
resolved conflicts for merge of
307f6508 to lmp-dev-plus-aosp
Change-Id: If49761765f3346993fb67068e79dad65e161c6a5
Vladimir Marko [Fri, 25 Jul 2014 15:51:39 +0000 (15:51 +0000)]
am
ee2d1ada: Fix JNI compiler frame size adjustments.
* commit '
ee2d1ada2b9d0400e56c63656f9abfbccc880377':
Fix JNI compiler frame size adjustments.
Vladimir Marko [Thu, 24 Jul 2014 16:01:58 +0000 (17:01 +0100)]
Fix JNI compiler frame size adjustments.
Bug:
16321952
(cherry picked from
4e24b9da7c5ea6e517ecdbc09aa14a0995100b7e)
Change-Id: I486b7ad7ebefc7db9b56fe92809ef495c316292b
Andreas Gampe [Fri, 25 Jul 2014 12:41:18 +0000 (12:41 +0000)]
am
195bb33e: Merge "ART: Account for multidex location strings in VMClassLoader"
* commit '
195bb33e08f262bde1e4367f14690f8328653ab6':
ART: Account for multidex location strings in VMClassLoader
Andreas Gampe [Fri, 25 Jul 2014 12:25:59 +0000 (12:25 +0000)]
am
6d5e82f7: ART: Fix wrong CHECK in GetCurrentLocationForThrow
* commit '
6d5e82f78d7b121a33f935521e0a7f5335cab213':
ART: Fix wrong CHECK in GetCurrentLocationForThrow
Andreas Gampe [Fri, 25 Jul 2014 12:25:58 +0000 (12:25 +0000)]
am
b3ec51e6: ART: Relax CurrentMethodVisitor requirements on GetDexPC
* commit '
b3ec51e63c5041f77389ee001b47a8897b2a7acc':
ART: Relax CurrentMethodVisitor requirements on GetDexPC
Andreas Gampe [Fri, 25 Jul 2014 12:25:53 +0000 (12:25 +0000)]
am
9157c0ca: ART: Account for multidex location strings in VMClassLoader
* commit '
9157c0ca6a57fa9f6378aebcfb2e3ff76622499a':
ART: Account for multidex location strings in VMClassLoader
Andreas Gampe [Fri, 25 Jul 2014 10:07:06 +0000 (03:07 -0700)]
ART: Fix wrong CHECK in GetCurrentLocationForThrow
Under certain circumstances kDexNoIndex is actually an encoded
dex pc. Change the setup of CurrentMethodVisitor to account for that.
Bug:
16556938
(cherry picked from commit
f9df5c1639a9418fcdf70476556a4c30b210701e)
Change-Id: Icb1d42ccd22296e2e0c629ebbd7e4d8c7d87f07a
Andreas Gampe [Thu, 17 Jul 2014 05:20:31 +0000 (22:20 -0700)]
ART: Relax CurrentMethodVisitor requirements on GetDexPC
In case we want to dump a Java stack after an unhandled fault, in
case we hold a thinlocked monitor, that monitor might get inflated.
That can cause an abort as we may not have enough/correct information
for the state at the bottom-most call.
Relax GetDexPc in the CurrentMethodVisitor to not abort when it cannot
find a dex pc. Instead, let the caller handle such a case. This CL
allows the locking_dex_pc_ in Monitor to be DexFile::kDexNoIndex,
which avoids the above abort.
Bug:
16352802,
16556938
(cherry picked from commit
4a8c3fa4bd8d95fac5671ab778dd00b6dc3ec0e4)
Change-Id: I60d3d89603de65752d9230ceac6abb0242388c18
Andreas Gampe [Thu, 24 Jul 2014 22:35:50 +0000 (15:35 -0700)]
ART: Account for multidex location strings in VMClassLoader
To look up resources, look in the unadorned location.
Bug:
16530747
(cherry picked from commit
cb8f9e8a2941971c049b26745ea713c859342d9b)
Change-Id: I5dce30c5e3c9f38fb5436c43a3f4a51fe4062c24
Andreas Gampe [Fri, 25 Jul 2014 04:09:24 +0000 (04:09 +0000)]
am
4857b868: Merge "Integrate ART with NativeBridge interfaces"
* commit '
4857b868f7d5941255afc847c07f49ae496d0e1c':
Integrate ART with NativeBridge interfaces
Mathieu Chartier [Thu, 24 Jul 2014 23:33:21 +0000 (23:33 +0000)]
am
c0dcf291: Fix stale remembered sets error.
* commit '
c0dcf29143051cf34d6c032a7b385ac4579bd4ec':
Fix stale remembered sets error.
Sebastien Hertz [Thu, 24 Jul 2014 23:30:54 +0000 (23:30 +0000)]
am
5dc158e9: Fix access to long/double stack values from debugger
* commit '
5dc158e9b6635b6c5d3916ae4094e8886feb4580':
Fix access to long/double stack values from debugger
Stephen Hines [Fri, 25 Jul 2014 17:27:58 +0000 (17:27 +0000)]
Merge "Remove errors/warnings from tautological comparisons." into lmp-dev
Stephen Hines [Wed, 16 Jul 2014 04:41:06 +0000 (21:41 -0700)]
Remove errors/warnings from tautological comparisons.
Change-Id: I2728b08d55abccd14c111c6c9da93068d4e14275
Andreas Gampe [Sun, 27 Jul 2014 01:36:55 +0000 (01:36 +0000)]
Merge "ART: Native bridge command-line parameter"
Andreas Gampe [Fri, 25 Jul 2014 09:32:19 +0000 (02:32 -0700)]
ART: Native bridge command-line parameter
Add a command-line parameter for the native bridge library, slight
refactor/cleanup.
Add run-test 115 to test the native bridge interface. Currently the
tests are black-listed for the target, as the setup for the test
is too complicated in the current infrastructure.
Change-Id: I6ccf19485e8c30b96e9f2fd5425278cb1ebd403f
Andreas Gampe [Fri, 25 Jul 2014 04:01:32 +0000 (04:01 +0000)]
Merge "Integrate ART with NativeBridge interfaces"
Yong WU [Thu, 24 Jul 2014 13:32:15 +0000 (21:32 +0800)]
Integrate ART with NativeBridge interfaces
Native-bridge will provide the following interfaces to ART:
struct NativeBridgeCallbacks {
bool (*initialize )(NativeBridgeArtCallbacks* vm_itf);
void* (*loadLibrary )(const char* libpath, int flag);
void* (*getTrampoline)(void* handle, const char* name, const char* shorty,
uint32_t len);
bool (*isSupported )(const char* libpath);
};
Native-bridge will expose a symbol NativeBridgeItf with the
type of NativeBridgeCallbacks to ART.
And ART will provide the interfaces below to native-bridge:
struct NativeBridgeArtCallbacks {
int (*logger )(int prio, const char* tag, const char* fmt, ...);
const char* (*getMethodShorty)(JNIEnv* env, jmethodID mid);
int (*getNativeMethodCount )(JNIEnv* env, jclass clazz);
int (*getNativeMethods )(JNIEnv* env, jclass clazz, JNINativeMethod* methods,
uint32_t method_count);
};
Based on the interfaces, if an ART call to dlopen fails to open a native library,
it queries the native bridge by using NativeBridgeCallbacks::isSupported(). If the
native library is supported by native-bridge, ART can load the native library
using NativeBridgeCallbacks::loadLibrary() and get a trampoline for a specific
native method using NativeBridgeCallbacks::getTrampoline(). ART can then call
the native method using the normal signature and the address of the trampoline.
On the other side, in the case of a native method calling JNI native function
CallXXXXMethodY(), native-bridge calls back to Art for the shorty of the method
using NativeBridgeArtCallbacks::getMethodShorty() so that it can prepare based
on host calling convention.
In case of JNI function RegisterNatives()/UnregisterNatives(), native bridge can
call back to NativeBridgeArtCallbacks::getNativeMethodCount() and NativeBridgeArtCallbacks
::getNativeMethods() to get all native methods of specified class so that all
corresponding trampolines can be prepared/destroyed.
Class NativeBridge is created to encapsulate the function pointers of
NativeBridgeCallbacks and provides better abstraction to ART.
Note: functionality is turned off in native_bridge.cc at the moment.
Change-Id: I652755044957a7960254648652b538cce70dd011
Mathieu Chartier [Thu, 24 Jul 2014 20:55:16 +0000 (20:55 +0000)]
am
54f3c041: Merge "Fix memory leak in RemoveRememberedSet."
* commit '
54f3c041365647fc79260b65e70b4290d0b50f1c':
Fix memory leak in RemoveRememberedSet.
Stephen Hines [Fri, 25 Jul 2014 17:28:14 +0000 (17:28 +0000)]
Merge "Increase limit to 2600 on host clang builds for frame size." into lmp-dev
Stephen Hines [Thu, 24 Jul 2014 02:47:35 +0000 (19:47 -0700)]
Increase limit to 2600 on host clang builds for frame size.
Change-Id: I573e1bcdc7a935145e88077def9c90a5573d2e90
Stephen Hines [Thu, 17 Jul 2014 08:49:18 +0000 (01:49 -0700)]
Update frame-larger-than limit to 2440 for new clang.
Bug:
16362912
The latest version of clang is generating larger frames on elf_writer_quick.cc
and dex2oat.cc than we had previously encountered. This change unblocks the
LLVM rebase temporarily.
Change-Id: I20d9f88959b91e0509e58f01c22532720225f44d
Stephen Hines [Wed, 16 Jul 2014 18:03:43 +0000 (11:03 -0700)]
Add back a deleted check related to verification.
Change-Id: Ib939d1a7395a4b6cc9a7256cfb0a3498ba296744
Stephen Hines [Fri, 25 Jul 2014 17:28:09 +0000 (17:28 +0000)]
Merge "Update frame-larger-than limit to 2440 for new clang." into lmp-dev
Stephen Hines [Fri, 25 Jul 2014 17:28:04 +0000 (17:28 +0000)]
Merge "Add back a deleted check related to verification." into lmp-dev
Andreas Gampe [Thu, 24 Jul 2014 19:38:06 +0000 (12:38 -0700)]
resolved conflicts for merge of
bebee4fd to lmp-dev-plus-aosp
Andreas Gampe [Thu, 24 Jul 2014 19:23:46 +0000 (19:23 +0000)]
am
d68168e9: Merge "ART: Do not attempt to compile a method with too many registers" into lmp-dev
* commit '
d68168e9f0c416a3ef29d9b9504ae436fa482c44':
ART: Do not attempt to compile a method with too many registers
Andreas Gampe [Thu, 24 Jul 2014 19:23:44 +0000 (19:23 +0000)]
am
1f710373: Merge "ART: Check high part of dalvik register pairs on put-wide" into lmp-dev
* commit '
1f7103731d5a13925fbb6730d4f65d2a314c9e6d':
ART: Check high part of dalvik register pairs on put-wide
Andreas Gampe [Thu, 24 Jul 2014 19:23:44 +0000 (19:23 +0000)]
am
0f45f22e: (-s ours) ART: Throw StackOverflowError in native code
* commit '
0f45f22eb3c52f0ece4c56989180e79c6680d825':
ART: Throw StackOverflowError in native code
Mathieu Chartier [Thu, 24 Jul 2014 18:27:04 +0000 (11:27 -0700)]
resolved conflicts for merge of
7521704f to lmp-dev-plus-aosp
Change-Id: Id4fe1e4c222c79a9b743e267ddca407976295248
Mathieu Chartier [Thu, 24 Jul 2014 01:45:17 +0000 (18:45 -0700)]
Fix stale remembered sets error.
We were forgetting to remove the remembered set in transition to
background. This resulted in remembered sets being added for
spaces which no longer existed. This finally caused an error when
a new space happened to have the same address as the old space,
resulting in a CHECK failure.
Also tuned the number of ParallelGC to prevent spurrious failures
and removed the ParallelGC from broken tests in the make file.
Bug:
16532086
Bug:
16406852
Change-Id: I00bbcbd7daa03c867732d165be62b72e6c43bce1
(cherry picked from
c5a8347ac491a5f521945d3835a322123830456b)
Andreas Gampe [Sat, 26 Jul 2014 04:08:40 +0000 (04:08 +0000)]
Merge "ART: Use array-inl.h in reference_table_test" into lmp-dev
Andreas Gampe [Thu, 17 Jul 2014 21:52:06 +0000 (14:52 -0700)]
ART: Use array-inl.h in reference_table_test
The test allocates arrays, which is an inline definition.
(cherry picked from commit
8db4c882a8d1996852163ebec966c8b4eb1e00df)
Change-Id: I1423c5419949d7c352ed0e614d4f9c5920831deb
Sebastien Hertz [Thu, 24 Jul 2014 12:56:31 +0000 (12:56 +0000)]
am
ca928ba8: Merge "Fix access to long/double stack values from debugger"
* commit '
ca928ba8b9e109ced2b9d72622dc34bda63ac211':
Fix access to long/double stack values from debugger
Sebastien Hertz [Wed, 16 Jul 2014 09:56:07 +0000 (11:56 +0200)]
Fix access to long/double stack values from debugger
Long and double values live in a pair of DEX registers. When we compile DEX
code with the Quick compiler, a DEX register either lives in the stack or is
promoted to a physical register. In the case of a pair of DEX registers, the
Quick compiler assumes both registers live in the same "area": both live in
the stack or both are promoted to physical registers.
From the debugger, we used to access these values by reading/writing each DEX
register separately. However, this does not work when only one DEX register of
a pair is promoted and the other lives in the stack. In this case, the compiled
code reads from/writes to the stack only.
To fix that, the debugger must follow the same rule than the Quick compiler: if
both DEX registers are promoted, read/write them from/to physical registers,
otherwise read/write them from/to the stack. We add StackVisitor:GetVRegPair and
StackVisitor:SetVRegPair for this purpose.
We also follow the same rule when deoptimizing. However we need to do that only
when we know two consecutive DEX registers are part of a pair (long or double).
We know that thanks to the verifier.
Bug:
15527793
(cherry picked from commit
c901dd7bdc80b953d04100ef2f54b8d1ca5f466b)
Change-Id: I981e088295254d75352f83a3e6ba0b292cfe3ed3
Stephen Hines [Thu, 24 Jul 2014 02:57:47 +0000 (02:57 +0000)]
am
3017527b: Merge "Increase limit to 2600 on host clang builds for frame size."
* commit '
3017527bf4ceced296b8885426b86ac939ab755f':
Increase limit to 2600 on host clang builds for frame size.
Stephen Hines [Thu, 24 Jul 2014 02:25:06 +0000 (02:25 +0000)]
am
7f9c8f7b: Merge "Update frame-larger-than limit to 2440 for new clang."
* commit '
7f9c8f7b6ce6c936d234771d2a4103a13850c422':
Update frame-larger-than limit to 2440 for new clang.
Mathieu Chartier [Thu, 24 Jul 2014 01:41:42 +0000 (01:41 +0000)]
am
488deba5: Merge "Reduce allocations in ParallelGC test."
* commit '
488deba5896104cfba15d5fe44ff618c59c6456f':
Reduce allocations in ParallelGC test.
Nicolas Geoffray [Wed, 23 Jul 2014 23:57:45 +0000 (23:57 +0000)]
am
cfd31c5e: Merge "Use a (somewhat) more documented environment variable."
* commit '
cfd31c5e266d1aecc66278fdea46e88e323a181d':
Use a (somewhat) more documented environment variable.
Andreas Gampe [Fri, 25 Jul 2014 22:37:09 +0000 (22:37 +0000)]
Merge "ART: Clean up API after change 102631"
Andreas Gampe [Fri, 25 Jul 2014 20:36:56 +0000 (13:36 -0700)]
ART: Clean up API after change 102631
This adds an abort_on_error parameter to GetCurrentMethod, which is
by default true. This restores all previous behavior, except for
monitor installation, where it follows 101639.
Bug:
16556938
Change-Id: I9a12b9a21ccb9f558c86236bb58d15ff2fafaec0
Andreas Gampe [Fri, 25 Jul 2014 09:38:04 +0000 (09:38 +0000)]
Merge "ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars"
Andreas Gampe [Fri, 25 Jul 2014 04:41:06 +0000 (21:41 -0700)]
ART: Turn on ART_TEST_KEEP_GOING by default, clean up unused vars
Change-Id: I8db60eade0338e53e76a87ef38ad661550475e3c
Andreas Gampe [Fri, 25 Jul 2014 08:46:44 +0000 (08:46 +0000)]
Merge "ART: Account for multidex location strings in VMClassLoader"
Andreas Gampe [Thu, 24 Jul 2014 22:35:50 +0000 (15:35 -0700)]
ART: Account for multidex location strings in VMClassLoader
To look up resources, look in the unadorned location.
Bug:
16530747
Change-Id: Ia97e39366444f6666a78ade7298d3c22b4b79f8a
Andreas Gampe [Wed, 16 Jul 2014 06:02:11 +0000 (23:02 -0700)]
ART: Refactor GenSelect, refactor gen_common accordingly
This adds a GenSelect method meant for selection of constants. The
general-purpose GenInstanceof code is refactored to take advantage of
this. This cleans up code and squashes a branch-over on ARM64 to a
cset.
Also add a slow-path for type initialization in GenInstanceof.
Bug:
16241558
(cherry picked from commit
90969af6deb19b1dbe356d62fe68d8f5698d3d8f)
Change-Id: Ie4494858bb8c26d386cf2e628172b81bba911ae5
Andreas Gampe [Wed, 23 Jul 2014 22:14:28 +0000 (22:14 +0000)]
am
75c99e9d: Merge "x86: GenSelect utility update"
* commit '
75c99e9dd8512a44d97d9818a74a69065ad82df0':
x86: GenSelect utility update
Andreas Gampe [Mon, 14 Jul 2014 23:21:44 +0000 (16:21 -0700)]
ART: Throw StackOverflowError in native code
Initialize stack-overflow errors in native code to be able to reduce
the preserved area size of the stack.
Includes a refactoring away from constexpr in instruction_set.h to allow
for easy changing of the values.
Bug:
16256184
(cherry picked from commit
7ea6f79bbddd69d5db86a8656a31aaaf64ae2582)
Change-Id: I117cc8485f43da5f0a470f0f5e5b3dc3b5a06246
Mathieu Chartier [Wed, 23 Jul 2014 21:28:26 +0000 (14:28 -0700)]
resolved conflicts for merge of
38c488bc to lmp-dev-plus-aosp
Change-Id: If8fbbd51232fd01a481cb47df426de169c0c830c
Mathieu Chartier [Wed, 16 Jul 2014 20:28:58 +0000 (13:28 -0700)]
Recycle mem-maps for collector transitions.
We now create spaces when we need them for collector transitions or
homogeneous compaction by recycling mem maps. Change the bump
pointer space size to be as large as the heap capacity instead of
1/2 heap capacity like it used to be. For GSS, bump pointer spaces
are set to 32MB currently.
Changed GSS to have main space == non moving space since we don't
need to copy from the main space.
Fixes GC stress tests 074, 096.
Fixed test 080 oom throw with -Xmx2m for GC stress test, this was
broken since it was allocating a 4 MB array before starting the
OOM process.
Bug:
14059466
Bug:
16406852
(cherry picked from commit
b363f666883860d40823d5528df3c98c897f74f4)
Change-Id: I62877cfa24ec944a6f34ffac30334f454a8002fd
Jeff Hao [Wed, 23 Jul 2014 20:47:59 +0000 (20:47 +0000)]
am
0346b6be: Merge "Fix run-test --trace option if --host is specified after."
* commit '
0346b6bef939517b45216ee0eff4cf7a0c0667f4':
Fix run-test --trace option if --host is specified after.
Mathieu Chartier [Wed, 23 Jul 2014 20:24:12 +0000 (20:24 +0000)]
am
b76cac63: Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
* commit '
b76cac637691c29daa9c44e493b5bc26346ed116':
Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
Mathieu Chartier [Wed, 23 Jul 2014 20:02:30 +0000 (13:02 -0700)]
Revert "Revert "Disable adding main and non moving spaces to immune region in GSS""
This reverts commit
f85c2fb317399ab540854cd7551ac47690366543.
Narayan Kamath [Fri, 25 Jul 2014 14:26:26 +0000 (14:26 +0000)]
Merge "Rename openDexFileNative to openDexFile."
Calin Juravle [Wed, 16 Jul 2014 16:55:55 +0000 (17:55 +0100)]
Rename openDexFileNative to openDexFile.
We no longer need two distinct methods.
Bug:
15563230
(cherry picked from commit
8edcb9c8bc62fcbd181e136c32086f2b970306a4)
Change-Id: Ib95098af0dd26733b5946d8e24ae4dfbcdbec3ba
Nicolas Geoffray [Wed, 23 Jul 2014 23:49:26 +0000 (23:49 +0000)]
Merge "Use a (somewhat) more documented environment variable."
Nicolas Geoffray [Wed, 23 Jul 2014 23:36:48 +0000 (00:36 +0100)]
Use a (somewhat) more documented environment variable.
I believe OUT is not mandatory to define, whereas
ANDROID_PRODUCT_OUT is. Not sure our continuous tests define it.
Change-Id: I7cd23971384df265e59587b49760aba29133a59c
Vladimir Marko [Fri, 25 Jul 2014 14:55:49 +0000 (14:55 +0000)]
Merge "Fix JNI compiler frame size adjustments."
Vladimir Marko [Thu, 24 Jul 2014 16:01:58 +0000 (17:01 +0100)]
Fix JNI compiler frame size adjustments.
Bug:
16321952
Change-Id: I6f84a59c679e335e02a8e70944a5d0bc8d73f90b