OSDN Git Service
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
Andreas Gampe [Sat, 12 Jul 2014 12:59:31 +0000 (12:59 +0000)]
am
b7e78cb6: Merge "AArch64: Fix and enable reverseBytes intrinsic."
* commit '
b7e78cb6bdc57f2beaa8bccf383289ebdd53e552':
AArch64: Fix and enable reverseBytes intrinsic.
Andreas Gampe [Sat, 12 Jul 2014 12:59:30 +0000 (12:59 +0000)]
am
5727339f: Merge "Aarch64: easy division and remainder for long ints."
* commit '
5727339f61b016d012fc91c5df3eb8eb3f3e0066':
Aarch64: easy division and remainder for long ints.
Andreas Gampe [Sat, 12 Jul 2014 12:59:30 +0000 (12:59 +0000)]
am
7aab9879: Merge "ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler"
* commit '
7aab98798ad676d7ede05b25bcff946a6550868c':
ART: Fuse compare-with-0-and-branch in Arm64 utils-assembler
Andreas Gampe [Sat, 12 Jul 2014 12:59:29 +0000 (12:59 +0000)]
am
0f73aa8f: Merge "Update counting VR for promotion"
* commit '
0f73aa8f64417232e3f3d09e53f49084d2783fe0':
Update counting VR for promotion
Andreas Gampe [Sat, 12 Jul 2014 03:24:32 +0000 (03:24 +0000)]
am
bc9127a5: Merge "AArch64: Fix def use."
* commit '
bc9127a5d451058aede5562e2b015caec618d008':
AArch64: Fix def use.
Andreas Gampe [Sat, 12 Jul 2014 03:18:36 +0000 (03:18 +0000)]
am
0ee33c32: Merge "Revert "Revert "ART: Key-Value Store in Oat header"""
* commit '
0ee33c32388f49853b7f7003047047d7f9e9cb75':
Revert "Revert "ART: Key-Value Store in Oat header""
Mathieu Chartier [Sat, 12 Jul 2014 01:42:18 +0000 (01:42 +0000)]
am
8c472818: Merge "ART: Compacting ROS/DlMalloc spaces with semispace copy GC"
* commit '
8c4728186f038e2ae09e74cbdcef5e5ca598ba64':
ART: Compacting ROS/DlMalloc spaces with semispace copy GC
Hans Boehm [Sat, 12 Jul 2014 01:42:18 +0000 (01:42 +0000)]
am
9531f62e: Merge "Call strong CAS from unsafe. Add more CAS versions."
* commit '
9531f62ef260cbd0d0512e4c96f5d5dd2f4fdbb2':
Call strong CAS from unsafe. Add more CAS versions.
Ian Rogers [Sat, 12 Jul 2014 01:42:17 +0000 (01:42 +0000)]
am
f08f0ca4: Merge "Improve performance of invokevirtual/invokeinterface with embedded imt/vtable"
* commit '
f08f0ca4b9538bff516f354532ced57cf077da66':
Improve performance of invokevirtual/invokeinterface with embedded imt/vtable
Andreas Gampe [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am
3d71f321: Merge "ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64"
* commit '
3d71f321f4b87ba13113dc0457fd9c3470a2b380':
ART: Change GenPCUseDefEncoding(), turn on Load Hoisting for ARM64
Hans Boehm [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am
aebf3cda: Merge "Replace memory barriers to better reflect Java needs."
* commit '
aebf3cda094f34cf846d19a7724bdc8005267c95':
Replace memory barriers to better reflect Java needs.
Mathieu Chartier [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am
2751ffbe: Merge "Faster TLAB allocator."
* commit '
2751ffbe4e3192395e7402f93b597a397f01f889':
Faster TLAB allocator.
Christopher Ferris [Sat, 12 Jul 2014 01:42:16 +0000 (01:42 +0000)]
am
bfe9d08e: Merge "Fix mac build."
* commit '
bfe9d08e93f6b866e7ecc63f32083e3fc868e606':
Fix mac build.
Christopher Ferris [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am
438b9039: Merge "Make jemalloc the default choice."
* commit '
438b9039c77b2c9556f362e8cbbefcf21c55b527':
Make jemalloc the default choice.
Andreas Gampe [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am
946a55fa: Merge "ART: Fix GenSelect for ARM64"
* commit '
946a55fa7aec5058d357b601ac3554e242cd1afa':
ART: Fix GenSelect for ARM64
Sebastien Hertz [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am
3641ac7d: Merge "Add missing class initialization during compilation and tests"
* commit '
3641ac7de8b51c0853eaaa2ba3a3ab7e65a837c5':
Add missing class initialization during compilation and tests
Sebastien Hertz [Sat, 12 Jul 2014 01:42:15 +0000 (01:42 +0000)]
am
eab674a8: Merge "Fix missing single-step event"
* commit '
eab674a87b32794ae2c5e7d238292e56804de09d':
Fix missing single-step event
Sebastien Hertz [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am
49ab79da: Merge "Revert "Revert "Revert "Add intrinsic for Reference.get()""""
* commit '
49ab79da140b9ae79f9efca70c42eeaa84e361ff':
Revert "Revert "Revert "Add intrinsic for Reference.get()"""
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am
6a1f4ad1: Merge "Revert "Revert "Revert "Add implicit null and stack checks for x86""""
* commit '
6a1f4ad192e596b6bf43b39c26846300f401a692':
Revert "Revert "Revert "Add implicit null and stack checks for x86"""
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am
bd6b5dd3: Merge "Revert "Fix mac build""
* commit '
bd6b5dd3ce0f4d5454334d4848a97b00120b235e':
Revert "Fix mac build"
Christopher Ferris [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am
03c672f1: Merge "Revert "Revert "Add intrinsic for Reference.get()"""
* commit '
03c672f1a8e6cc5bef0348f1d321afb9b26ed53a':
Revert "Revert "Add intrinsic for Reference.get()""
Andreas Gampe [Sat, 12 Jul 2014 01:42:14 +0000 (01:42 +0000)]
am
75cb5a24: Merge "ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64"
* commit '
75cb5a2468dfa79600cec8668fc2e85bbc7334a7':
ART: Fix GenSelect and GenFusedLongCmpBranch for ARM64
Christopher Ferris [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am
7ee5cd17: Merge "Revert "Add intrinsic for Reference.get()""
* commit '
7ee5cd1789b098c72010cd26a873f1cd2513e1b1':
Revert "Add intrinsic for Reference.get()"
Dave Allison [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am
1190e0e4: Merge "Fix mac build"
* commit '
1190e0e48ae9f60383c02e1c30f3b9a7b01d5de4':
Fix mac build
Mathieu Chartier [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am
e2ebfb4c: Merge "Add intrinsic for Reference.get()"
* commit '
e2ebfb4c7c90863c8dae72723030bf1e2e0e4589':
Add intrinsic for Reference.get()
Mathieu Chartier [Sat, 12 Jul 2014 01:42:13 +0000 (01:42 +0000)]
am
9e5f302b: Merge "Change default heap maximum size to be 256m."
* commit '
9e5f302becd4fddb8e5a785e6522cb8602469730':
Change default heap maximum size to be 256m.
Mathieu Chartier [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am
9245c392: Merge "Fix race condition in release pages."
* commit '
9245c39291a4618f04687bdb970def80ae7061bd':
Fix race condition in release pages.
Ian Rogers [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am
18363662: Merge "Updates to help classes derived from X86Mir2Lir"
* commit '
183636622546ce73c8b67e586e0bc0799fe9c905':
Updates to help classes derived from X86Mir2Lir
Dave Allison [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am
da8a6975: Merge "Revert "Revert "Add implicit null and stack checks for x86"""
* commit '
da8a6975db267926bd5b8d5136144a822dac8e29':
Revert "Revert "Add implicit null and stack checks for x86""
Ian Rogers [Sat, 12 Jul 2014 01:42:12 +0000 (01:42 +0000)]
am
93279da4: Merge "ART: Do not dump hidden basic blocks and add a counter to file naming"
* commit '
93279da4a8475d187a0a2e75d50c88def5b4b8a5':
ART: Do not dump hidden basic blocks and add a counter to file naming
Andreas Gampe [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am
5a8ecafb: Merge "x86_64: Enable fp-reg promotion"
* commit '
5a8ecafb7fa63cf3ebb448bb1c904858e9c29717':
x86_64: Enable fp-reg promotion
Hiroshi Yamauchi [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am
0d2d031c: Merge "Improve the OOME fragmentation message."
* commit '
0d2d031c61e305b95b1fe3a8c70fd6aa5306a4c5':
Improve the OOME fragmentation message.
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am
477eea4f: Merge "ART: Add Invokes to DecodedInstruction"
* commit '
477eea4feb1dffdfc7a66376b9bcdf339dbe6c66':
ART: Add Invokes to DecodedInstruction
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am
fe12035e: Merge "ART: Handle Extended MIRs in a uniform manner"
* commit '
fe12035ea434be9b24f578cf51e53c3bb34d945c':
ART: Handle Extended MIRs in a uniform manner
Ian Rogers [Sat, 12 Jul 2014 01:42:11 +0000 (01:42 +0000)]
am
49b874b6: Merge "ART: Detached blocks should not be processed by compiler"
* commit '
49b874b65412a95f3bf0b1e6f60f3d457dca68da':
ART: Detached blocks should not be processed by compiler
Vladimir Marko [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am
f894f639: Merge "ART: Rename CallInlining to SpecialMethodInliner"
* commit '
f894f6394fcbcac1b000157939bf536985abeeec':
ART: Rename CallInlining to SpecialMethodInliner
Ian Rogers [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am
adce33da: Merge "Make CAS operations in Object use art::Atomic."
* commit '
adce33da293b0eeaaf52673338770f22be71ca5d':
Make CAS operations in Object use art::Atomic.
Andreas Gampe [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am
cba6b1fc: Merge "ART: Enable some ARM64 optimizations."
* commit '
cba6b1fc88fd54c35211fd49a7a7501cfcdaa170':
ART: Enable some ARM64 optimizations.
Andreas Gampe [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am
5fa647d5: Merge "Slow path for iget should expect return in core reg"
* commit '
5fa647d5f663033e4ed3d398aece1f8211d7f460':
Slow path for iget should expect return in core reg
Vladimir Marko [Sat, 12 Jul 2014 01:42:10 +0000 (01:42 +0000)]
am
fb16129c: Merge "Global Value Numbering."
* commit '
fb16129c3c62f73d00ab7570e147e497e787eaad':
Global Value Numbering.
Andreas Gampe [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am
b26d1905: Merge "ART: Refactor frontend.cc"
* commit '
b26d19057eb1ef931164859704ba7cab9cb7243a':
ART: Refactor frontend.cc
Vladimir Marko [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am
50fb2436: Merge "Handle potential <clinit>() correctly in LVN."
* commit '
50fb243619d337d20b56d2713d861166d48cb491':
Handle potential <clinit>() correctly in LVN.
Vladimir Marko [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am
723b2fc3: Merge "Faster deduplication in OatWriter."
* commit '
723b2fc3848bce9f26c54c7080099eba2fdb06ea':
Faster deduplication in OatWriter.
Ian Rogers [Sat, 12 Jul 2014 01:42:09 +0000 (01:42 +0000)]
am
b2bc3c97: Merge "Fix GC to use art::Atomic rather than compiler intrinsics."
* commit '
b2bc3c9791e093330be98bc6ca8fb92c41757cb1':
Fix GC to use art::Atomic rather than compiler intrinsics.
Andreas Gampe [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am
c4f72ec4: Merge "Use memory chunks for monitors on LP64"
* commit '
c4f72ec44660f804b595bfaf2b959f46fd2ff00d':
Use memory chunks for monitors on LP64
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am
af4cf5d7: Merge "Missed use of android_atomic and thread state_."
* commit '
af4cf5d72a2bf77f0e442bedb208f9227f262c89':
Missed use of android_atomic and thread state_.
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am
070dfc4c: Merge "Fix tracing."
* commit '
070dfc4cebb9772a646382be9751d8f4c6b7d69a':
Fix tracing.
Colin Cross [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am
d8079288: Merge "art: fix host dex2oat runtime args"
* commit '
d807928876744231ebbe2f07d17439f84d4e0185':
art: fix host dex2oat runtime args
Ian Rogers [Sat, 12 Jul 2014 01:42:08 +0000 (01:42 +0000)]
am
62526c37: Merge "Move thread state to art::Atomic."
* commit '
62526c377fe5242a723f154a373eccf5b9db416d':
Move thread state to art::Atomic.
Ian Rogers [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am
43b6fe02: Merge "Move another field away from android_atomic_cas."
* commit '
43b6fe0270477cd47f8dd8b064d006961a44be54':
Move another field away from android_atomic_cas.
Dave Allison [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am
672f8367: Merge "Revert "Add implicit null and stack checks for x86""
* commit '
672f8367f74e5db7d26714cd6fa1a13fa2a6c59f':
Revert "Add implicit null and stack checks for x86"
Ian Rogers [Sat, 12 Jul 2014 01:42:07 +0000 (01:42 +0000)]
am
4770a2e6: Merge "Remove legacy CAS implementations from mutex."
* commit '
4770a2e6d56398a6b4398fcce14fea43394e0d1b':
Remove legacy CAS implementations from mutex.
Mathieu Chartier [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am
bcb3b290: Merge "Add notion of released vs empty pages to ROSAlloc."
* commit '
bcb3b29095817ce8987d8310d4db87271f5114ad':
Add notion of released vs empty pages to ROSAlloc.
Dave Allison [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am
5de52242: Merge "Add implicit null and stack checks for x86"
* commit '
5de52242f3934f1604083d7215cdde1d0cc8ba7a':
Add implicit null and stack checks for x86
Ian Rogers [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am
2929490d: Merge "Move card table away from android_atomic_cas."
* commit '
2929490de9374c2a052cff4cf6957852ebf06d98':
Move card table away from android_atomic_cas.
Brian Carlstrom [Sat, 12 Jul 2014 01:42:06 +0000 (01:42 +0000)]
am
5472edce: Merge "CW on Master: Propagate or throw exception when no class found happens in interpreter."
* commit '
5472edce3697721099ead9e16427e0e7ace90754':
CW on Master: Propagate or throw exception when no class found happens in interpreter.
Elliott Hughes [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am
b288a5ad: Merge "Use the icu4c headers from the new location."
* commit '
b288a5ad024f99d593aef55e352b46c1a2868af7':
Use the icu4c headers from the new location.
Andreas Gampe [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am
91db19b5: Merge "ART: Add simple tests for inlining of CAS"
* commit '
91db19b5f14e32878e0a70fa8d43f3412586b821':
ART: Add simple tests for inlining of CAS
Mathieu Chartier [Sat, 12 Jul 2014 01:42:05 +0000 (01:42 +0000)]
am
ef9b94cc: Merge "Add easy way to ensure the next allocation does GC."
* commit '
ef9b94cc83595bc0c95b0edd5131187998919c7a':
Add easy way to ensure the next allocation does GC.
Dave Allison [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am
b796d1bf: Merge "Remove incorrect check for sa_mask in signal chaining"
* commit '
b796d1bfac8cfaf4dc98f411ae6157f964d4a325':
Remove incorrect check for sa_mask in signal chaining
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am
c21dc06a: Merge "ART: Check slow_paths_.Size() every time"
* commit '
c21dc06adc8c8447561208a3fb72ccf6d0443613':
ART: Check slow_paths_.Size() every time
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am
68e5f442: Merge "x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets"
* commit '
68e5f4421001a2ba885d822971c375368520ea8c':
x86_64: GenInlinedCas must use wide rl_src_offset under 64-bit targets
Ian Rogers [Sat, 12 Jul 2014 01:42:04 +0000 (01:42 +0000)]
am
a76dc41f: Merge "Allow method tracing for run-test"
* commit '
a76dc41fb21b6fba74f70188fdc53e1a5bf2c2cb':
Allow method tracing for run-test
Ian Rogers [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am
0f635b10: Merge "Fix method tracing from command-line"
* commit '
0f635b103c1fff6439d47bdae363afeffe7327fd':
Fix method tracing from command-line
Ian Rogers [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am
32710dd4: Merge "x86_64: enable Peek and Poke intrinsics"
* commit '
32710dd4a0232149002a5ae7bde1c640cdffd564':
x86_64: enable Peek and Poke intrinsics
Vladimir Marko [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am
62f28f94: Merge "Fix a compile assert name with inverted meaning."
* commit '
62f28f943e2da2873c7a09096c292f01a21c6478':
Fix a compile assert name with inverted meaning.
Vladimir Marko [Sat, 12 Jul 2014 01:42:03 +0000 (01:42 +0000)]
am
665f6810: Merge "Workaround for invalid monitor-exit catch ranges."
* commit '
665f681020ec313d6aea1aa26db582176d780079':
Workaround for invalid monitor-exit catch ranges.
Nicolas Geoffray [Sat, 12 Jul 2014 01:42:02 +0000 (01:42 +0000)]
am
8078b294: Merge "Revert "ART: Key-Value Store in Oat header""
* commit '
8078b294e8001abff5a6c8637e844b55a65fff4b':
Revert "ART: Key-Value Store in Oat header"
Ian Rogers [Sat, 12 Jul 2014 01:41:59 +0000 (01:41 +0000)]
am
608520c8: Merge "Adds PGO_GEN and PGO_USE for libart and libart-compiler."
* commit '
608520c8ba1adc7d8d0623b021b7ea509b00751c':
Adds PGO_GEN and PGO_USE for libart and libart-compiler.
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am
2cfe30bd: Merge "X86 Backend support for vectorized float and byte 16x16 operations"
* commit '
2cfe30bd592cb6ae63bb4c28ccaf4b069d6ab565':
X86 Backend support for vectorized float and byte 16x16 operations
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am
7b68fb3b: Merge "x86_64: Clean-up after cmp-long fix"
* commit '
7b68fb3b9b421d4b20c1993704986d637f1cab91':
x86_64: Clean-up after cmp-long fix
Ian Rogers [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am
dfc56e68: Merge "Clean-up call_x86.cc"
* commit '
dfc56e681beb055801491792026cb9976d8566e8':
Clean-up call_x86.cc
Andreas Gampe [Sat, 12 Jul 2014 01:41:58 +0000 (01:41 +0000)]
am
251a057f: Merge "ART: Fix FP promotion"
* commit '
251a057f52946452ac1c485b38d4ebafcf3bc5ad':
ART: Fix FP promotion
Brian Carlstrom [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am
dac3f4af: Merge "Whitelist another exception during dex2oat resolving."
* commit '
dac3f4afe1a3f5626836b6921230c150b68b9d34':
Whitelist another exception during dex2oat resolving.
Brian Carlstrom [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am
6e524ddc: Merge "Make dex2oat heap size product configurable [art]"
* commit '
6e524ddc060f10a493dc63fa5b6dde0deef22219':
Make dex2oat heap size product configurable [art]
Andreas Gampe [Sat, 12 Jul 2014 01:41:57 +0000 (01:41 +0000)]
am
3d30b073: Merge "ART: Do not emit load when inlining unused Thread.currentThread()"
* commit '
3d30b073541f19470e8b5dddef9377411fa587c3':
ART: Do not emit load when inlining unused Thread.currentThread()
Ian Rogers [Sat, 12 Jul 2014 01:41:56 +0000 (01:41 +0000)]
am
8746860d: Merge "Only allow instance-of to improve knowledge of a type for downcasts."
* commit '
8746860d056e64dcc832264e74bda9d511e86e2d':
Only allow instance-of to improve knowledge of a type for downcasts.
Ian Rogers [Mon, 14 Jul 2014 15:36:50 +0000 (15:36 +0000)]
Merge "Make generate-operator-out.py compatible with Python 3.x"