OSDN Git Service
Christopher Ferris [Fri, 8 Aug 2014 00:55:51 +0000 (00:55 +0000)]
am
bb608972: am
35388e93: Check for a NULL pointer, do not call Build.
* commit '
bb608972b907b84b243a67bf8362ec5868ab7ca6':
Check for a NULL pointer, do not call Build.
Stuart Monteith [Fri, 8 Aug 2014 00:55:50 +0000 (00:55 +0000)]
am
3211e972: (-s ours) am
7204c04d: AArch64: Implicit StackOverflow/NPE/Suspend checks.
* commit '
3211e972da1e42a7498b2906ed1b0d74cb5455e2':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Dan Albert [Fri, 8 Aug 2014 00:23:54 +0000 (00:23 +0000)]
am
1514bcd5: Merge "Fix build without -Bsymbolic."
* commit '
1514bcd5f6e4e8efdff0ddd00c4505d596924289':
Fix build without -Bsymbolic.
Mathieu Chartier [Thu, 7 Aug 2014 23:13:34 +0000 (23:13 +0000)]
am
7663126d: Merge "Clean up card table test."
* commit '
7663126dce1f9252a2f06f24c2a250b5da8aaa1a':
Clean up card table test.
Mathieu Chartier [Thu, 7 Aug 2014 22:29:59 +0000 (22:29 +0000)]
am
46ee77dd: Merge "Guard pause histogram with lock."
* commit '
46ee77dd1999a296cf1688e35f8019a37446360f':
Guard pause histogram with lock.
Andreas Gampe [Thu, 7 Aug 2014 21:47:55 +0000 (21:47 +0000)]
am
25904e30: Merge "Add arraycopy intrinsic for arm and arm64."
* commit '
25904e30e8bb2d131cbcfa67b1e5481bbf35cffd':
Add arraycopy intrinsic for arm and arm64.
Andreas Gampe [Thu, 7 Aug 2014 21:47:54 +0000 (21:47 +0000)]
am
52fed5a8: Merge "Emit CFI for x86 & x86_64 JNI compiler."
* commit '
52fed5a8f31dac64d09ede03703f40b712a7d766':
Emit CFI for x86 & x86_64 JNI compiler.
Christopher Ferris [Thu, 7 Aug 2014 21:17:09 +0000 (21:17 +0000)]
am
35388e93: Check for a NULL pointer, do not call Build.
* commit '
35388e93f7dc45257bbffc675710728aeb663394':
Check for a NULL pointer, do not call Build.
Nicolas Geoffray [Thu, 7 Aug 2014 21:11:15 +0000 (21:11 +0000)]
am
01fc4ee8: Merge "Support x86_64 stack overflow checks in opt compiler."
* commit '
01fc4ee8d8194d926cde02d7b6b6001c811c1c2b':
Support x86_64 stack overflow checks in opt compiler.
Christopher Ferris [Tue, 5 Aug 2014 22:43:13 +0000 (15:43 -0700)]
Check for a NULL pointer, do not call Build.
When calling BacktraceMap::Create(), a NULL pointer is returned if Build
fails. Building twice can cause problems and might leak memory.
(cherry picked from commit
836572a07142627ff291d686a4e9e03a0988344b)
Change-Id: I59d29bb6e5324de6eb099916045c2ab1d9e56630
Hiroshi Yamauchi [Thu, 7 Aug 2014 19:26:24 +0000 (19:26 +0000)]
am
6bbcc8b4: Merge "Fix a SIGSEGV at background-to-foreground collector transition."
* commit '
6bbcc8b45f04e737b21f382c37f5e2e90ab333f0':
Fix a SIGSEGV at background-to-foreground collector transition.
Christopher Ferris [Thu, 7 Aug 2014 19:17:08 +0000 (19:17 +0000)]
am
69d86b13: Merge "Check for a NULL pointer, do not call Build."
* commit '
69d86b13eed6e4ef6c18a6c3985b3426e7d202bd':
Check for a NULL pointer, do not call Build.
Dave Allison [Thu, 7 Aug 2014 19:07:44 +0000 (19:07 +0000)]
am
f978a125: am
a7894cdb: Fix checks for kLiteral in local optimizations.
* commit '
f978a1254ab409c4dcbde4ac4800c878efd189f0':
Fix checks for kLiteral in local optimizations.
Mathieu Chartier [Thu, 7 Aug 2014 23:04:02 +0000 (23:04 +0000)]
Merge "Clean up card table test."
Mathieu Chartier [Thu, 7 Aug 2014 22:22:07 +0000 (22:22 +0000)]
Merge "Guard pause histogram with lock."
Mathieu Chartier [Thu, 7 Aug 2014 21:26:27 +0000 (14:26 -0700)]
Guard pause histogram with lock.
There is a race condition since the GC was updating this without
holding any locks. But the signal catcher could be dumping the
timings with DumpGcPerformanceInfo at the same time. This could
potentially cause out of bound errors, etc..
Also did a bit of cleanup.
Bug:
15446488
Change-Id: Icaff19d872cc7f7d31c34e4ddaae97502454e09c
Hiroshi Yamauchi [Thu, 7 Aug 2014 19:20:25 +0000 (19:20 +0000)]
Merge "Fix a SIGSEGV at background-to-foreground collector transition."
Christopher Ferris [Thu, 7 Aug 2014 19:09:34 +0000 (19:09 +0000)]
Merge "Check for a NULL pointer, do not call Build."
Nicolas Geoffray [Thu, 7 Aug 2014 18:23:28 +0000 (18:23 +0000)]
am
f4009e22: Merge "Fix target and host gtest dependencies."
* commit '
f4009e2249172ae8fe0e772ac8c0107400a28d6d':
Fix target and host gtest dependencies.
Dave Allison [Thu, 7 Aug 2014 18:23:26 +0000 (18:23 +0000)]
am
028ca296: Merge "Add implicit checks for x86_64 architecture."
* commit '
028ca296731ed12bc4701da19f82407b7c504aa6':
Add implicit checks for x86_64 architecture.
Stuart Monteith [Thu, 7 Aug 2014 18:15:54 +0000 (18:15 +0000)]
am
7204c04d: AArch64: Implicit StackOverflow/NPE/Suspend checks.
* commit '
7204c04dd86ae8ce05690e38737b2abf017a0a69':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Dave Allison [Thu, 7 Aug 2014 18:15:53 +0000 (18:15 +0000)]
am
a7894cdb: Fix checks for kLiteral in local optimizations.
* commit '
a7894cdb063edb88f1420a42207e0c4bd27ab4f9':
Fix checks for kLiteral in local optimizations.
Stuart Monteith [Wed, 11 Jun 2014 15:44:46 +0000 (16:44 +0100)]
AArch64: Implicit StackOverflow/NPE/Suspend checks.
This implements implicit stack overflow checks and null pointer exceptions
for AArch64. Suspend checks are implemented but not switched on yet.
Bug:
16256184
Change-Id: I2eb076f2c0c9d94793d5a898fea49cf409b4eb66
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
Hiroshi Yamauchi [Thu, 7 Aug 2014 17:27:17 +0000 (10:27 -0700)]
Fix a SIGSEGV at background-to-foreground collector transition.
The mem map that's used to create the backup main rosalloc space is
set to PROT_NONE by the compaction and the rosalloc space creation
attempts to write the debug magic number in the first page.
This is a debug build only issue.
Bug:
16854263
Change-Id: I3cc6b7288ee53c006366bb428fb245a909bc3db5
Mathieu Chartier [Thu, 7 Aug 2014 00:48:43 +0000 (17:48 -0700)]
Clean up card table test.
Change-Id: Idd313dbf8a238b014741d48be091375646dccd6d
Dave Allison [Wed, 6 Aug 2014 04:32:46 +0000 (21:32 -0700)]
Fix checks for kLiteral in local optimizations.
The check for kLiteral (literal load) just checked the kLiteral
bit in the def mask. The kEncodeAll mask has the kLiteral bit
set so this check was triggering. The fix is to check for
only the kLiteral bit being set and no other special bits.
The semantics of the special bits in the use/def mask is that
only one of them can be set at the same time.
Bug:
16824330
Change-Id: I0f1c1157e017870414ffef11767e5433d1fd4401
Andreas Gampe [Thu, 7 Aug 2014 21:38:15 +0000 (21:38 +0000)]
Merge "Emit CFI for x86 & x86_64 JNI compiler."
Andreas Gampe [Thu, 7 Aug 2014 21:40:57 +0000 (21:40 +0000)]
Merge "Add arraycopy intrinsic for arm and arm64."
Zheng Xu [Thu, 7 Aug 2014 06:05:23 +0000 (14:05 +0800)]
Add arraycopy intrinsic for arm and arm64.
Implement intrinsic for
java.lang.System.arraycopy(char[], int, char[], int, int).
Bug:
16241558
Change-Id: I558a9c4403d0c3abb07af1511d394981bbfcabc5
Nicolas Geoffray [Thu, 7 Aug 2014 21:03:30 +0000 (21:03 +0000)]
Merge "Support x86_64 stack overflow checks in opt compiler."
Nicolas Geoffray [Thu, 7 Aug 2014 19:25:41 +0000 (20:25 +0100)]
Support x86_64 stack overflow checks in opt compiler.
Also re-enable SignalTest on optimizing-32.
Change-Id: I2ca13f6f9ea775c654ee07cc5026c985263d6380
Dave Allison [Thu, 7 Aug 2014 18:15:28 +0000 (18:15 +0000)]
Merge "Add implicit checks for x86_64 architecture."
Dave Allison [Wed, 16 Jul 2014 23:04:32 +0000 (16:04 -0700)]
Add implicit checks for x86_64 architecture.
This combines the x86 and x86_64 fault handlers into one. It also
merges in the change to the entrypoints for X86_64.
Replaces generic instruction length calculator with one that only
works with the specific instructions we use.
Bug:
16256184
Change-Id: I1e8ab5ad43f46060de9597615b423c89a836035c
Signed-off-by: Chao-ying Fu <chao-ying.fu@intel.com>
Calin Juravle [Thu, 7 Aug 2014 12:54:49 +0000 (12:54 +0000)]
am
8b62dc0f: Merge "Fix GetDexCanonicalLocation test for relative paths."
* commit '
8b62dc0f993d0445401655fc274e5225498fa81c':
Fix GetDexCanonicalLocation test for relative paths.
Calin Juravle [Thu, 7 Aug 2014 12:46:20 +0000 (12:46 +0000)]
Merge "Fix GetDexCanonicalLocation test for relative paths."
Piotr Jastrzebski [Thu, 7 Aug 2014 11:28:49 +0000 (11:28 +0000)]
am
66d8e853: Merge "Add test for equals and hashCode in ParameterizedType"
* commit '
66d8e8534b8598e89bf4838524723458c006f462':
Add test for equals and hashCode in ParameterizedType
Calin Juravle [Thu, 7 Aug 2014 10:54:36 +0000 (11:54 +0100)]
Fix GetDexCanonicalLocation test for relative paths.
If the reference file is created with a relative path the test will
fail.
Change-Id: Ifa8e650e3c8b1d28600ce994d7e6e0cb422b0c9d
Calin Juravle [Thu, 7 Aug 2014 10:05:17 +0000 (10:05 +0000)]
am
6a64b3d4: Merge "Revert "Rename openDexFileNative to openDexFile.""
* commit '
6a64b3d4677e0527a997491400e017606b31e560':
Revert "Rename openDexFileNative to openDexFile."
Nicolas Geoffray [Thu, 7 Aug 2014 18:16:38 +0000 (18:16 +0000)]
Merge "Fix target and host gtest dependencies."
Nicolas Geoffray [Thu, 7 Aug 2014 00:58:32 +0000 (01:58 +0100)]
Fix target and host gtest dependencies.
Change-Id: I0da17b12fc2164d9d8bdb8bcf61947c7788c6b8b
Brian Carlstrom [Thu, 7 Aug 2014 06:13:27 +0000 (06:13 +0000)]
am
df4e9da8: Merge from goog/lmp-dev goog/lmp-ub-dev
* commit '
df4e9da829beee9536f08b5c68e102fe8d9fefda':
Reset goog/lmp-dev to goog/master
Make system use patchoat to relocate during runtime.
Brian Carlstrom [Thu, 7 Aug 2014 06:08:38 +0000 (23:08 -0700)]
Merge from goog/lmp-dev goog/lmp-ub-dev
Change-Id: I04c4169910fe5200532fcb9e3df8e22b77922e5d
Ian Rogers [Thu, 7 Aug 2014 05:50:12 +0000 (05:50 +0000)]
am
69304cdc: am
97e2c638: am
ce5b5219: am
267b1f22: Merge "Make generate-operator-out.py compatible with Python 3.x"
* commit '
69304cdc7ac9eec97896524607e6f9f5a1aa9245':
Nicolas Geoffray [Thu, 7 Aug 2014 05:50:11 +0000 (05:50 +0000)]
am
d5d98bc2: am
18dadbc7: am
c26efd15: am
c35c60ff: Merge "Bailout if the field access is not supported."
* commit '
d5d98bc2aafda04ba518cfc69121af1d6d88372f':
Nicolas Geoffray [Thu, 7 Aug 2014 05:50:09 +0000 (05:50 +0000)]
Nicolas Geoffray [Thu, 7 Aug 2014 05:50:08 +0000 (05:50 +0000)]
am
756f5721: am
eba098fe: am
5e1e8eeb: am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
756f572115618d5ff5c5ac95805696105750b7ae':
Ian Rogers [Thu, 7 Aug 2014 05:31:31 +0000 (05:31 +0000)]
am
97e2c638: am
ce5b5219: am
267b1f22: Merge "Make generate-operator-out.py compatible with Python 3.x"
* commit '
97e2c638dc6ed95d8e59158d376edf777707436e':
Make generate-operator-out.py compatible with Python 3.x
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:29 +0000 (05:31 +0000)]
am
18dadbc7: am
c26efd15: am
c35c60ff: Merge "Bailout if the field access is not supported."
* commit '
18dadbc741e2f63fe58c257641a1ad3155eee549':
Bailout if the field access is not supported.
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:28 +0000 (05:31 +0000)]
am
d1ef1c7f: am
53583ade: am
3914a79d: Merge "Add two phi pruning phases."
* commit '
d1ef1c7ff67233bd0d0c43b5502817251695163f':
Add two phi pruning phases.
Nicolas Geoffray [Thu, 7 Aug 2014 05:31:27 +0000 (05:31 +0000)]
am
eba098fe: am
5e1e8eeb: am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
eba098fe690f2287bc73a9dd934abe8a4eb14d61':
Support fields in optimizing compiler.
Bill Buzbee [Thu, 7 Aug 2014 01:25:26 +0000 (01:25 +0000)]
am
70c3e111: Merge "Fix analysis_attributes_ to update missing definitions."
* commit '
70c3e111652e8031351b31b9fcb704c2925a711d':
Fix analysis_attributes_ to update missing definitions.
Dave Allison [Thu, 7 Aug 2014 00:35:15 +0000 (00:35 +0000)]
am
81550fa9: Merge "AArch64: Implicit StackOverflow/NPE/Suspend checks."
* commit '
81550fa92a02f6c656d13b12dc188fc73ac0fb39':
AArch64: Implicit StackOverflow/NPE/Suspend checks.
Ian Rogers [Thu, 7 Aug 2014 00:31:37 +0000 (00:31 +0000)]
am
b30d8584: Merge "Fix art build script."
* commit '
b30d8584bea83eb713b7a6b097225087d42828ff':
Fix art build script.
Mathieu Chartier [Thu, 7 Aug 2014 00:10:10 +0000 (00:10 +0000)]
am
9c597674: Merge "Fixed build breakage due to incorrect class TypeId."
* commit '
9c597674fb99025a48476aff90de0fc81e44036a':
Fixed build breakage due to incorrect class TypeId.
Mathieu Chartier [Thu, 7 Aug 2014 00:02:15 +0000 (00:02 +0000)]
Merge "Fixed build breakage due to incorrect class TypeId."
Nicolas Geoffray [Wed, 6 Aug 2014 23:56:28 +0000 (23:56 +0000)]
am
255916da: Merge "Make patchoat use the sht_entsize when patching."
* commit '
255916da6a778d66f4b577ea7c2046f5deb4653e':
Make patchoat use the sht_entsize when patching.
Fred Shih [Wed, 6 Aug 2014 23:44:22 +0000 (16:44 -0700)]
Fixed build breakage due to incorrect class TypeId.
Fixed incorrect type id being inserted in code buffer and got rid of
inefficient pointer wrapping in LoadClassType.
Change-Id: I7ee1d957ebcd816445c26199723ac50787d926d7
Dan Albert [Thu, 7 Aug 2014 23:23:32 +0000 (23:23 +0000)]
Merge "Fix build without -Bsymbolic."
Dan Albert [Thu, 7 Aug 2014 04:36:46 +0000 (21:36 -0700)]
Fix build without -Bsymbolic.
For ARM: Gold is unable to create PLT based relocations for conditional
branches.
For x86: Some uses of SYMBOL() should have been PLT_SYMBOL().
Bug:
16853291
Change-Id: Id70488b077256a70137c4417f21be2c2d1d4341c
Dave Allison [Thu, 7 Aug 2014 00:20:29 +0000 (00:20 +0000)]
Merge "AArch64: Implicit StackOverflow/NPE/Suspend checks."
Ian Rogers [Thu, 7 Aug 2014 00:11:35 +0000 (00:11 +0000)]
Merge "Fix art build script."
Nicolas Geoffray [Wed, 6 Aug 2014 23:37:02 +0000 (23:37 +0000)]
Merge "Make patchoat use the sht_entsize when patching."
Andreas Gampe [Wed, 6 Aug 2014 23:42:30 +0000 (23:42 +0000)]
am
4d110c25: Merge "ART: Remove test files after test"
* commit '
4d110c25bbcc3ed4603e94968ee02db7b2c9db8c':
ART: Remove test files after test
Nicolas Geoffray [Wed, 6 Aug 2014 23:42:29 +0000 (23:42 +0000)]
am
68b84b78: Merge "Make tools/art non-executable"
* commit '
68b84b78c72824667b66e6b93caab6abf3736f35':
Make tools/art non-executable
Andreas Gampe [Wed, 6 Aug 2014 23:38:51 +0000 (23:38 +0000)]
am
f441aafa: Merge "ART: Build fix for dex_cache rework"
* commit '
f441aafad053157b71fad2eeaf699cfbb6bda1a5':
ART: Build fix for dex_cache rework
Nicolas Geoffray [Wed, 6 Aug 2014 23:12:55 +0000 (23:12 +0000)]
am
8b2e9cde: Merge "Fix SsaDeadPhiElimination in the presence of dependent phis."
* commit '
8b2e9cde4aa3dc96b903c9eee3a7b3b7ee8422e4':
Fix SsaDeadPhiElimination in the presence of dependent phis.
Andreas Gampe [Wed, 6 Aug 2014 23:05:03 +0000 (23:05 +0000)]
am
269c3360: Merge "ART: Add guards to the dex cache and its shortcuts"
* commit '
269c3360f8e69e9faf8bc8a51fd87ae7adadfb59':
ART: Add guards to the dex cache and its shortcuts
Hiroshi Yamauchi [Wed, 6 Aug 2014 22:44:43 +0000 (22:44 +0000)]
am
2524ffd7: Merge "Implement TLAB fast paths in artAllocObjectFromCode."
* commit '
2524ffd731a3d173c9b0ad8f7b3e4a89d692aab6':
Implement TLAB fast paths in artAllocObjectFromCode.
Alex Light [Wed, 6 Aug 2014 20:37:23 +0000 (13:37 -0700)]
Make patchoat use the sht_entsize when patching.
This fixes an occasional problem with multiarch use of patchoat.
Change-Id: I80799de36774720bd985704f9b709a8378bb5af5
Mathieu Chartier [Wed, 6 Aug 2014 22:12:04 +0000 (22:12 +0000)]
am
57cd9d3b: Merge "Added support for patching classes from different dex files."
* commit '
57cd9d3bda952ee2c2cf977fb1e26a0a954e1bab':
Added support for patching classes from different dex files.
Mathieu Chartier [Wed, 6 Aug 2014 22:12:03 +0000 (22:12 +0000)]
am
cf73835a: Merge "Revert "Temporary fix for bad LIR generation in GenInlinedGet.""
* commit '
cf73835af1421b3346a180c4eb2236d373bf2f2f':
Revert "Temporary fix for bad LIR generation in GenInlinedGet."
Brian Carlstrom [Wed, 6 Aug 2014 21:32:22 +0000 (14:32 -0700)]
Reset goog/lmp-dev to goog/master
Change-Id: If30071b5f86bfe723abf799c9248397e8840a8a0
Andreas Gampe [Wed, 6 Aug 2014 21:25:48 +0000 (21:25 +0000)]
am
0f56c9ca: Merge "ART: Rework CFA frame initialization and writing code"
* commit '
0f56c9cae0f570483a1d420172377b1754331025':
ART: Rework CFA frame initialization and writing code
Andreas Gampe [Wed, 6 Aug 2014 20:44:40 +0000 (20:44 +0000)]
am
e564bded: Merge "ART: Skip compiling redefined classes in apps"
* commit '
e564bded1862fb97b64517fb78a8c5c5df467850':
ART: Skip compiling redefined classes in apps
Andreas Gampe [Wed, 6 Aug 2014 20:38:39 +0000 (20:38 +0000)]
am
d009c20d: Merge "ART: Use TMPDIR for test directories"
* commit '
d009c20d828c80204e34c1860df54ae871447f83':
ART: Use TMPDIR for test directories
Andreas Gampe [Wed, 6 Aug 2014 20:38:34 +0000 (20:38 +0000)]
am
1b192268: Merge "ART: Generate chained compare-and-branch for short switches"
* commit '
1b192268f167f603fc372f02f9067f3ce5d82daf':
ART: Generate chained compare-and-branch for short switches
Jeff Hao [Wed, 6 Aug 2014 20:38:33 +0000 (20:38 +0000)]
am
e71d5971: Merge "Fix proxy tracing and enable tests that now work with tracing."
* commit '
e71d59715a2f0adb0aa539639b83b8d410fc679f':
Fix proxy tracing and enable tests that now work with tracing.
Dave Allison [Wed, 6 Aug 2014 19:52:42 +0000 (19:52 +0000)]
am
a947ebc4: Merge "Fix checks for kLiteral in local optimizations."
* commit '
a947ebc45d2785522b3c9d3295be68fd35d548be':
Fix checks for kLiteral in local optimizations.
Stuart Monteith [Wed, 11 Jun 2014 15:44:46 +0000 (16:44 +0100)]
AArch64: Implicit StackOverflow/NPE/Suspend checks.
This implements implicit stack overflow checks and null pointer exceptions
for AArch64. Suspend checks are implemented but not switched on yet.
Change-Id: I2eb076f2c0c9d94793d5a898fea49cf409b4eb66
Signed-off-by: Stuart Monteith <stuart.monteith@arm.com>
Calin Juravle [Wed, 6 Aug 2014 19:07:41 +0000 (19:07 +0000)]
Revert "Rename openDexFileNative to openDexFile."
https://android-review.googlesource.com/#/c/103383/ introduces
absolute paths so we need back the old method name
Bug:
16644204
This reverts commit
350b626eb1cfbaee7619e9453a4c018c07aed003.
Change-Id: I10f430a536bb1906a8452fea5846ec9e725e84bd
Christopher Ferris [Tue, 5 Aug 2014 22:43:13 +0000 (15:43 -0700)]
Check for a NULL pointer, do not call Build.
When calling BacktraceMap::Create(), a NULL pointer is returned if Build
fails. Building twice can cause problems and might leak memory.
Change-Id: I38a4100e534ef15a19883703aa504e795a14b6de
Mathieu Chartier [Wed, 6 Aug 2014 18:46:51 +0000 (18:46 +0000)]
am
56a49adb: am
860feb0a: Merge "Add card table test."
* commit '
56a49adb43fa1c8c8485f7ce07286d3b3829ee7d':
Add card table test.
Mathieu Chartier [Wed, 6 Aug 2014 18:43:17 +0000 (18:43 +0000)]
am
860feb0a: Merge "Add card table test."
* commit '
860feb0a60d0fe9311f28bd590058f6660d130b1':
Add card table test.
Brian Carlstrom [Wed, 6 Aug 2014 17:40:57 +0000 (17:40 +0000)]
am
82ec2f07: am
484e2c2d: Merge "Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY.""
* commit '
82ec2f0790eb59a7ed71490d503a9b7cdef25ce4':
Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."
Jeff Hao [Wed, 6 Aug 2014 17:40:41 +0000 (17:40 +0000)]
am
c75dc324: am
38449637: Merge "When performing a long jump, update SP last."
* commit '
c75dc3242ab3d1a1d8684b049b6299a4b2ca57cf':
When performing a long jump, update SP last.
Jeff Hao [Wed, 6 Aug 2014 17:40:40 +0000 (17:40 +0000)]
am
dc6414fe: am
cd0d9b5a: Merge "When performing a long jump, update SP last." into lmp-dev
* commit '
dc6414fe6b56f2854dacbaac82c2b0b4b57d1e6f':
When performing a long jump, update SP last.
Nicolas Geoffray [Wed, 6 Aug 2014 17:40:23 +0000 (17:40 +0000)]
am
da113966: am
1d5c4953: Merge "Fix SIB for base + index addressing in x86_64 assembler."
* commit '
da113966c3a06facd1073e71436c12a4d470f12b':
Fix SIB for base + index addressing in x86_64 assembler.
Andreas Gampe [Wed, 6 Aug 2014 17:40:12 +0000 (17:40 +0000)]
am
a84690e3: am
0a1143de: Merge "Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation."
* commit '
a84690e3b0607f286e4680350b98d54e208fa614':
Add x86_64 optimized __memcmp16 implementation; fix tabs in 32-bit implementation.
Mathieu Chartier [Wed, 6 Aug 2014 17:37:35 +0000 (17:37 +0000)]
am
0b8c1530: am
a1227a18: Fix byte_cas to use uintptr_t Atomic.
* commit '
0b8c153082caf6a970e238c9ac34ce0601947dd2':
Fix byte_cas to use uintptr_t Atomic.
Mathieu Chartier [Wed, 6 Aug 2014 17:36:08 +0000 (17:36 +0000)]
am
5ce0921f: am
4853f940: Merge "Fix byte_cas to use uintptr_t Atomic."
* commit '
5ce0921fbaf6a8eead373a253fc8813cde54770a':
Fix byte_cas to use uintptr_t Atomic.
Nicolas Geoffray [Wed, 6 Aug 2014 17:34:24 +0000 (17:34 +0000)]
am
1d874ca3: am
ae5092fc: Merge "Fix movw in x86_64 assembler."
* commit '
1d874ca361749a062f9a8861425873f46242b98c':
Fix movw in x86_64 assembler.
Ian Rogers [Wed, 6 Aug 2014 17:25:46 +0000 (17:25 +0000)]
am
c598f8f8: am
4b6d27c2: Merge "x86: Fix assembler for Pextr"
* commit '
c598f8f88ca70283472434fcfc0ab5af8ddb30f1':
x86: Fix assembler for Pextr
Ian Rogers [Wed, 6 Aug 2014 17:25:37 +0000 (17:25 +0000)]
am
1622baf3: am
cbb5747b: Merge "ART: Fix lock max count definition"
* commit '
1622baf30c9ef3897fd80d8d4fb0860511608573':
ART: Fix lock max count definition
Andreas Gampe [Wed, 6 Aug 2014 23:30:52 +0000 (23:30 +0000)]
Merge "ART: Build fix for dex_cache rework"
Andreas Gampe [Wed, 6 Aug 2014 23:27:52 +0000 (16:27 -0700)]
ART: Build fix for dex_cache rework
A formerly public method is now private.
Change-Id: I9834cfcf651ab2f3553633cad45ea4ed05f3e4c7
Nicolas Geoffray [Wed, 6 Aug 2014 23:03:21 +0000 (23:03 +0000)]
Merge "Fix SsaDeadPhiElimination in the presence of dependent phis."
Nicolas Geoffray [Wed, 6 Aug 2014 22:02:54 +0000 (23:02 +0100)]
Fix SsaDeadPhiElimination in the presence of dependent phis.
This fixes the problem of having a dead loop phi taking as back-edge
input a phi that also has this loop phi as input. Walking backwards
does not solve the problem because the loop phi will be visited last.
Most of the time, dex removes dead locals like this.
Change-Id: I797198cf9c15f8faa6585cca157810e23aaa4940
Andreas Gampe [Wed, 6 Aug 2014 22:58:25 +0000 (22:58 +0000)]
Merge "ART: Add guards to the dex cache and its shortcuts"
Andreas Gampe [Thu, 31 Jul 2014 23:23:49 +0000 (16:23 -0700)]
ART: Add guards to the dex cache and its shortcuts
Do not return fields, methods or classes if the (declaring) class is
erroneous.
Bug:
16692788
Change-Id: If43c2414ad0eb22db5eba7cf66396c7f16c26597
Andreas Gampe [Wed, 6 Aug 2014 21:20:31 +0000 (21:20 +0000)]
Merge "ART: Rework CFA frame initialization and writing code"