OSDN Git Service
Roland Levillain [Thu, 13 Aug 2015 11:13:20 +0000 (11:13 +0000)]
am
d942853d: am
7c2af0d8: Merge "Remove unnecessary `explicit` qualifiers on constructors."
* commit '
d942853d50c991d9d3c51333a50dee6d81623978':
Remove unnecessary `explicit` qualifiers on constructors.
Roland Levillain [Thu, 13 Aug 2015 11:06:35 +0000 (11:06 +0000)]
am
7c2af0d8: Merge "Remove unnecessary `explicit` qualifiers on constructors."
* commit '
7c2af0d873b7033adccf8fa7adf259166c53d369':
Remove unnecessary `explicit` qualifiers on constructors.
Roland Levillain [Thu, 13 Aug 2015 11:00:54 +0000 (11:00 +0000)]
Merge "Remove unnecessary `explicit` qualifiers on constructors."
Andreas Gampe [Thu, 13 Aug 2015 05:38:19 +0000 (05:38 +0000)]
am
0ead7ddf: am
1d4219ee: Merge "Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets"
* commit '
0ead7ddfde5270c4086b45d5cf9ef9ae48b22568':
Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets
Andreas Gampe [Thu, 13 Aug 2015 05:32:50 +0000 (05:32 +0000)]
am
1d4219ee: Merge "Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets"
* commit '
1d4219ee25dfb228cc72f353d97be69584fc0722':
Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets
Andreas Gampe [Thu, 13 Aug 2015 05:26:39 +0000 (05:26 +0000)]
am
1e14055e: am
8be64212: Merge "Structure for String.Equals intrinsic"
* commit '
1e14055e92dff0e1f5189daccb4feb91c0b021d9':
Structure for String.Equals intrinsic
Andreas Gampe [Thu, 13 Aug 2015 05:26:35 +0000 (05:26 +0000)]
Merge "Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets"
Andreas Gampe [Thu, 13 Aug 2015 05:20:08 +0000 (05:20 +0000)]
am
8be64212: Merge "Structure for String.Equals intrinsic"
* commit '
8be64212312ff2a1ccd9d4c007f7c679fe19483e':
Structure for String.Equals intrinsic
Andreas Gampe [Thu, 13 Aug 2015 05:13:11 +0000 (05:13 +0000)]
Merge "Structure for String.Equals intrinsic"
agicsaki [Thu, 13 Aug 2015 03:30:17 +0000 (20:30 -0700)]
Structure for String.Equals intrinsic
Added structure for implementing String.Equals intrinsics. There is no
functional change at this point- the intrinsic is marked as unimplemented
for all instruction sets and compilers.
Bug:
21481923
Change-Id: Ic2a1e22a113ff6091581126f12e926478c011340
agicsaki [Thu, 13 Aug 2015 04:20:43 +0000 (21:20 -0700)]
Intrinsics recognizer returns kNone for MIPS, MIPS64 instruction sets
Since no intrinsics are implemented in MIPS or MIPS64, the intrinsics
recognizer now does not mark methods as being intrinsified if the
current instruction set is either MIPS or MIPS64.
Change-Id: I9819ccd11d280e548623ad18add057eefefbf6d5
Andreas Gampe [Thu, 13 Aug 2015 03:07:28 +0000 (03:07 +0000)]
am
387d6e5f: am
a83cf577: Merge "Add support to indicate whether intrinsics require an environment"
* commit '
387d6e5fc1ef7656adaef02b496296b716ec84d3':
Add support to indicate whether intrinsics require an environment
Andreas Gampe [Thu, 13 Aug 2015 03:01:35 +0000 (03:01 +0000)]
am
a83cf577: Merge "Add support to indicate whether intrinsics require an environment"
* commit '
a83cf577d770f389f941b7798c8ea19d55a2e037':
Add support to indicate whether intrinsics require an environment
Andreas Gampe [Thu, 13 Aug 2015 02:54:37 +0000 (02:54 +0000)]
Merge "Add support to indicate whether intrinsics require an environment"
Mathieu Chartier [Thu, 13 Aug 2015 01:49:35 +0000 (01:49 +0000)]
am
8f394ff9: am
fe0e70b7: Merge "Wait for GC to finish in ThreadList::~ThreadList"
* commit '
8f394ff9574d422ddfd32e6f875c38b4332621e4':
Wait for GC to finish in ThreadList::~ThreadList
Mathieu Chartier [Thu, 13 Aug 2015 01:44:50 +0000 (01:44 +0000)]
am
fe0e70b7: Merge "Wait for GC to finish in ThreadList::~ThreadList"
* commit '
fe0e70b7631e40c107ad43934c066f975eb85343':
Wait for GC to finish in ThreadList::~ThreadList
Mathieu Chartier [Thu, 13 Aug 2015 01:38:18 +0000 (01:38 +0000)]
Merge "Wait for GC to finish in ThreadList::~ThreadList"
Mathieu Chartier [Wed, 12 Aug 2015 23:40:32 +0000 (16:40 -0700)]
Wait for GC to finish in ThreadList::~ThreadList
Added a DisableGC to the heap instead of using the runtime shutdown
boolean. The runtime shutting down boolean is set to true before the
non daemon threads have exited. These threads may still be doing
allocations and we don't want to throw OOME if unnecessary.
Bug:
18577101
Change-Id: Iceb7048e6bd799aa2716099459c54f8dc0fb8feb
agicsaki [Wed, 12 Aug 2015 00:39:37 +0000 (17:39 -0700)]
Add support to indicate whether intrinsics require an environment
A structural change to indicate whether a given intrinsic requires
access to an environment. I added a field to HInvoke objects to indicate
if they need an environment whose default value is true and is only updated
if an intrinsic is marked as not requiring an environment. At this point
there is no functional change, as all intrinsics are marked as requiring
an environment. This change adds the structure for future inliner work
which will allow us to inline more intrinsified calls.
Change-Id: I2930e3cef7b785384bf95b95a542d34af442f3b9
Mathieu Chartier [Thu, 13 Aug 2015 01:15:24 +0000 (01:15 +0000)]
am
b52b03e3: am
b923298c: Merge "Visit class roots from ClassLoader::VisitReferences"
* commit '
b52b03e3e79820f4ce3bee540d88d079d862d173':
Visit class roots from ClassLoader::VisitReferences
Mathieu Chartier [Thu, 13 Aug 2015 01:09:56 +0000 (01:09 +0000)]
am
b923298c: Merge "Visit class roots from ClassLoader::VisitReferences"
* commit '
b923298c9b6e47b4110dd0cb23cb6a4e98b8552b':
Visit class roots from ClassLoader::VisitReferences
Mathieu Chartier [Thu, 13 Aug 2015 01:01:38 +0000 (01:01 +0000)]
Merge "Visit class roots from ClassLoader::VisitReferences"
Andreas Gampe [Thu, 13 Aug 2015 00:40:38 +0000 (00:40 +0000)]
am
9348de40: am
b19b82bf: Merge "ART: Add correct -inl file"
* commit '
9348de404b7c5af74152961cba92313ebfa3b12b':
ART: Add correct -inl file
Andreas Gampe [Thu, 13 Aug 2015 00:02:55 +0000 (00:02 +0000)]
am
b19b82bf: Merge "ART: Add correct -inl file"
* commit '
b19b82bf6c8a55459fddcd55e86b162b2c0b9101':
ART: Add correct -inl file
Andreas Gampe [Wed, 12 Aug 2015 23:53:44 +0000 (23:53 +0000)]
Merge "ART: Add correct -inl file"
Andreas Gampe [Wed, 12 Aug 2015 23:43:03 +0000 (23:43 +0000)]
am
19d303f8: am
afd06a64: Merge "ART: Change UninitializedThis tracking in the verifier"
* commit '
19d303f801ea2bd07092e1e7624ddaf18e3aeae1':
ART: Change UninitializedThis tracking in the verifier
Andreas Gampe [Wed, 12 Aug 2015 23:42:06 +0000 (16:42 -0700)]
ART: Add correct -inl file
Follow-up to
f10b6e109bfb595b6752d1b59db680694ac1684d.
Bug:
20843113
Change-Id: Idfb9479c2cd242c2fbf748177177ae1cba0508d6
Andreas Gampe [Wed, 12 Aug 2015 23:36:32 +0000 (23:36 +0000)]
am
afd06a64: Merge "ART: Change UninitializedThis tracking in the verifier"
* commit '
afd06a644051d27ba3d3fe05c9e4397324b90472':
ART: Change UninitializedThis tracking in the verifier
Andreas Gampe [Wed, 12 Aug 2015 23:28:54 +0000 (23:28 +0000)]
Merge "ART: Change UninitializedThis tracking in the verifier"
Andreas Gampe [Wed, 12 Aug 2015 17:48:12 +0000 (10:48 -0700)]
ART: Change UninitializedThis tracking in the verifier
Only relying on register types is error-prone. For example, we may
inadvertently reject correct code when the constructor terminates
abnormally.
Bug:
20843113
Change-Id: I8826cd167780df25a6166740f183d216483fa550
Mathieu Chartier [Thu, 6 Aug 2015 22:34:15 +0000 (15:34 -0700)]
Visit class roots from ClassLoader::VisitReferences
This causes the classes of a class loader to get marked when that
class loader gets marked instead of during class root visiting.
Bug:
22720414
Change-Id: If53f042aff1d9f7bf94ecbe6886601edda029b7d
Mathieu Chartier [Wed, 12 Aug 2015 22:16:07 +0000 (22:16 +0000)]
am
4396e42c: am
82b844fb: Merge "Don\'t allow GC to start if the runtime is shutting down"
* commit '
4396e42c41c65d534d4d0096134dcce6c5586667':
Don't allow GC to start if the runtime is shutting down
Mathieu Chartier [Wed, 12 Aug 2015 22:06:50 +0000 (22:06 +0000)]
am
82b844fb: Merge "Don\'t allow GC to start if the runtime is shutting down"
* commit '
82b844fb449ddc5d7b4e43e71a55eb934a1b0b45':
Don't allow GC to start if the runtime is shutting down
Mathieu Chartier [Wed, 12 Aug 2015 22:02:02 +0000 (22:02 +0000)]
Merge "Don't allow GC to start if the runtime is shutting down"
Mathieu Chartier [Wed, 12 Aug 2015 20:53:06 +0000 (13:53 -0700)]
Don't allow GC to start if the runtime is shutting down
Daemon threads may be trying to do allocations as the runtime is
shutting down, don't allow GC to start since it touches the heap
and may cause crashes if it is running while we delete the heap
or thread list.
Bug:
18577101
Change-Id: I1404b41f2aee13d3c26acffdf588c985628beefc
Mathieu Chartier [Wed, 12 Aug 2015 20:37:16 +0000 (20:37 +0000)]
am
be008eac: am
6a6bd17f: Merge "Delete AllocationTimer"
* commit '
be008eacaa1de31fb00e6902d30b4188f1904519':
Delete AllocationTimer
Mathieu Chartier [Wed, 12 Aug 2015 20:31:15 +0000 (20:31 +0000)]
am
6a6bd17f: Merge "Delete AllocationTimer"
* commit '
6a6bd17f68c02139630796a615bd38b929c02e7a':
Delete AllocationTimer
Mathieu Chartier [Wed, 12 Aug 2015 20:22:34 +0000 (20:22 +0000)]
Merge "Delete AllocationTimer"
Mathieu Chartier [Wed, 12 Aug 2015 17:20:27 +0000 (10:20 -0700)]
Delete AllocationTimer
Not very useful, running benchmarks is better.
Bug:
19534862
Change-Id: I725830274e306621bffdabffdee602a03daf016f
Roland Levillain [Wed, 12 Aug 2015 18:02:36 +0000 (18:02 +0000)]
am
e0f35749: am
6065b5ba: Merge "Add a GVN dependency \'GC\' for garbage collection."
* commit '
e0f3574976fe4927c87d581dcebf99584259e5c1':
Add a GVN dependency 'GC' for garbage collection.
Roland Levillain [Wed, 12 Aug 2015 17:55:33 +0000 (17:55 +0000)]
am
6065b5ba: Merge "Add a GVN dependency \'GC\' for garbage collection."
* commit '
6065b5ba0668e88e85b550ce64bbac1037c3a6ab':
Add a GVN dependency 'GC' for garbage collection.
Roland Levillain [Wed, 12 Aug 2015 17:46:35 +0000 (17:46 +0000)]
Merge "Add a GVN dependency 'GC' for garbage collection."
Goran Jakovljevic [Wed, 12 Aug 2015 17:35:24 +0000 (17:35 +0000)]
am
6aec9dae: [MIPS] Avoid using odd numbered fp registers
* commit '
6aec9daecf37fcf02e47ffa7c8faa8a3de2dc412':
[MIPS] Avoid using odd numbered fp registers
Roland Levillain [Wed, 12 Aug 2015 17:15:42 +0000 (18:15 +0100)]
Remove unnecessary `explicit` qualifiers on constructors.
Change-Id: Id12e392ad50f66a6e2251a68662b7959315dc567
Alexandre Rames [Wed, 12 Aug 2015 12:43:29 +0000 (13:43 +0100)]
Add a GVN dependency 'GC' for garbage collection.
This will be used by incoming architecture specific optimizations. The
dependencies must be conservative. When an HInstruction is created we
may not be sure whether it can trigger GC. In that case the
'ChangesGC' dependency must be set. We control at code-generation time
that HInstructions that can call have the 'ChangesGC' dependency
set.
Change-Id: Iea6a7f430009f37a9599b0a0039207049906e45d
Roland Levillain [Wed, 12 Aug 2015 11:55:47 +0000 (11:55 +0000)]
am
4e5eb2df: am
6a5037eb: Merge "[optimizing] More x86_64 code improvements"
* commit '
4e5eb2df1006084acb4d13f5bb9b49f205586925':
[optimizing] More x86_64 code improvements
Roland Levillain [Wed, 12 Aug 2015 11:50:47 +0000 (11:50 +0000)]
am
6a5037eb: Merge "[optimizing] More x86_64 code improvements"
* commit '
6a5037eb3340e4c981fd7de3ff45167ee5b7fc82':
[optimizing] More x86_64 code improvements
Roland Levillain [Wed, 12 Aug 2015 11:43:20 +0000 (11:43 +0000)]
Merge "[optimizing] More x86_64 code improvements"
Mathieu Chartier [Wed, 12 Aug 2015 03:36:39 +0000 (03:36 +0000)]
am
bea313f7: am
2b562f40: Merge "Some heap cleanup"
* commit '
bea313f78251bc16d4788eb2d3d4c3b94beaafee':
Some heap cleanup
Mathieu Chartier [Wed, 12 Aug 2015 03:27:38 +0000 (03:27 +0000)]
am
2b562f40: Merge "Some heap cleanup"
* commit '
2b562f400cf9717f197ae3ae1f9a32c96769ef06':
Some heap cleanup
Mathieu Chartier [Wed, 12 Aug 2015 03:22:25 +0000 (03:22 +0000)]
Merge "Some heap cleanup"
Mathieu Chartier [Wed, 12 Aug 2015 00:35:25 +0000 (17:35 -0700)]
Some heap cleanup
Bug:
19534862
Change-Id: Ia63f489d26ec8813a263ce877bdbbc8c4e8fe5f4
Mathieu Chartier [Wed, 12 Aug 2015 00:24:21 +0000 (00:24 +0000)]
am
d50041b4: am
8ee8f322: Merge "Add daemon threads to 004-ThreadStress"
* commit '
d50041b498e4e69b12789ee21b618019607e1f29':
Add daemon threads to 004-ThreadStress
Mathieu Chartier [Wed, 12 Aug 2015 00:19:18 +0000 (00:19 +0000)]
am
8ee8f322: Merge "Add daemon threads to 004-ThreadStress"
* commit '
8ee8f3223bcf1ad5f3ee11d35c7b4105a48847d8':
Add daemon threads to 004-ThreadStress
Mathieu Chartier [Wed, 12 Aug 2015 00:12:18 +0000 (00:12 +0000)]
Merge "Add daemon threads to 004-ThreadStress"
Roland Levillain [Tue, 11 Aug 2015 22:54:06 +0000 (22:54 +0000)]
am
7d6f3b84: am
548a3ce2: Merge "[MIPS] Avoid using odd numbered fp registers"
* commit '
7d6f3b84d2392d085a97d59d21bc556b9d08b3ea':
[MIPS] Avoid using odd numbered fp registers
Roland Levillain [Tue, 11 Aug 2015 22:40:46 +0000 (22:40 +0000)]
am
548a3ce2: Merge "[MIPS] Avoid using odd numbered fp registers"
* commit '
548a3ce2625bc1da12034411036e5a94da183696':
[MIPS] Avoid using odd numbered fp registers
Goran Jakovljevic [Tue, 28 Jul 2015 12:26:12 +0000 (14:26 +0200)]
[MIPS] Avoid using odd numbered fp registers
Don't use odd numbered fp registers for single precision data on
MIPS32r6 (64-bit FPU).
Bug:
23050326
Change-Id: I35cc19df091149773411e2336b01c170929376bc
(cherry picked from commit
fc8156a3df88e259c892d50bf23f7c4f11531844)
Serguei Katkov [Tue, 11 Aug 2015 22:37:19 +0000 (22:37 +0000)]
am
0d9982da: ART: Fix Quick\'s DCE+GVN
* commit '
0d9982daaff119e709d0424a700042751120bd60':
ART: Fix Quick's DCE+GVN
Roland Levillain [Tue, 11 Aug 2015 22:34:21 +0000 (22:34 +0000)]
Merge "[MIPS] Avoid using odd numbered fp registers"
Mathieu Chartier [Tue, 11 Aug 2015 21:29:02 +0000 (21:29 +0000)]
am
0a21435a: am
4500fcbe: Merge "Address some comments"
* commit '
0a21435a7bc26267424c244e274080e500255ab9':
Address some comments
Mathieu Chartier [Tue, 11 Aug 2015 21:21:38 +0000 (21:21 +0000)]
am
4500fcbe: Merge "Address some comments"
* commit '
4500fcbe682d666a24c2e8f6e0cb90cfb35d3fa3':
Address some comments
Mathieu Chartier [Tue, 11 Aug 2015 21:13:37 +0000 (21:13 +0000)]
Merge "Address some comments"
Mathieu Chartier [Tue, 11 Aug 2015 20:01:23 +0000 (13:01 -0700)]
Address some comments
Change-Id: I0262304cc720a0e93015955d0a7fb05dfebe213e
Nicolas Geoffray [Tue, 11 Aug 2015 17:54:41 +0000 (17:54 +0000)]
am
afaa59f9: am
ff2ac94e: Merge "Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit."""
* commit '
afaa59f9f9852beb3edbce9d6a4d0a46b8a7946d':
Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
Nicolas Geoffray [Tue, 11 Aug 2015 17:50:39 +0000 (17:50 +0000)]
am
ff2ac94e: Merge "Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit."""
* commit '
ff2ac94ebd542c0b3bdb6812a96363ed56df09f0':
Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
Nicolas Geoffray [Tue, 11 Aug 2015 17:42:21 +0000 (17:42 +0000)]
Merge "Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit."""
Serguei Katkov [Mon, 10 Aug 2015 06:59:02 +0000 (12:59 +0600)]
ART: Fix Quick's DCE+GVN
DCE_GVN does not take into account the following case:
mov a, b
...
mov c, b
when optimization tries to replace a with c it must ensure that
for all uses of a there is no new definition of c before use.
Otherwise that use will incorrectly substituted with new c instead
of original b.
Bug:
23102860
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
2f2f17399f6bdfc5ec94a875152c31ef79620520)
Change-Id: I1f08c99cedbe4fd1b96cad11f17d60ab551c7cf7
Vladimir Marko [Tue, 11 Aug 2015 14:38:13 +0000 (14:38 +0000)]
am
32fd898f: am
adbd0e5c: Merge "ART: Fix Quick\'s DCE+GVN"
* commit '
32fd898f507474727a7018910df8f14f6973551c':
ART: Fix Quick's DCE+GVN
Calin Juravle [Tue, 11 Aug 2015 14:38:12 +0000 (14:38 +0000)]
am
594bd824: am
423f150e: Merge "ART-Optimizing: Fix the type of HDivZeroCheck"
* commit '
594bd8243611f7f03130cd3e43033a0625136995':
ART-Optimizing: Fix the type of HDivZeroCheck
Mark Mendell [Mon, 25 May 2015 20:02:44 +0000 (16:02 -0400)]
[optimizing] More x86_64 code improvements
Use the constant area some more, use 32-bit immediates in movq
instructions when possible, and other small tweaks.
Remove the commented out code for Math.Abs(float/double) as it would
fail for baseline compiler due to the output being the same as the
input.
Change-Id: Ifa39f1865b94cec2e1c0a99af3066a645e9d3618
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Vladimir Marko [Tue, 11 Aug 2015 14:31:54 +0000 (14:31 +0000)]
am
adbd0e5c: Merge "ART: Fix Quick\'s DCE+GVN"
* commit '
adbd0e5c3a9a9fce4ad49c48d7a4212f3d18cfcc':
ART: Fix Quick's DCE+GVN
Calin Juravle [Tue, 11 Aug 2015 14:31:53 +0000 (14:31 +0000)]
am
423f150e: Merge "ART-Optimizing: Fix the type of HDivZeroCheck"
* commit '
423f150e5c17b5f4cd16259565b61c57f5f19477':
ART-Optimizing: Fix the type of HDivZeroCheck
Vladimir Marko [Tue, 11 Aug 2015 14:28:04 +0000 (14:28 +0000)]
Merge "ART: Fix Quick's DCE+GVN"
Calin Juravle [Tue, 11 Aug 2015 14:25:45 +0000 (14:25 +0000)]
Merge "ART-Optimizing: Fix the type of HDivZeroCheck"
Serguei Katkov [Mon, 10 Aug 2015 06:59:02 +0000 (12:59 +0600)]
ART: Fix Quick's DCE+GVN
DCE_GVN does not take into account the following case:
mov a, b
...
mov c, b
when optimization tries to replace a with c it must ensure that
for all uses of a there is no new definition of c before use.
Otherwise that use will incorrectly substituted with new c instead
of original b.
Bug:
23102860
Change-Id: I48ee0bd4386419b0f9c814c21b3537a392518cd1
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Serguei Katkov [Mon, 3 Aug 2015 07:55:33 +0000 (13:55 +0600)]
ART-Optimizing: Fix the type of HDivZeroCheck
HDivZeroCheck is created during the building CFG and at this moment
its type is not known completely. So it sets the type to int or long.
However, later SSA builder can insert the type conversion and type
of input of HDivZeroCheck can become byte or short while the type
of HDivZeroCheck remains the same.
In reality the type of HDivZeroCheck should be always equal to
its input parameter.
To fix this inconsistency we return the type of HDivZeroCheck as its
input type. Code generators are updated accordingly.
Change-Id: I6a5aedc8d479cfc6328704e7ddf252bca830076b
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Nicolas Geoffray [Tue, 11 Aug 2015 02:14:38 +0000 (02:14 +0000)]
Revert "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
bug:
22866717
This reverts commit
f25b661b3708c865cdaa0a018372a42881353bea.
Change-Id: I95e8310e6c3d8e6edb736fdefcabf602cce3a4e0
Andreas Gampe [Tue, 11 Aug 2015 01:34:20 +0000 (01:34 +0000)]
am
a666edc4: am
f24576a7: Merge "ART: Change UnresolvedMergedType merge"
* commit '
a666edc48d68f082b1b78c45930a3e4c581d88d3':
ART: Change UnresolvedMergedType merge
Andreas Gampe [Tue, 11 Aug 2015 01:24:35 +0000 (01:24 +0000)]
am
f24576a7: Merge "ART: Change UnresolvedMergedType merge"
* commit '
f24576a7233ec708d49badb239cd7336c2b0f07e':
ART: Change UnresolvedMergedType merge
Andreas Gampe [Tue, 11 Aug 2015 01:18:15 +0000 (01:18 +0000)]
Merge "ART: Change UnresolvedMergedType merge"
Andreas Gampe [Tue, 11 Aug 2015 01:09:57 +0000 (01:09 +0000)]
am
168387df: ART: Change UnresolvedMergedType merge
* commit '
168387df8dcbae1b51f124eed84daf8e8de6a974':
ART: Change UnresolvedMergedType merge
Andreas Gampe [Tue, 11 Aug 2015 00:15:32 +0000 (17:15 -0700)]
ART: Change UnresolvedMergedType merge
Change to use IsUnresolvedTypes.
Bug:
22881413
(cherry picked from commit
168387df8dcbae1b51f124eed84daf8e8de6a974)
Change-Id: Ic27b97b475b28a5bdf994ea5178767e0efb0e752
Andreas Gampe [Tue, 11 Aug 2015 00:15:32 +0000 (17:15 -0700)]
ART: Change UnresolvedMergedType merge
Change to use IsUnresolvedTypes.
Bug:
22881413
Change-Id: Ic27b97b475b28a5bdf994ea5178767e0efb0e752
Andreas Gampe [Mon, 10 Aug 2015 23:51:38 +0000 (23:51 +0000)]
am
f695a009: (-s ours) ART: Change UnresolvedMergedType internal representation
* commit '
f695a009725c8c840d916d01c14998f5c5f816d2':
ART: Change UnresolvedMergedType internal representation
Man Cao [Mon, 10 Aug 2015 22:51:27 +0000 (15:51 -0700)]
Add daemon threads to 004-ThreadStress
Bug:
19537976
Change-Id: I129e311aa6f7ca4f49d64ec50c0e07857b12b6d8
Andreas Gampe [Fri, 7 Aug 2015 15:29:13 +0000 (08:29 -0700)]
Andreas Gampe [Mon, 10 Aug 2015 20:08:06 +0000 (20:08 +0000)]
am
225bee50: am
32a67404: Merge "ART: Fix reg_type_test"
* commit '
225bee50ffd091eae3480ab6b7b72c7232bb5f00':
ART: Fix reg_type_test
Andreas Gampe [Mon, 10 Aug 2015 20:08:04 +0000 (20:08 +0000)]
am
b1a71fa2: am
ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
* commit '
b1a71fa2355f737a1060c8064d0fb5fbc7b17496':
ART: Add complex UnresolvedMergedType test case
Andreas Gampe [Mon, 10 Aug 2015 20:08:03 +0000 (20:08 +0000)]
am
f0cdebde: am
081da0ad: Merge "ART: Change UnresolvedMergedType internal representation"
* commit '
f0cdebde0b0563758ce8bc27b8984a2623e50fd1':
ART: Change UnresolvedMergedType internal representation
Mathieu Chartier [Mon, 10 Aug 2015 20:08:02 +0000 (20:08 +0000)]
am
d6e41186: am
4814bbd6: Merge "Do read barriers on native roots in CopyClassVisitor"
* commit '
d6e411869989cadf9944042ab247ca57fb6d2c55':
Do read barriers on native roots in CopyClassVisitor
Andreas Gampe [Mon, 10 Aug 2015 18:55:57 +0000 (18:55 +0000)]
am
32a67404: Merge "ART: Fix reg_type_test"
* commit '
32a67404baa40664e9ace8eac81be0f4704413a5':
ART: Fix reg_type_test
Andreas Gampe [Mon, 10 Aug 2015 18:46:55 +0000 (18:46 +0000)]
Merge "ART: Fix reg_type_test"
Andreas Gampe [Mon, 10 Aug 2015 18:45:24 +0000 (11:45 -0700)]
ART: Fix reg_type_test
Follow-up to
750f7c2827318f6d07620f2ef0321218ea4d8670.
Bug:
22881413
Change-Id: Iaea4cc29ed680710d01532124bc472547ee18bdb
Nicolas Geoffray [Mon, 10 Aug 2015 18:32:11 +0000 (18:32 +0000)]
am
6e9c66e0: Fix a bug in the register allocator around pair allocation.
* commit '
6e9c66e099654b63ed3648bda2daeaf0a862f047':
Fix a bug in the register allocator around pair allocation.
Andreas Gampe [Mon, 10 Aug 2015 18:31:12 +0000 (18:31 +0000)]
am
ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
* commit '
ebccaad3ad6bd32f7a37addc5df2381ce988846e':
ART: Add complex UnresolvedMergedType test case
Andreas Gampe [Mon, 10 Aug 2015 18:31:10 +0000 (18:31 +0000)]
am
081da0ad: Merge "ART: Change UnresolvedMergedType internal representation"
* commit '
081da0add911757a48df74e6ae817af1de6e047d':
ART: Change UnresolvedMergedType internal representation
Andreas Gampe [Mon, 10 Aug 2015 18:26:59 +0000 (18:26 +0000)]
Merge "ART: Add complex UnresolvedMergedType test case"
Andreas Gampe [Mon, 10 Aug 2015 18:26:46 +0000 (18:26 +0000)]
Merge "ART: Change UnresolvedMergedType internal representation"
Mathieu Chartier [Mon, 10 Aug 2015 18:22:33 +0000 (18:22 +0000)]
am
4814bbd6: Merge "Do read barriers on native roots in CopyClassVisitor"
* commit '
4814bbd62306dfe07a68cc5def6aad115bebc45f':
Do read barriers on native roots in CopyClassVisitor