OSDN Git Service
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:25:08 +0000 (21:25 +0000)]
am
a48da12b: am
47ba978e: Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
* commit '
a48da12be5a4ef7dfbe509977fed29e83fce05f4':
Fix a SIGSEGV at background-to-foreground collector transition.
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:21:27 +0000 (21:21 +0000)]
am
47ba978e: Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
* commit '
47ba978e95896c932300fb3236ce5eb4b438d971':
Fix a SIGSEGV at background-to-foreground collector transition.
Ian Rogers [Fri, 8 Aug 2014 21:00:38 +0000 (21:00 +0000)]
am
e74fcc4b: Merge "ART: Fix two small DumpLIRInsn issues for x86_64 port."
* commit '
e74fcc4ba2dc57fb663a81ced62ec950b87f2832':
ART: Fix two small DumpLIRInsn issues for x86_64 port.
Andreas Gampe [Fri, 8 Aug 2014 19:51:16 +0000 (19:51 +0000)]
am
f93b240d: am
f0d30ed8: ART: Make assembler_test less chatty
* commit '
f93b240d24400266e12080779ebb25b7f3311fbb':
ART: Make assembler_test less chatty
Andreas Gampe [Fri, 8 Aug 2014 19:47:17 +0000 (19:47 +0000)]
am
f0d30ed8: ART: Make assembler_test less chatty
* commit '
f0d30ed8fcffc839ceb91359a547c0efb7641d53':
ART: Make assembler_test less chatty
Andreas Gampe [Fri, 8 Aug 2014 19:13:11 +0000 (19:13 +0000)]
am
3fa8a765: Merge "ART: Fix wrong command line parameter"
* commit '
3fa8a7654c3b99706fb01a044eb55116a449238f':
ART: Fix wrong command line parameter
Andreas Gampe [Fri, 8 Aug 2014 19:13:11 +0000 (19:13 +0000)]
am
2c798f45: Merge "Get the native bridge library from the framework."
* commit '
2c798f45128d5253a6206a6a17a7c5db2e4e3014':
Get the native bridge library from the framework.
Andreas Gampe [Fri, 8 Aug 2014 18:06:40 +0000 (18:06 +0000)]
am
76c95026: Merge "ART: Make assembler_test less chatty"
* commit '
76c95026eafdd1e2766122002323f7794afd7554':
ART: Make assembler_test less chatty
Ian Rogers [Fri, 8 Aug 2014 18:06:39 +0000 (18:06 +0000)]
am
1d84f85c: Merge "Wire up check JNI force copy mode."
* commit '
1d84f85cfd5693cea6872cff326b7ba881ebf7d9':
Wire up check JNI force copy mode.
Andreas Gampe [Wed, 6 Aug 2014 22:31:06 +0000 (15:31 -0700)]
ART: Make assembler_test less chatty
Do not save temporaries in case we use a different encoding than
the host assembler.
Bug:
16505797
(cherry picked from commit
54e15de4a3ea869488d50694fa01138901e70c4e)
Change-Id: I9508d9b09d930db70587a69c04bb3c8950339d79
Ian Rogers [Fri, 8 Aug 2014 17:48:58 +0000 (17:48 +0000)]
Merge "Wire up check JNI force copy mode."
Ian Rogers [Fri, 8 Aug 2014 20:54:05 +0000 (20:54 +0000)]
Merge "ART: Fix two small DumpLIRInsn issues for x86_64 port."
Haitao Feng [Sat, 9 Aug 2014 00:31:02 +0000 (08:31 +0800)]
ART: Fix two small DumpLIRInsn issues for x86_64 port.
Change-Id: I81ef32380bfc73d6c2bfc37a7f4903d912a5d9c8
Signed-off-by: Haitao Feng <haitao.feng@intel.com>
Andreas Gampe [Fri, 8 Aug 2014 19:06:53 +0000 (19:06 +0000)]
Merge "ART: Fix wrong command line parameter"
Andreas Gampe [Fri, 8 Aug 2014 19:05:10 +0000 (12:05 -0700)]
ART: Fix wrong command line parameter
Bug:
16843953
Change-Id: I59aea409a5f640a713f839927ba5c37b81e4ce0d
Andreas Gampe [Fri, 8 Aug 2014 17:50:02 +0000 (17:50 +0000)]
Merge "ART: Make assembler_test less chatty"
Andreas Gampe [Wed, 6 Aug 2014 22:31:06 +0000 (15:31 -0700)]
ART: Make assembler_test less chatty
Do not save temporaries in case we use a different encoding than
the host assembler.
Bug:
16505797
Change-Id: Iaa9edfe8bc84d7f809f5b403de902b92b0998431
Narayan Kamath [Fri, 8 Aug 2014 15:55:04 +0000 (15:55 +0000)]
am
80385c02: am
31fa14fd: Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
* commit '
80385c020b47db6b9a434882de14174a7006484e':
Use the right instruction set for checking dex-cache staleness.
Narayan Kamath [Fri, 8 Aug 2014 15:54:50 +0000 (15:54 +0000)]
am
fa5ca01d: Merge "Use the right instruction set for checking dex-cache staleness."
* commit '
fa5ca01dafbed01ea46226a9cf8ddeb2de2920b7':
Use the right instruction set for checking dex-cache staleness.
Narayan Kamath [Fri, 8 Aug 2014 15:50:43 +0000 (15:50 +0000)]
am
31fa14fd: Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
* commit '
31fa14fdbbccfcd9b50bc6db6aae6168b4fc2249':
Use the right instruction set for checking dex-cache staleness.
Ian Rogers [Thu, 17 Jul 2014 18:09:10 +0000 (11:09 -0700)]
Wire up check JNI force copy mode.
Increase check JNI checks.
Break apart jni_internal.h in to jni_env_ext.h and java_vm_ext.h.
Fix the abuse of ScopedObjectAccess/annotalysis by ScopedCheck in the case
of VM routines.
Make class loader override and shared library class loader JNI global
references rather than mirror pointers.
Clean-ups to native bridge.
Change-Id: If7c6110b5aade7a402bfb67534af86a7b2cdeb55
Vladimir Marko [Fri, 8 Aug 2014 15:20:44 +0000 (15:20 +0000)]
am
94bfacec: am
4bb93277: Fix performance regression in OatFile::GetOatDexFile().
* commit '
94bfacec035ea4bcd5f3418e3c3bad0b3deef72d':
Fix performance regression in OatFile::GetOatDexFile().
Vladimir Marko [Fri, 8 Aug 2014 15:17:01 +0000 (15:17 +0000)]
am
4bb93277: Fix performance regression in OatFile::GetOatDexFile().
* commit '
4bb932773e47b1ce04602d81ffa5a8a7d863eb10':
Fix performance regression in OatFile::GetOatDexFile().
Vladimir Marko [Fri, 8 Aug 2014 12:48:16 +0000 (12:48 +0000)]
am
9c522c2c: Merge "Fix performance regression in OatFile::GetOatDexFile()."
* commit '
9c522c2cbbf50dc687728747b37ad59985750b65':
Fix performance regression in OatFile::GetOatDexFile().
Vladimir Marko [Thu, 7 Aug 2014 17:07:18 +0000 (18:07 +0100)]
Fix performance regression in OatFile::GetOatDexFile().
Try to avoid calculating the canonical location of the
dex file if possible and when we have to calculate it,
cache the lookup result for subsequent lookups.
Bug:
16828525
Bug:
16859671
(cherry picked from commit
3f5838d7d0b9fc63db0ccc35c2ea05ed29264986)
Change-Id: Ifd9a45dada2cc724382fd03c10f6437a6b71e666
Nicolas Geoffray [Fri, 8 Aug 2014 02:19:42 +0000 (02:19 +0000)]
am
147594f8: Merge changes I0c2e2efb,Id842648e
* commit '
147594f8815ed0982d7e5676dc8b6fed5a0ba9e6':
Workaround for test failures after Bsymbolic fix.
Revert "Fix build without -Bsymbolic."
Zheng Xu [Fri, 8 Aug 2014 00:56:31 +0000 (00:56 +0000)]
am
8dd925c8: am
fa9c8ec3: Add arraycopy intrinsic for arm and arm64.
* commit '
8dd925c8b325fb09232a54e2ca61f4080269b69f':
Add arraycopy intrinsic for arm and arm64.
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.
Zheng Xu [Thu, 7 Aug 2014 21:53:03 +0000 (21:53 +0000)]
am
fa9c8ec3: Add arraycopy intrinsic for arm and arm64.
* commit '
fa9c8ec37c66574654e448513e1bb59af7cb9365':
Add arraycopy intrinsic for arm and arm64.
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.
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
(cherry picked from commit
947717a2b085f36ea007ac64f728e19ff1c8db0b)
Change-Id: I8199f5c9ce9827f869f0f93aaff7ec359a84d922
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."
Narayan Kamath [Fri, 8 Aug 2014 15:48:23 +0000 (15:48 +0000)]
Merge "Use the right instruction set for checking dex-cache staleness."
Narayan Kamath [Fri, 8 Aug 2014 15:19:44 +0000 (16:19 +0100)]
Use the right instruction set for checking dex-cache staleness.
We should use the instruction set we're asked to use, and not
the instruction set of the current runtime.
bug:
16876489
(cherry picked from commit
24e928bddaf8b4af6cdf6d64a7c35bfde059995c)
Change-Id: I07901f059f9966b961e76bc055eaa04ea0227824
Vladimir Marko [Fri, 8 Aug 2014 12:41:57 +0000 (12:41 +0000)]
Merge "Fix performance regression in OatFile::GetOatDexFile()."
Vladimir Marko [Thu, 7 Aug 2014 17:07:18 +0000 (18:07 +0100)]
Fix performance regression in OatFile::GetOatDexFile().
Try to avoid calculating the canonical location of the
dex file if possible and when we have to calculate it,
cache the lookup result for subsequent lookups.
Bug:
16828525
Bug:
16859671
Change-Id: I0f03007ba5adf08656615900cf125075a3f2c541
Narayan Kamath [Fri, 8 Aug 2014 15:48:07 +0000 (15:48 +0000)]
Merge "Use the right instruction set for checking dex-cache staleness." into lmp-dev
Narayan Kamath [Fri, 8 Aug 2014 15:19:44 +0000 (16:19 +0100)]
Use the right instruction set for checking dex-cache staleness.
We should use the instruction set we're asked to use, and not
the instruction set of the current runtime.
bug:
16876489
Change-Id: Ic2a30b7e7d23192b0189c1f868b73c5f4c7eb8f9
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."
Hiroshi Yamauchi [Fri, 8 Aug 2014 21:17:06 +0000 (21:17 +0000)]
Merge "Fix a SIGSEGV at background-to-foreground collector transition." into lmp-dev
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.
Cherry pick commit
c1276c838d1d0896048b8c14458432b94274e869.
Bug:
16854263
Change-Id: Ide2545d92bcafd3a095ac7f0c89c5b43d6dd78de
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
Andreas Gampe [Fri, 8 Aug 2014 19:03:28 +0000 (19:03 +0000)]
Merge "Get the native bridge library from the framework."
Calin Juravle [Thu, 7 Aug 2014 13:53:41 +0000 (14:53 +0100)]
Get the native bridge library from the framework.
Framework now passes the name of the native bridge to the runtime so
there's no need to do the reading in libart.
Bug:
16843953
Change-Id: I59b5c3050c6e1a37a627a8c98d7085e91487c32c
Nicolas Geoffray [Fri, 8 Aug 2014 01:01:48 +0000 (01:01 +0000)]
Merge changes I0c2e2efb,Id842648e
* changes:
Workaround for test failures after Bsymbolic fix.
Revert "Fix build without -Bsymbolic."
Dan Albert [Fri, 8 Aug 2014 00:39:34 +0000 (17:39 -0700)]
Workaround for test failures after Bsymbolic fix.
Change-Id: I0c2e2efbeb5060d4ec5ba706dab422b3c2caaa96
Dan Albert [Fri, 8 Aug 2014 00:40:03 +0000 (17:40 -0700)]
Revert "Fix build without -Bsymbolic."
This reverts commit
bae21bb7f6ca917e0954c970f0bfd2bfa3dcc0a9.
Dan Albert [Thu, 7 Aug 2014 23:23:32 +0000 (23:23 +0000)]
Merge "Fix build without -Bsymbolic."