OSDN Git Service
Dave Allison [Fri, 22 Aug 2014 02:59:48 +0000 (02:59 +0000)]
am
86e2fa97: am
39c2a379: Merge "Fix fugu build" into lmp-dev
* commit '
86e2fa97ca3dcf60b08d8a5f38ec0d0a1b6231e3':
Fix fugu build
Dave Allison [Fri, 22 Aug 2014 01:52:28 +0000 (01:52 +0000)]
am
0eca41f6: Merge "Fix signal test build"
* commit '
0eca41f6ceef35bfb0d06dbe8cda69459ba91ad7':
Fix signal test build
Dave Allison [Fri, 22 Aug 2014 01:52:28 +0000 (01:52 +0000)]
am
ac01b9f0: Merge "Add supported architectures to signal test."
* commit '
ac01b9f0d91354a0c6f0e49c2d6d9f371ea50c9e':
Add supported architectures to signal test.
Dave Allison [Fri, 22 Aug 2014 01:52:26 +0000 (01:52 +0000)]
am
c0e36451: Merge "Fix fault handler to unregister on shutdown"
* commit '
c0e36451d7c94e8dfb91234f978ac7d6d8613fc0':
Fix fault handler to unregister on shutdown
Dave Allison [Fri, 22 Aug 2014 01:52:24 +0000 (01:52 +0000)]
am
1a04fcd6: Merge "Remove profiler log line"
* commit '
1a04fcd65029720432fd14475640c138a31191ea':
Remove profiler log line
Dave Allison [Fri, 22 Aug 2014 01:19:23 +0000 (01:19 +0000)]
am
39c2a379: Merge "Fix fugu build" into lmp-dev
* commit '
39c2a379795460374b41e627257130e3c4ab961f':
Fix fugu build
Dave Allison [Fri, 22 Aug 2014 01:16:56 +0000 (01:16 +0000)]
Merge "Fix signal test build"
Dave Allison [Fri, 22 Aug 2014 00:22:38 +0000 (17:22 -0700)]
Fix signal test build
Bug:
17188805
(cherry picked from commit
b9d6a55eb4eb5872739ed26ac535f0c6342e813b)
Change-Id: I0a271aa214eebe11a8442ebf68811e0d8f077d36
Dave Allison [Fri, 22 Aug 2014 01:12:53 +0000 (01:12 +0000)]
Merge "Add supported architectures to signal test."
Dave Allison [Fri, 22 Aug 2014 01:12:30 +0000 (01:12 +0000)]
Merge "Fix fault handler to unregister on shutdown"
Dave Allison [Fri, 22 Aug 2014 01:12:03 +0000 (01:12 +0000)]
Merge "Remove profiler log line"
Dave Allison [Fri, 22 Aug 2014 01:09:18 +0000 (01:09 +0000)]
Merge "Fix fugu build" into lmp-dev
Dave Allison [Fri, 22 Aug 2014 00:22:38 +0000 (17:22 -0700)]
Fix fugu build
Bug:
17188805
Change-Id: Ibbfc759b42ec0f08a1beb35bf52d3ca92b8fe1ea
Ian Rogers [Fri, 22 Aug 2014 00:02:08 +0000 (00:02 +0000)]
am
20acd5b0: Merge "ART: Remove a BasicBlock\'s fall_through pointer in Hide()"
* commit '
20acd5b032870564537b81b9801f6afee499186d':
ART: Remove a BasicBlock's fall_through pointer in Hide()
Hiroshi Yamauchi [Thu, 21 Aug 2014 23:48:39 +0000 (23:48 +0000)]
am
0616b6c2: Merge "Avoid handle-less fields in ClassLinker::InitializeClass()"
* commit '
0616b6c258cfe2ef6e4c7f3890de617630ac773b':
Avoid handle-less fields in ClassLinker::InitializeClass()
Ian Rogers [Thu, 21 Aug 2014 23:48:38 +0000 (23:48 +0000)]
am
b289d2c7: Merge "ART: Implement kMirOpNullCheck"
* commit '
b289d2c7bee5d81dcbd97964cc4dfbfb514e7cb6':
ART: Implement kMirOpNullCheck
Ian Rogers [Thu, 21 Aug 2014 23:44:23 +0000 (23:44 +0000)]
Merge "ART: Remove a BasicBlock's fall_through pointer in Hide()"
Hiroshi Yamauchi [Thu, 21 Aug 2014 23:34:51 +0000 (23:34 +0000)]
Merge "Avoid handle-less fields in ClassLinker::InitializeClass()"
Ian Rogers [Thu, 21 Aug 2014 23:34:14 +0000 (23:34 +0000)]
Merge "ART: Implement kMirOpNullCheck"
Brian Carlstrom [Thu, 21 Aug 2014 23:19:49 +0000 (23:19 +0000)]
am
59595589: Merge "Make a couple of map checks debug only."
* commit '
595955894b2f9d75943d3b57f30c539d7cb0b7ba':
Make a couple of map checks debug only.
Hiroshi Yamauchi [Thu, 21 Aug 2014 22:59:43 +0000 (15:59 -0700)]
Avoid handle-less fields in ClassLinker::InitializeClass()
There were some handle-less fields in a SafeMap across GC points.
Bug:
12687968
Change-Id: Ib8c6527d4e23031f1d0074fa11d8f85499b68340
Brian Carlstrom [Thu, 21 Aug 2014 22:58:24 +0000 (22:58 +0000)]
Merge "Make a couple of map checks debug only."
Andreas Gampe [Thu, 21 Aug 2014 22:41:03 +0000 (22:41 +0000)]
am
759a77d3: Merge "Fix host 64-bit ISA string"
* commit '
759a77d3e2f8bbf790d30d37a946a9db82afc7f6':
Fix host 64-bit ISA string
Andreas Gampe [Thu, 21 Aug 2014 22:18:06 +0000 (22:18 +0000)]
Merge "Fix host 64-bit ISA string"
Alex Light [Thu, 21 Aug 2014 17:00:27 +0000 (10:00 -0700)]
Fix host 64-bit ISA string
Bug:
17185619,
15358152
Change-Id: I5b80e36890abf659634c38ec7dd6fa336bf8a75a
Narayan Kamath [Thu, 21 Aug 2014 16:38:09 +0000 (17:38 +0100)]
Make a couple of map checks debug only.
This cost us close to 80ms in app startup times.
The checks that a reused region was within an already
existent map has been demoted to a debug check.
A couple of other negative checks have been removed
outright because one of them was superflous and the other
wasn't guaranteed to be correct.
bug:
16828525
(cherry picked from commit
bddaea2b88b0a19d9cc7a4dea772af8e829323b3)
Change-Id: Ia6f3e69692bb9cb5b4ff6f47946ea38a56d4cdb6
Brian Carlstrom [Thu, 21 Aug 2014 21:07:53 +0000 (21:07 +0000)]
am
f2380e8c: am
574758ef: Merge "Make a couple of map checks debug only." into lmp-dev
* commit '
f2380e8c18b74d47cfb7177b725e6a4ef8be5da4':
Make a couple of map checks debug only.
Brian Carlstrom [Thu, 21 Aug 2014 20:59:35 +0000 (20:59 +0000)]
am
574758ef: Merge "Make a couple of map checks debug only." into lmp-dev
* commit '
574758ef03b0930ebd1cb8d9afe741cb374419a1':
Make a couple of map checks debug only.
Brian Carlstrom [Thu, 21 Aug 2014 20:43:54 +0000 (20:43 +0000)]
Merge "Make a couple of map checks debug only." into lmp-dev
Andreas Gampe [Thu, 21 Aug 2014 20:39:01 +0000 (20:39 +0000)]
am
ca0ceb06: Merge "ART: Remove GOT setup from x86 assembly where not needed"
* commit '
ca0ceb06d1b82714b834727a33f82fe6512effa9':
ART: Remove GOT setup from x86 assembly where not needed
Andreas Gampe [Thu, 21 Aug 2014 20:24:24 +0000 (20:24 +0000)]
Merge "ART: Remove GOT setup from x86 assembly where not needed"
Andreas Gampe [Thu, 21 Aug 2014 01:21:45 +0000 (18:21 -0700)]
ART: Remove GOT setup from x86 assembly where not needed
Change-Id: Id839d6d6427da7b7faa4340e04085cdab388e9a5
Narayan Kamath [Thu, 21 Aug 2014 16:38:09 +0000 (17:38 +0100)]
Make a couple of map checks debug only.
This cost us close to 80ms in app startup times.
The checks that a reused region was within an already
existent map has been demoted to a debug check.
A couple of other negative checks have been removed
outright because one of them was superflous and the other
wasn't guaranteed to be correct.
bug:
16828525
Change-Id: I00f76de06df0ea4ced40fdcb7825248d4b662045
Ian Rogers [Thu, 21 Aug 2014 19:16:46 +0000 (19:16 +0000)]
am
3d95001f: Merge "ART: A couple of checks were missed in class LockWord"
* commit '
3d95001f41b2de888e678b98bb8c1b23a2ac7ace':
ART: A couple of checks were missed in class LockWord
Ian Rogers [Thu, 21 Aug 2014 19:11:54 +0000 (19:11 +0000)]
am
00b3024b: Merge "x86: A couple of minor changes for String.indexOf() inlining"
* commit '
00b3024b350afef115bddea712705bdb4877ac11':
x86: A couple of minor changes for String.indexOf() inlining
Dave Allison [Thu, 21 Aug 2014 00:38:41 +0000 (17:38 -0700)]
Fix fault handler to unregister on shutdown
This fixes a problem with the fault handler where it wasn't
unregistering itself during shutdown of the runtime.
Bug:
17133266
(cherry picked from commit
e8b9afcd0cd86b8808af29a97332038aab70c604)
Change-Id: I1a4ec4292ec049046dda30769265680201729efb
Ian Rogers [Thu, 21 Aug 2014 18:49:06 +0000 (18:49 +0000)]
Merge "ART: A couple of checks were missed in class LockWord"
Ian Rogers [Thu, 21 Aug 2014 18:42:17 +0000 (18:42 +0000)]
am
7a9bbc5a: Merge "ART: Fix verifier fail message."
* commit '
7a9bbc5a6eb70370bbace571f5b3e8e45163ea64':
ART: Fix verifier fail message.
Dave Allison [Wed, 20 Aug 2014 21:29:39 +0000 (14:29 -0700)]
Add supported architectures to signal test.
This adds ARM, AARCH64, i386 and x86_64 to the supported architectures
in 004-SignalTest
Bug:
16948053
(cherry picked from commit
d4af31aa69fe8786a291c566c375bbac04da9ced)
Change-Id: I17a992b2cf47f8744f867b8e3f1c360aa345093d
Dave Allison [Thu, 21 Aug 2014 16:45:04 +0000 (09:45 -0700)]
Remove profiler log line
This removes a LOG(INFO) saying that the profile is disabled.
Bug:
17166556
(cherry picked from commit
b9c3888380666a7b44718f04f787693787cd57c6)
Change-Id: I9c9c470f554605a1183bcf84c5d864f9c4f24f72
Ian Rogers [Thu, 21 Aug 2014 18:38:48 +0000 (18:38 +0000)]
Merge "x86: A couple of minor changes for String.indexOf() inlining"
Ian Rogers [Thu, 21 Aug 2014 18:30:14 +0000 (18:30 +0000)]
Merge "ART: Fix verifier fail message."
Ian Rogers [Thu, 21 Aug 2014 18:04:10 +0000 (18:04 +0000)]
am
04401991: Merge "Fix OOM test case to handle more optimizations"
* commit '
044019918d43d2b21a81d24e96045666d3630410':
Fix OOM test case to handle more optimizations
Ian Rogers [Thu, 21 Aug 2014 17:52:05 +0000 (17:52 +0000)]
Merge "Fix OOM test case to handle more optimizations"
Dave Allison [Thu, 21 Aug 2014 17:12:42 +0000 (17:12 +0000)]
am
a6d49d07: am
b9c38883: Remove profiler log line
* commit '
a6d49d070b401b0a20ed8e4a5b28ad451a0fded1':
Remove profiler log line
Dave Allison [Thu, 21 Aug 2014 17:00:40 +0000 (17:00 +0000)]
am
b9c38883: Remove profiler log line
* commit '
b9c3888380666a7b44718f04f787693787cd57c6':
Remove profiler log line
Mathieu Chartier [Thu, 21 Aug 2014 16:57:41 +0000 (16:57 +0000)]
am
688d4a42: Merge "Check pending exception result in AllocObjectWithAllocator."
* commit '
688d4a42ff5ab3bcb28d516afcb80b79c392e8e4':
Check pending exception result in AllocObjectWithAllocator.
Mathieu Chartier [Thu, 21 Aug 2014 16:57:16 +0000 (16:57 +0000)]
am
ddd77162: am
9beaac31: Merge "Check pending exception result in AllocObjectWithAllocator." into lmp-dev
* commit '
ddd7716287e9b96d652230380ec24e1c592ca8b2':
Check pending exception result in AllocObjectWithAllocator.
Dave Allison [Thu, 21 Aug 2014 16:57:16 +0000 (16:57 +0000)]
am
b929bdf8: am
03324d0e: Merge "Fix fault handler to unregister on shutdown" into lmp-dev
* commit '
b929bdf861beb5a39808b8f41ec626ef5e30c4b9':
Fix fault handler to unregister on shutdown
Dave Allison [Thu, 21 Aug 2014 16:57:15 +0000 (16:57 +0000)]
am
0fa3c73e: am
45c3ea10: Merge "Add supported architectures to signal test." into lmp-dev
* commit '
0fa3c73efea193c74ba5752f775ba2e2754a1ee5':
Add supported architectures to signal test.
Dave Allison [Thu, 21 Aug 2014 16:45:04 +0000 (09:45 -0700)]
Remove profiler log line
This removes a LOG(INFO) saying that the profile is disabled.
Bug:
17166556
Change-Id: I4ddb4b0f792eb60ed5c927e17d06cff4ae0c073f
Mathieu Chartier [Thu, 21 Aug 2014 16:46:56 +0000 (16:46 +0000)]
am
9beaac31: Merge "Check pending exception result in AllocObjectWithAllocator." into lmp-dev
* commit '
9beaac31f89ad9f47c6e99e81cbfbefa25940c1d':
Check pending exception result in AllocObjectWithAllocator.
Dave Allison [Thu, 21 Aug 2014 16:46:55 +0000 (16:46 +0000)]
am
03324d0e: Merge "Fix fault handler to unregister on shutdown" into lmp-dev
* commit '
03324d0e4b983863a75800d9973fcb7a1eb809b5':
Fix fault handler to unregister on shutdown
Dave Allison [Thu, 21 Aug 2014 16:46:54 +0000 (16:46 +0000)]
am
45c3ea10: Merge "Add supported architectures to signal test." into lmp-dev
* commit '
45c3ea10b918ed8bb6834a1f4c2356b5874a8c75':
Add supported architectures to signal test.
Mathieu Chartier [Thu, 21 Aug 2014 16:45:17 +0000 (16:45 +0000)]
Merge "Check pending exception result in AllocObjectWithAllocator."
Mathieu Chartier [Thu, 21 Aug 2014 01:19:23 +0000 (18:19 -0700)]
Check pending exception result in AllocObjectWithAllocator.
Possible previous bug:
Allocation fails due to OOM and the collector transitions.
This caused us to incorrectly retry the allocation with a pending
exception. We now return null if there is a pending exception.
Bug:
17164348
(cherry picked from commit
27f5ae830c5418fa92094608a6e9f693ea88bb69)
Change-Id: I8e7ecafbade7f0b955812df3dd7c94fdc696c856
Mathieu Chartier [Thu, 21 Aug 2014 16:42:31 +0000 (16:42 +0000)]
Merge "Check pending exception result in AllocObjectWithAllocator." into lmp-dev
Dave Allison [Thu, 21 Aug 2014 16:38:39 +0000 (16:38 +0000)]
Merge "Fix fault handler to unregister on shutdown" into lmp-dev
Dave Allison [Thu, 21 Aug 2014 16:38:14 +0000 (16:38 +0000)]
Merge "Add supported architectures to signal test." into lmp-dev
Sebastien Hertz [Thu, 21 Aug 2014 15:12:12 +0000 (15:12 +0000)]
am
dffe276a: Merge "Fixed wrong field usage in Instrumentation::RemoveListener"
* commit '
dffe276a4e85c516e65119dc62433d35e950ff0f':
Fixed wrong field usage in Instrumentation::RemoveListener
Sebastien Hertz [Thu, 21 Aug 2014 14:52:34 +0000 (14:52 +0000)]
Merge "Fixed wrong field usage in Instrumentation::RemoveListener"
Daniel Mihalyi [Thu, 21 Aug 2014 13:57:25 +0000 (15:57 +0200)]
Fixed wrong field usage in Instrumentation::RemoveListener
Change-Id: I574fcacf754c1da1dc03459d5859b04bcebeac11
Signed-off-by: Daniel Mihalyi <daniel.mihalyi@mattakis.com>
Elliott Hughes [Thu, 21 Aug 2014 04:29:21 +0000 (04:29 +0000)]
am
4e3cfef3: Merge "Kill HAVE_ANDROID_PTHREAD_SETNAME_NP."
* commit '
4e3cfef33191ca5282fc85c85190db03ade9379b':
Kill HAVE_ANDROID_PTHREAD_SETNAME_NP.
Elliott Hughes [Thu, 21 Aug 2014 04:13:56 +0000 (04:13 +0000)]
Merge "Kill HAVE_ANDROID_PTHREAD_SETNAME_NP."
Elliott Hughes [Thu, 21 Aug 2014 03:18:18 +0000 (20:18 -0700)]
Kill HAVE_ANDROID_PTHREAD_SETNAME_NP.
All it means is __BIONIC__ anyway.
Change-Id: I3ef4ef1a14d0a77c75539f2ab533ee2f3964e1a5
Mathieu Chartier [Thu, 21 Aug 2014 02:59:46 +0000 (02:59 +0000)]
am
ec3c2bf9: am
c7fa9e30: Merge "Use homogeneous space compact by default if not low memory." into lmp-dev
* commit '
ec3c2bf9bfd377afbec2212a4ca8aa1d4c8f068d':
Use homogeneous space compact by default if not low memory.
Andreas Gampe [Thu, 21 Aug 2014 02:59:44 +0000 (02:59 +0000)]
am
2c525d96: am
16dd4dfd: Merge "ART: Relax GetInstructionSetFromString" into lmp-dev
* commit '
2c525d964b2331e47927c9d42bdde1086cf53379':
ART: Relax GetInstructionSetFromString
Andreas Gampe [Thu, 21 Aug 2014 02:25:02 +0000 (02:25 +0000)]
am
92502ab7: Merge "ART: Relax GetInstructionSetFromString"
* commit '
92502ab7570dfa28c98ab6781a1c5b9f8b8748bf':
ART: Relax GetInstructionSetFromString
Mathieu Chartier [Thu, 21 Aug 2014 01:19:23 +0000 (18:19 -0700)]
Check pending exception result in AllocObjectWithAllocator.
Possible previous bug:
Allocation fails due to OOM and the collector transitions.
This caused us to incorrectly retry the allocation with a pending
exception. We now return null if there is a pending exception.
Bug:
17164348
Change-Id: I22eab472afb2fdea6e800963ccb35ec0755ba0e6
Mathieu Chartier [Thu, 21 Aug 2014 01:30:33 +0000 (18:30 -0700)]
resolved conflicts for merge of
9285fd6d to lmp-dev-plus-aosp
Change-Id: Ic97a532af6371724c7427947d26e44dc84cd0631
Dave Allison [Thu, 21 Aug 2014 00:38:41 +0000 (17:38 -0700)]
Fix fault handler to unregister on shutdown
This fixes a problem with the fault handler where it wasn't
unregistering itself during shutdown of the runtime.
Bug:
17133266
Change-Id: If4758b14ded0fba194897191b1a8d8d7b0b3e6e5
Andreas Gampe [Thu, 21 Aug 2014 00:59:30 +0000 (00:59 +0000)]
Merge "ART: Relax GetInstructionSetFromString"
Ian Rogers [Wed, 20 Aug 2014 23:58:28 +0000 (23:58 +0000)]
am
e7f5428f: Merge "Make common BitVector operations inline-able."
* commit '
e7f5428fd80669d5e8a67962ef63dc80b4f628c4':
Make common BitVector operations inline-able.
Elliott Hughes [Wed, 20 Aug 2014 23:58:27 +0000 (23:58 +0000)]
am
69d848e9: Merge "bionic has always had gettid."
* commit '
69d848e9653ecc6eb3dbef6bcec4b4ddc617bef9':
bionic has always had gettid.
Mathieu Chartier [Wed, 20 Aug 2014 23:57:44 +0000 (23:57 +0000)]
am
c7fa9e30: Merge "Use homogeneous space compact by default if not low memory." into lmp-dev
* commit '
c7fa9e3018434eed890034b14bd85645077ec2e9':
Use homogeneous space compact by default if not low memory.
Andreas Gampe [Wed, 20 Aug 2014 23:52:06 +0000 (23:52 +0000)]
am
16dd4dfd: Merge "ART: Relax GetInstructionSetFromString" into lmp-dev
* commit '
16dd4dfd01c0ac432a32d081a15205222ffb1f1c':
ART: Relax GetInstructionSetFromString
Jean Christophe Beyler [Wed, 18 Jun 2014 21:14:15 +0000 (14:14 -0700)]
ART: Remove a BasicBlock's fall_through pointer in Hide()
Remove the fall_through link that a BasicBlock has to its child when
calling its Hide function. Useful for removing the visible link that is
there when we dump the CFG.
Change-Id: Ie82c48b195d1d62e2984d284dcc29ed7d7444db2
Signed-off-by: Jean Christophe Beyler <jean.christophe.beyler@intel.com>
Andreas Gampe [Wed, 20 Aug 2014 00:28:06 +0000 (17:28 -0700)]
ART: Relax GetInstructionSetFromString
Do not abort on an unknown instruction set string. Instead return
kNone and let the caller handle this.
Also simplify the patchoat tool to use this.
Bug:
17136416
(cherry picked from commit
aabbb2066a715b3fd8e752291f74c6d77b970450)
Change-Id: I24131914bcf91c04ae93179bf809a2907f1f2b7a
Dave Allison [Wed, 20 Aug 2014 21:29:39 +0000 (14:29 -0700)]
Add supported architectures to signal test.
This adds ARM, AARCH64, i386 and x86_64 to the supported architectures
in 004-SignalTest
Bug:
16948053
Change-Id: I82b3f053e9340b9e2e8fc04775d03fb0592fa06e
Ian Rogers [Wed, 20 Aug 2014 23:22:57 +0000 (23:22 +0000)]
Merge "Make common BitVector operations inline-able."
Ian Rogers [Wed, 20 Aug 2014 22:08:45 +0000 (15:08 -0700)]
Make common BitVector operations inline-able.
Change-Id: Ie25de4fae56c6712539f04172c42e3eff57df7ca
Mathieu Chartier [Wed, 20 Aug 2014 21:13:25 +0000 (21:13 +0000)]
am
192da567: Merge "Add null check to CheckVirtualMethod"
* commit '
192da5675b2e219f26a107bd7b60c755cd46ba74':
Add null check to CheckVirtualMethod
Dave Allison [Wed, 20 Aug 2014 20:49:35 +0000 (20:49 +0000)]
am
7b6f8d21: Merge "Workaround problem reading main stack on intel devices."
* commit '
7b6f8d21637e8a44d76bdf941895f1c951555f43':
Workaround problem reading main stack on intel devices.
Mathieu Chartier [Wed, 20 Aug 2014 20:49:13 +0000 (20:49 +0000)]
am
07277a70: Merge "Enable large object space for zygote."
* commit '
07277a700cdc7de2f40773a05c7a791b71abd581':
Enable large object space for zygote.
buzbee [Wed, 20 Aug 2014 20:49:02 +0000 (20:49 +0000)]
am
41cba7c6: Merge "Quick compiler: fix Arm64 inline locking code"
* commit '
41cba7c66cbc441b00fca48dfb2501181b1f2a53':
Quick compiler: fix Arm64 inline locking code
Vladimir Marko [Wed, 20 Aug 2014 20:48:44 +0000 (20:48 +0000)]
am
4efefc3b: Merge "Improve GVN performance when merging null-checked values."
* commit '
4efefc3b900dfc83ffd098b0c296c835b6837925':
Improve GVN performance when merging null-checked values.
Vladimir Marko [Wed, 20 Aug 2014 20:48:43 +0000 (20:48 +0000)]
am
72b51c66: Merge "X86: Fix alias info in GenInlinedIndexOf()."
* commit '
72b51c6600e75f59c3c3dca2493fd9ea22f48b9e':
X86: Fix alias info in GenInlinedIndexOf().
Nicolas Geoffray [Wed, 20 Aug 2014 20:48:42 +0000 (20:48 +0000)]
am
418a6980: Merge "Fix bug introduced in https://android-review.googlesource.com/102610."
* commit '
418a6980fe461f57bea1e3bc431264c81ae890aa':
Fix bug introduced in https://android-review.googlesource.com/102610.
Dave Allison [Wed, 20 Aug 2014 20:48:41 +0000 (20:48 +0000)]
am
10dac8ee: (-s ours) Merge "Merge stack usage reduction for overflow checks"
* commit '
10dac8ee833a297ad0ffc5877305f2d132259478':
Merge stack usage reduction for overflow checks
Mathieu Chartier [Wed, 20 Aug 2014 20:33:19 +0000 (20:33 +0000)]
am
167350d9: Add null check to CheckVirtualMethod
* commit '
167350d9c781c5e3893714bb26ab5cb1c4abf6b4':
Add null check to CheckVirtualMethod
Elliott Hughes [Wed, 20 Aug 2014 22:48:19 +0000 (22:48 +0000)]
Merge "bionic has always had gettid."
Elliott Hughes [Wed, 20 Aug 2014 22:00:04 +0000 (15:00 -0700)]
bionic has always had gettid.
dex2oat calls GetTid for every line it outputs via Message, which is why
this showed up so much in strace.
Bug:
17049821
Change-Id: Ib51c7f88410b291692874023902cf43f4b9a9d1c
Mathieu Chartier [Wed, 20 Aug 2014 19:09:38 +0000 (12:09 -0700)]
Add null check to CheckVirtualMethod
There was a runtime SIGSEGV that should have been a check jni
failure.
Also added regression test.
Bug:
16320699
Change-Id: If6c8e73959cefb24e4703f1562cdddb343d86630
Razvan A Lupusoru [Mon, 4 Aug 2014 16:38:46 +0000 (09:38 -0700)]
ART: Implement kMirOpNullCheck
The semantics of kMirOpNullCheck is to check object for null and
throw exception in that case. However, the implementation for it
is empty. This has been changed and appropriate dataflow have been
added to correctly reflect behavior.
In order to allow testing of implementation, the SpecialMethodInliner
has been updated to get rid of invoke and use this instead. This helps
all optimizations which do not check the MIR_INLINED flag because
when invoke is left in, they believe that invoke will still be done.
Change-Id: I62e425e42bdbc6357246fb949db5f79de73cf358
Signed-off-by: Razvan A Lupusoru <razvan.a.lupusoru@intel.com>
Vladimir Marko [Wed, 20 Aug 2014 15:22:41 +0000 (15:22 +0000)]
am
0fcd6873: am
a846c1ac: Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
* commit '
0fcd6873941d55d69c7cd9bb3b458d2230a9bd0b':
X86: Fix alias info in GenInlinedIndexOf().
Vladimir Marko [Wed, 20 Aug 2014 15:13:51 +0000 (15:13 +0000)]
am
a846c1ac: Merge "X86: Fix alias info in GenInlinedIndexOf()." into lmp-dev
* commit '
a846c1ac65b197844380b8d28377a850dfa1fc94':
X86: Fix alias info in GenInlinedIndexOf().
buzbee [Wed, 20 Aug 2014 13:06:54 +0000 (13:06 +0000)]
am
2239f5e7: am
c6a62592: Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
* commit '
2239f5e7542e62a78c814e0b1306537480d0e298':
Quick compiler: fix Arm64 inline locking code
buzbee [Wed, 20 Aug 2014 12:59:10 +0000 (12:59 +0000)]
am
c6a62592: Merge "Quick compiler: fix Arm64 inline locking code" into lmp-dev
* commit '
c6a62592836612b09ff1a8021e49b1328d85493b':
Quick compiler: fix Arm64 inline locking code
Mathieu Chartier [Wed, 20 Aug 2014 17:00:48 +0000 (17:00 +0000)]
Merge "Enable large object space for zygote."
Mathieu Chartier [Wed, 20 Aug 2014 01:24:04 +0000 (18:24 -0700)]
Enable large object space for zygote.
We now enable the large object space before the zygote fork.
This reduces the size of the zygote and removes the need for
excessive explicit GCs during phone booting.
Changed the card set mod union table to support forgetting cards.
If a card has no non null references which are in another space
then it is removed from the set.
Added logging of the zygote size when you do a SIGQUIT.
Dalvik PSS is the same or slightly lower (1-3%).
Zygote space size:
Before: 15MB
After: 8MB (+ some large objects).
TODO: Combine remembered sets and mod union tables into a single
interface.
Bug:
16398684
Change-Id: Ie48cdf35004a0a37eedb1ccc1bf214b1fa9e0cca