OSDN Git Service
Mathieu Chartier [Mon, 14 Jul 2014 20:40:01 +0000 (20:40 +0000)]
am
775fc823: am
f2f3bd26: am
ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."
* commit '
775fc823bc9be09c5b38829e5b23397743303f8e':
Dave Allison [Mon, 14 Jul 2014 20:40:00 +0000 (20:40 +0000)]
am
5a3b8a75: am
e5526e76: am
b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
* commit '
5a3b8a75239144a3be82d7e5f8ec86475d2fef86':
Ian Rogers [Mon, 14 Jul 2014 20:39:59 +0000 (20:39 +0000)]
am
6b0de42d: am
d19bab58: am
c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
* commit '
6b0de42d4f21d385575e696ace36dc53ee8af89f':
Ian Rogers [Mon, 14 Jul 2014 20:39:57 +0000 (20:39 +0000)]
am
c9308ca5: am
206f94b5: am
68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"
* commit '
c9308ca502b4137690b908802c08523c82a97875':
Ian Rogers [Mon, 14 Jul 2014 20:39:56 +0000 (20:39 +0000)]
am
4ef23c58: am
7fde2076: am
a76dc41f: Merge "Allow method tracing for run-test"
* commit '
4ef23c58b432d6e45fb485a90070fe2ac751677a':
Ian Rogers [Mon, 14 Jul 2014 20:39:55 +0000 (20:39 +0000)]
am
7443e598: am
c860df11: am
0f635b10: Merge "Fix method tracing from command-line"
* commit '
7443e598daef5ea58580086d7e9ec28298a85272':
Ian Rogers [Mon, 14 Jul 2014 20:39:54 +0000 (20:39 +0000)]
am
05ab0bc8: am
a892b0e0: am
32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
* commit '
05ab0bc8312234d8203b859d71ca96b8cf4daeac':
Vladimir Marko [Mon, 14 Jul 2014 20:39:53 +0000 (20:39 +0000)]
am
8afc18fc: am
3af030b4: am
62f28f94: Merge "Fix a compile assert name with inverted meaning."
* commit '
8afc18fc2e0ffe07564b2af76e7dc79fad0d6125':
Vladimir Marko [Mon, 14 Jul 2014 20:39:52 +0000 (20:39 +0000)]
am
15137e15: am
7e001a86: am
665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
* commit '
15137e15b1b79ea5d1be7ccda1980038d50719f3':
Nicolas Geoffray [Mon, 14 Jul 2014 20:39:51 +0000 (20:39 +0000)]
am
0c68a828: am
2596abd8: am
8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
* commit '
0c68a828134b03dedf4d9ebc5c6d0ccd0b722b29':
Ian Rogers [Mon, 14 Jul 2014 20:39:50 +0000 (20:39 +0000)]
am
5cd35c2d: am
34ef0b10: am
608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
* commit '
5cd35c2d12fe82a3b6a61a0fd78a95d15a144b03':
Ian Rogers [Mon, 14 Jul 2014 20:39:49 +0000 (20:39 +0000)]
am
4d7ae65e: am
4aabec65: am
2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"
* commit '
4d7ae65e4ff3a4496135d01d800c3d6b292c56b5':
Ian Rogers [Mon, 14 Jul 2014 20:39:48 +0000 (20:39 +0000)]
am
b3893926: am
4298bb21: am
7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
* commit '
b3893926e8adc348edff440ee6c16f12bc204fd8':
Ian Rogers [Mon, 14 Jul 2014 20:39:47 +0000 (20:39 +0000)]
Andreas Gampe [Mon, 14 Jul 2014 20:39:46 +0000 (20:39 +0000)]
Brian Carlstrom [Mon, 14 Jul 2014 20:39:45 +0000 (20:39 +0000)]
am
ec6d674c: am
cf16ca16: am
dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
* commit '
ec6d674ccf584984cdc454622442216f042de4d0':
Brian Carlstrom [Mon, 14 Jul 2014 20:39:44 +0000 (20:39 +0000)]
am
e0823296: am
a01ea93d: am
6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
* commit '
e0823296ab05a99aa6f49ab276e103cdc0b0f91d':
Andreas Gampe [Mon, 14 Jul 2014 20:39:42 +0000 (20:39 +0000)]
am
70c561fd: am
180c2a6d: am
3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"
* commit '
70c561fdb7314c6ee886acca60941f5f7a00a3c9':
Ian Rogers [Mon, 14 Jul 2014 20:39:41 +0000 (20:39 +0000)]
am
5d6271e3: am
69f915f9: am
8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."
* commit '
5d6271e3e44fe2e1ba0eee92aaa8bfe0ca6a5b1f':
Andreas Gampe [Mon, 14 Jul 2014 20:39:40 +0000 (20:39 +0000)]
am
df5503e2: am
e45a3586: am
c16fc5fc: am
09341a57: Merge "ART: Key-Value Store in Oat header"
* commit '
df5503e2ade46b6549498b899c4888f1eb47f81b':
Andreas Gampe [Mon, 14 Jul 2014 20:39:39 +0000 (20:39 +0000)]
am
71946bcc: am
673bc998: am
4c5e832c: am
b63727cd: Merge "ART: Update Monitor::Wait so it releases monitor_lock_ before throwing an exception"
* commit '
71946bccfcc69b60d8b916aa93a22797b6a6c28e':
Hiroshi Yamauchi [Mon, 14 Jul 2014 20:39:38 +0000 (20:39 +0000)]
Brian Carlstrom [Mon, 14 Jul 2014 20:39:37 +0000 (20:39 +0000)]
Mathieu Chartier [Mon, 14 Jul 2014 20:39:35 +0000 (20:39 +0000)]
am
bb0b3d95: am
9332dca9: am
c6c0a402: am
50dffeee: Merge "Fix local reference leaks in debugger and use a cache."
* commit '
bb0b3d95cc4759fbec8ecfdb4a0de8748d74de4d':
Vladimir Marko [Mon, 14 Jul 2014 20:39:34 +0000 (20:39 +0000)]
am
4967c9f8: am
ad1cc685: am
aac7b7dd: am
c4c601b6: Merge "Add kIntrinsicIsStatic flag for System.arraycopy()."
* commit '
4967c9f8a5f211a29cd4eb0e74afae1719826846':
Vladimir Marko [Mon, 14 Jul 2014 20:39:33 +0000 (20:39 +0000)]
Vladimir Marko [Mon, 14 Jul 2014 20:39:30 +0000 (20:39 +0000)]
am
49976e7a: am
990dde61: am
db123b00: am
74d8348c: Merge "Check invoke type for intrinsic method invokes."
* commit '
49976e7a3afe3ec2da7275991a8a04c56a94ba89':
Ian Rogers [Mon, 14 Jul 2014 20:39:29 +0000 (20:39 +0000)]
am
a185d22e: am
42bbeb85: am
0c8537e5: am
751dee37: Merge "BaseMutex::IsExclusiveHeld should only be called on self."
* commit '
a185d22e092616086ca76102dd9a5289777151c1':
Ian Rogers [Mon, 14 Jul 2014 20:39:27 +0000 (20:39 +0000)]
Ian Rogers [Mon, 14 Jul 2014 20:39:26 +0000 (20:39 +0000)]
am
363b6ace: am
87d5eb80: am
d343c221: am
e60658e8: Merge "Enable compiler testing for ARM64 and x86-64."
* commit '
363b6acea1dec91b024e9cb79a80bdacf06bbe56':
Ian Rogers [Mon, 14 Jul 2014 20:39:24 +0000 (20:39 +0000)]
am
ae240ffe: am
a3d0afca: am
23b39cec: am
464ef7a7: Merge "ART: Intrinsic implementation for java.lang.System.arraycopy."
* commit '
ae240ffe008cca9a27e255fb6cf5b8e0e8137afb':
Ian Rogers [Mon, 14 Jul 2014 20:39:23 +0000 (20:39 +0000)]
am
c01394ff: am
fe147700: am
53dbd90d: am
a1d1781e: Merge "Fix dex file dependencies for oat tests."
* commit '
c01394ff7097995e4d7d7d65546abd0e1842dcef':
Andreas Gampe [Mon, 14 Jul 2014 20:39:22 +0000 (20:39 +0000)]
am
cdf6da55: am
7b4a7a1d: am
cba6b1fc: Merge "ART: Enable some ARM64 optimizations."
* commit '
cdf6da55390b4582048efc8760ed009dff94fd85':
Andreas Gampe [Mon, 14 Jul 2014 20:39:21 +0000 (20:39 +0000)]
am
8a5c0764: am
4aaf4e12: am
5fa647d5: Merge "Slow path for iget should expect return in core reg"
* commit '
8a5c0764d2970ce95cb519270badf52f7dbb648a':
Vladimir Marko [Mon, 14 Jul 2014 20:39:20 +0000 (20:39 +0000)]
Andreas Gampe [Mon, 14 Jul 2014 20:39:19 +0000 (20:39 +0000)]
Vladimir Marko [Mon, 14 Jul 2014 20:39:18 +0000 (20:39 +0000)]
am
c863472b: am
982b3c0f: am
50fb2436: Merge "Handle potential <clinit>() correctly in LVN."
* commit '
c863472b3cfb274409f08dc73907222078e0f18b':
Vladimir Marko [Mon, 14 Jul 2014 20:39:17 +0000 (20:39 +0000)]
am
92a64fc9: am
21e38a35: am
723b2fc3: Merge "Faster deduplication in OatWriter."
* commit '
92a64fc9996013524baa7979de9f0ca140ddf7a1':
Ian Rogers [Mon, 14 Jul 2014 20:39:15 +0000 (20:39 +0000)]
am
7a60c5d9: am
6302c888: am
b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
* commit '
7a60c5d9bd015e4e6a40dd0b0f19f9fe95f2402f':
Andreas Gampe [Mon, 14 Jul 2014 20:39:14 +0000 (20:39 +0000)]
am
316c0cfb: am
d74ff9b5: am
c4f72ec4: Merge "Use memory chunks for monitors on LP64"
* commit '
316c0cfb5f879c76bd2338f3529369e689261c5c':
Ian Rogers [Mon, 14 Jul 2014 20:39:13 +0000 (20:39 +0000)]
am
433df2a5: am
b88f433c: am
af4cf5d7: Merge "Missed use of android_atomic and thread state_."
* commit '
433df2a55d73eff73f16aa9e1609bf07d329b88a':
Ian Rogers [Mon, 14 Jul 2014 20:39:12 +0000 (20:39 +0000)]
Colin Cross [Mon, 14 Jul 2014 20:39:11 +0000 (20:39 +0000)]
am
b872062a: am
3df187cd: am
d8079288: Merge "art: fix host dex2oat runtime args"
* commit '
b872062a4dd50a95c0dc05125933db7e29f759ef':
Ian Rogers [Mon, 14 Jul 2014 20:39:10 +0000 (20:39 +0000)]
am
fc546c58: am
fc879248: am
62526c37: Merge "Move thread state to art::Atomic."
* commit '
fc546c58eae5c4e711dc2d9e8b16a52d0345233d':
Andreas Gampe [Mon, 14 Jul 2014 20:39:09 +0000 (20:39 +0000)]
am
60764549: Merge "Revert "Revert "Quick compiler: remove temporary workaround."""
* commit '
607645493171eb84213c8af7efcb1c10480a281b':
Revert "Revert "Quick compiler: remove temporary workaround.""
Ian Rogers [Mon, 14 Jul 2014 20:39:08 +0000 (20:39 +0000)]
am
4726f7d3: am
f95e89a0: am
43b6fe02: Merge "Move another field away from android_atomic_cas."
* commit '
4726f7d3f8143497c75bc021dec8a11b05483c07':
Dave Allison [Mon, 14 Jul 2014 20:39:07 +0000 (20:39 +0000)]
am
c13be050: am
826d36e3: am
672f8367: Merge "Revert "Add implicit null and stack checks for x86""
* commit '
c13be0500a0999bba6a4669cc16f175409d6fa31':
Ian Rogers [Mon, 14 Jul 2014 20:39:06 +0000 (20:39 +0000)]
am
78cb8b7c: am
60c83e0f: am
4770a2e6: Merge "Remove legacy CAS implementations from mutex."
* commit '
78cb8b7ce78d9528a92d397da13e404a51e8b2e2':
Mathieu Chartier [Mon, 14 Jul 2014 20:39:05 +0000 (20:39 +0000)]
am
49d1b7df: am
650385ed: am
bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
* commit '
49d1b7df5cc4c95dab4359448cacd85da5bfaf04':
Dave Allison [Mon, 14 Jul 2014 20:39:04 +0000 (20:39 +0000)]
am
6a31717a: am
d224b8c3: am
5de52242: Merge "Add implicit null and stack checks for x86"
* commit '
6a31717a934f7b2b8774b7d7ef21f4dd3c38d9d3':
Ian Rogers [Mon, 14 Jul 2014 20:39:03 +0000 (20:39 +0000)]
am
2dacab3a: am
a0f17e18: am
2929490d: Merge "Move card table away from android_atomic_cas."
* commit '
2dacab3a548dde81a7bff0add0d09439b62d7625':
Brian Carlstrom [Mon, 14 Jul 2014 20:39:02 +0000 (20:39 +0000)]
am
21500f7e: am
37588105: am
5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."
* commit '
21500f7e4ad67de62a3db79efb4780ccdbe5d2d2':
Elliott Hughes [Mon, 14 Jul 2014 20:39:01 +0000 (20:39 +0000)]
am
c6afbb68: am
c400ffb9: am
b288a5ad: Merge "Use the icu4c headers from the new location."
* commit '
c6afbb68897c84ea0c34c783ff0406d3bae59412':
Andreas Gampe [Mon, 14 Jul 2014 20:39:00 +0000 (20:39 +0000)]
am
e48a373c: am
450b94dd: am
91db19b5: Merge "ART: Add simple tests for inlining of CAS"
* commit '
e48a373c2ed9302ab17d08893565661465cd8201':
Brian Carlstrom [Mon, 14 Jul 2014 20:26:19 +0000 (13:26 -0700)]
resolved conflicts for merge of
715b192a to lmp-dev-plus-aosp
Change-Id: I81450ebb086579be0e38d6f8f00b1338675b7220
Mathieu Chartier [Mon, 14 Jul 2014 19:22:42 +0000 (19:22 +0000)]
am
c499e2d2: am
cb2e23f8: am
ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."
* commit '
c499e2d2ad1fc5cef63760d75e70032fe8abb335':
Dave Allison [Mon, 14 Jul 2014 19:22:41 +0000 (19:22 +0000)]
am
22e9cdd2: am
d1cfc9eb: am
b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
* commit '
22e9cdd25536f619f44d27665d4a4a87e6cbed4f':
Ian Rogers [Mon, 14 Jul 2014 19:22:40 +0000 (19:22 +0000)]
am
08d623ce: am
77dee8c9: am
c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
* commit '
08d623ce11d8d5ae207975a5af6224e3981d5ac3':
Ian Rogers [Mon, 14 Jul 2014 19:22:38 +0000 (19:22 +0000)]
am
4c3fd486: am
b42fb83a: am
68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"
* commit '
4c3fd4865f1339537a6758a5f91ce41787e94f88':
Ian Rogers [Mon, 14 Jul 2014 19:22:37 +0000 (19:22 +0000)]
am
7b1f6d6e: am
9e5599d9: am
a76dc41f: Merge "Allow method tracing for run-test"
* commit '
7b1f6d6e393d49a8cef40fc53f662de7e0bd6065':
Ian Rogers [Mon, 14 Jul 2014 19:22:36 +0000 (19:22 +0000)]
am
337fcbd4: am
55cd98a0: am
0f635b10: Merge "Fix method tracing from command-line"
* commit '
337fcbd4c5bda7e1ccdf5e9df84aa061943ae034':
Ian Rogers [Mon, 14 Jul 2014 19:22:35 +0000 (19:22 +0000)]
am
5034fd76: am
fb31dffa: am
32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
* commit '
5034fd76b06a246aeac159ff77c83f08b639ea5d':
Vladimir Marko [Mon, 14 Jul 2014 19:22:34 +0000 (19:22 +0000)]
am
540813e9: am
116bee4b: am
62f28f94: Merge "Fix a compile assert name with inverted meaning."
* commit '
540813e9423ebb332132a1dc082ee8dee1cdc7d9':
Vladimir Marko [Mon, 14 Jul 2014 19:22:34 +0000 (19:22 +0000)]
am
1279f4f5: am
9e55c90c: am
665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
* commit '
1279f4f5fdbec37cff58c6ae967c346b2868d77d':
Nicolas Geoffray [Mon, 14 Jul 2014 19:22:32 +0000 (19:22 +0000)]
am
5e821c7a: am
c8fb7efa: am
8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
* commit '
5e821c7addd20dfb18c02f3ea76f940161e9848c':
Ian Rogers [Mon, 14 Jul 2014 19:22:31 +0000 (19:22 +0000)]
am
82671011: am
c9058b71: am
608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
* commit '
826710115da55a6978ee4c1ed5c5b21812bf667b':
Ian Rogers [Mon, 14 Jul 2014 19:22:30 +0000 (19:22 +0000)]
am
1019fea4: am
cafde465: am
2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"
* commit '
1019fea4d8f225523a1092c09e8e84b0dacd0c37':
Ian Rogers [Mon, 14 Jul 2014 19:22:29 +0000 (19:22 +0000)]
am
eaddc209: am
daf3aa92: am
7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
* commit '
eaddc209bd33475257deaf668c40c07062e80a78':
Ian Rogers [Mon, 14 Jul 2014 19:22:28 +0000 (19:22 +0000)]
Andreas Gampe [Mon, 14 Jul 2014 19:22:27 +0000 (19:22 +0000)]
Brian Carlstrom [Mon, 14 Jul 2014 19:22:26 +0000 (19:22 +0000)]
am
a684b0ed: am
9152d407: am
dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
* commit '
a684b0edda6fa9307a970a6a3efcd6372265d1a7':
Brian Carlstrom [Mon, 14 Jul 2014 19:22:26 +0000 (19:22 +0000)]
am
d37bbd4c: am
b7382afd: am
6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
* commit '
d37bbd4cfc9f3a656cb6fcdc9c837aa443703da4':
Andreas Gampe [Mon, 14 Jul 2014 19:22:24 +0000 (19:22 +0000)]
am
ab538a9d: am
4e7e7342: am
3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"
* commit '
ab538a9d3ae8b94e65f2288af8cae054c4a61cdf':
Ian Rogers [Mon, 14 Jul 2014 19:22:24 +0000 (19:22 +0000)]
am
fdc866f9: am
359bcdad: am
8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."
* commit '
fdc866f9b52f71ca07936959ecdb206c1148a4ff':
Andreas Gampe [Mon, 14 Jul 2014 19:22:22 +0000 (19:22 +0000)]
am
e89517d4: am
c16fc5fc: am
09341a57: Merge "ART: Key-Value Store in Oat header"
* commit '
e89517d4c3678aad3b8909cb75d2d6ffa2678885':
Andreas Gampe [Mon, 14 Jul 2014 19:22:22 +0000 (19:22 +0000)]
am
93e55c4b: am
4c5e832c: am
b63727cd: Merge "ART: Update Monitor::Wait so it releases monitor_lock_ before throwing an exception"
* commit '
93e55c4bb2ac7f6c4b78b5d6a004858f3447432e':
Hiroshi Yamauchi [Mon, 14 Jul 2014 19:22:21 +0000 (19:22 +0000)]
Brian Carlstrom [Mon, 14 Jul 2014 19:22:20 +0000 (19:22 +0000)]
Mathieu Chartier [Mon, 14 Jul 2014 19:22:18 +0000 (19:22 +0000)]
am
d33458aa: am
c6c0a402: am
50dffeee: Merge "Fix local reference leaks in debugger and use a cache."
* commit '
d33458aaa207fea50c3c80c19532dae0907cd110':
Vladimir Marko [Mon, 14 Jul 2014 19:22:17 +0000 (19:22 +0000)]
am
ad3b6a86: am
aac7b7dd: am
c4c601b6: Merge "Add kIntrinsicIsStatic flag for System.arraycopy()."
* commit '
ad3b6a86c1ac8739d3a01cfe450cb47c6a261ff6':
Vladimir Marko [Mon, 14 Jul 2014 19:22:16 +0000 (19:22 +0000)]
Vladimir Marko [Mon, 14 Jul 2014 19:22:15 +0000 (19:22 +0000)]
am
434c69ac: am
db123b00: am
74d8348c: Merge "Check invoke type for intrinsic method invokes."
* commit '
434c69acf84b548b39c45344388def1728253e31':
Ian Rogers [Mon, 14 Jul 2014 19:22:14 +0000 (19:22 +0000)]
am
2d533a12: am
0c8537e5: am
751dee37: Merge "BaseMutex::IsExclusiveHeld should only be called on self."
* commit '
2d533a12181ad42b2ee4f72f48d7d341f593a43b':
Ian Rogers [Mon, 14 Jul 2014 19:22:12 +0000 (19:22 +0000)]
Ian Rogers [Mon, 14 Jul 2014 19:22:10 +0000 (19:22 +0000)]
am
e16aea82: am
d343c221: am
e60658e8: Merge "Enable compiler testing for ARM64 and x86-64."
* commit '
e16aea8251ee69115162aa2662e24c5ee836b413':
Ian Rogers [Mon, 14 Jul 2014 19:22:08 +0000 (19:22 +0000)]
am
5fe8c77f: am
23b39cec: am
464ef7a7: Merge "ART: Intrinsic implementation for java.lang.System.arraycopy."
* commit '
5fe8c77fa60d508722095adb592871c799dba6d7':
Ian Rogers [Mon, 14 Jul 2014 19:22:05 +0000 (19:22 +0000)]
am
35aca4ea: am
53dbd90d: am
a1d1781e: Merge "Fix dex file dependencies for oat tests."
* commit '
35aca4ea0003f896675e7c35781ab228029f9e74':
Mathieu Chartier [Mon, 14 Jul 2014 19:21:31 +0000 (19:21 +0000)]
am
37994a79: Merge "Fix infinite loop when calling SetStatus after OOM."
* commit '
37994a793beec7ec2d03e9a08f30f6f7389cfe49':
Fix infinite loop when calling SetStatus after OOM.
Nicolas Geoffray [Mon, 14 Jul 2014 18:18:03 +0000 (18:18 +0000)]
am
e8b80863: Merge "x86 needs a bit more stack to handle stack overflows."
* commit '
e8b8086388159be5fecb23ae6185e70f3dfb5da6':
x86 needs a bit more stack to handle stack overflows.
Ian Rogers [Mon, 14 Jul 2014 18:18:01 +0000 (18:18 +0000)]
am
267b1f22: Merge "Make generate-operator-out.py compatible with Python 3.x"
* commit '
267b1f22536aba6210c27f7548ef0a58c164d84b':
Make generate-operator-out.py compatible with Python 3.x
Nicolas Geoffray [Mon, 14 Jul 2014 18:17:50 +0000 (18:17 +0000)]
am
c35c60ff: Merge "Bailout if the field access is not supported."
* commit '
c35c60ffdcef2f10b269f14bfa427f9e91b4e51c':
Bailout if the field access is not supported.
Nicolas Geoffray [Mon, 14 Jul 2014 18:17:48 +0000 (18:17 +0000)]
am
3914a79d: Merge "Add two phi pruning phases."
* commit '
3914a79dc234106eeeac4790373e909c3249973e':
Add two phi pruning phases.
Nicolas Geoffray [Mon, 14 Jul 2014 18:17:47 +0000 (18:17 +0000)]
am
1cad41d9: Merge "Support fields in optimizing compiler."
* commit '
1cad41d900201422cedcbe7837935d17bbf28ed8':
Support fields in optimizing compiler.
Mathieu Chartier [Mon, 14 Jul 2014 19:15:11 +0000 (19:15 +0000)]
Merge "Fix infinite loop when calling SetStatus after OOM."
Mathieu Chartier [Mon, 14 Jul 2014 17:16:05 +0000 (10:16 -0700)]
Fix infinite loop when calling SetStatus after OOM.
There was a problem where we would call SetStatus when we had an OOM
error. This results in attempting to find the ExceptionInInitializer
class which if not loaded does more allocations resulting in an
infinite loop.
Also some cleanup addressing other comments.
Bug:
16082350
Change-Id: I5c1e638a03ddf700ab4e9cad9a3077d2b1b26c43
Nicolas Geoffray [Mon, 14 Jul 2014 16:48:34 +0000 (16:48 +0000)]
Merge "x86 needs a bit more stack to handle stack overflows."
Nicolas Geoffray [Mon, 14 Jul 2014 15:39:07 +0000 (16:39 +0100)]
x86 needs a bit more stack to handle stack overflows.
With the interpreter, 018-stack-overflow fails when being run
command line. Through make, we're not seeing any failure because
make gives a 2GB stack space. However, running run-test in the
shell, the stack space is 8MB, and the reserved space is not enough.
Change-Id: I0da12402cdfe5ad090f34c16aa6cb8d5fbc7a3ea
Andreas Gampe [Sat, 12 Jul 2014 21:10:53 +0000 (21:10 +0000)]
am
cf90ba7e: Merge "ART: Add another special case to GenSelect for ARM64"
* commit '
cf90ba7ebe00346651f3b7ce1e5b1f785f7caabd':
ART: Add another special case to GenSelect for ARM64
Andreas Gampe [Sat, 12 Jul 2014 20:42:11 +0000 (20:42 +0000)]
am
6ef2aa67: Merge "ART: Rework TargetReg(symbolic_reg, wide)"
* commit '
6ef2aa67656cf8e67bbd6f0f4aec0402d7158297':
ART: Rework TargetReg(symbolic_reg, wide)
Ian Rogers [Sat, 12 Jul 2014 19:44:47 +0000 (19:44 +0000)]
am
3b7da819: Merge "ART: Correct disassembling of regs from opcodes"
* commit '
3b7da819adb3b3f166e5970b6f5778415c84c3e9':
ART: Correct disassembling of regs from opcodes