OSDN Git Service
Vladimir Marko [Tue, 13 Dec 2016 12:26:04 +0000 (12:26 +0000)]
Merge "Fix string compression for embedded zero chars." am:
3a0c53f93c am:
c65eecb3db
am:
9ef5ec8352
Change-Id: I0580050454c1eff6ad0cb1574ab08f105961d2ef
Vladimir Marko [Tue, 13 Dec 2016 12:19:05 +0000 (12:19 +0000)]
Merge "Fix string compression for embedded zero chars." am:
3a0c53f93c
am:
c65eecb3db
Change-Id: Ic99fcb0661cc42ffa9ee1b71efd80a3299549a58
Vladimir Marko [Tue, 13 Dec 2016 12:12:34 +0000 (12:12 +0000)]
Merge "Fix string compression for embedded zero chars."
am:
3a0c53f93c
Change-Id: Iafa28e39957877e329365ed9e7fd991bdd3baee6
Treehugger Robot [Tue, 13 Dec 2016 12:04:20 +0000 (12:04 +0000)]
Merge "Fix string compression for embedded zero chars."
Vladimir Marko [Fri, 9 Dec 2016 14:01:02 +0000 (14:01 +0000)]
Fix string compression for embedded zero chars.
Treat embedded zero character as non-ASCII.
Test: m test-art-host
Test: m test-art-host with string compression enabled.
Bug:
31040547
Change-Id: Iea6e92f89d424953814953ba27f1c7a991589c65
Nicolas Geoffray [Tue, 13 Dec 2016 09:57:26 +0000 (09:57 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am:
fb678bfaad am:
44f89e9d66
am:
ededdac837
Change-Id: I1dbee8567217d5cb588d1329b0f6793abad4f454
Nicolas Geoffray [Tue, 13 Dec 2016 09:50:26 +0000 (09:50 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass.""" am:
fb678bfaad
am:
44f89e9d66
Change-Id: I6747d99600d4e330390450d16f1d527ae13161fe
Nicolas Geoffray [Tue, 13 Dec 2016 09:43:56 +0000 (09:43 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
am:
fb678bfaad
Change-Id: I35eb743806ca582d729ddbe8a95719a4959d8599
Nicolas Geoffray [Tue, 13 Dec 2016 09:34:11 +0000 (09:34 +0000)]
Merge "Revert "Revert "Add kJitTableAddress for HLoadClass."""
Andreas Gampe [Mon, 12 Dec 2016 23:52:51 +0000 (23:52 +0000)]
Merge "ART: Add missing space in log line" am:
7c73bf3518 am:
eb05504443
am:
65879652e4
Change-Id: Ic8705f76134d4bdf8ffd38c0613c867ef1654be0
Andreas Gampe [Mon, 12 Dec 2016 23:47:20 +0000 (23:47 +0000)]
Merge "ART: Add missing space in log line" am:
7c73bf3518
am:
eb05504443
Change-Id: I809a37228909ab7fe052b72360b91f9f2a275a1c
Andreas Gampe [Mon, 12 Dec 2016 23:41:21 +0000 (23:41 +0000)]
Merge "ART: Add missing space in log line"
am:
7c73bf3518
Change-Id: Ie69f9cd33fc6b1bb91db015558e1547b14b78d5f
Treehugger Robot [Mon, 12 Dec 2016 23:31:26 +0000 (23:31 +0000)]
Merge "ART: Add missing space in log line"
Nicolas Geoffray [Mon, 12 Dec 2016 22:33:36 +0000 (22:33 +0000)]
Revert "Revert "Add kJitTableAddress for HLoadClass.""
This reverts commit
d2d5262c8370309e1f2a009f00aafc24f1cf00a0.
Change-Id: I6149d5c7d5df0b0fc5cb646a802a2eea8d01ac08
Andreas Gampe [Mon, 12 Dec 2016 21:57:02 +0000 (21:57 +0000)]
Merge changes Ieb86f678,I8e7280f0 am:
0ee6447c63 am:
83f645be5f
am:
2a37bbaea7
Change-Id: Ic3f09c62b353e4f630826284627ecfc5a3a75243
Andreas Gampe [Mon, 12 Dec 2016 21:56:54 +0000 (21:56 +0000)]
ART: Stack locals am:
f10dfcdb76 am:
19a970d771
am:
45cbb1cf63
Change-Id: I6f92f38ceb356ce8bc0aee1bf2cd2e25ed0a54a2
Andreas Gampe [Mon, 12 Dec 2016 21:56:44 +0000 (21:56 +0000)]
ART: Add precise root visiting am:
585da955bc am:
96d174d1f8
am:
346bba2bb3
Change-Id: I0f58c8e66fc80799c950e08ba714c4afba39d076
Andreas Gampe [Mon, 12 Dec 2016 21:50:59 +0000 (21:50 +0000)]
Merge changes Ieb86f678,I8e7280f0 am:
0ee6447c63
am:
83f645be5f
Change-Id: Ie29863a56154012a8721d48beb6d753c159bbe72
Alex Light [Mon, 12 Dec 2016 21:50:58 +0000 (21:50 +0000)]
Merge "Disable test 964 with no-image" am:
d9fb4dd3f9 am:
7af0c534cf
am:
ee52aed804
Change-Id: Id7e0e52292aabc20a708f0f8e78593dd427c35b4
Andreas Gampe [Mon, 12 Dec 2016 21:50:51 +0000 (21:50 +0000)]
ART: Stack locals am:
f10dfcdb76
am:
19a970d771
Change-Id: I0a7bbb1e5e53e9c4608207d01c76f63c52960b13
Andreas Gampe [Mon, 12 Dec 2016 21:50:43 +0000 (21:50 +0000)]
ART: Add precise root visiting am:
585da955bc
am:
96d174d1f8
Change-Id: I4f735069322426612ddc0b449bc0c6ab21da781c
Andreas Gampe [Mon, 12 Dec 2016 21:50:42 +0000 (21:50 +0000)]
Merge "ART: Report cputime in dex2oat" am:
3c7b8f4c45 am:
1d0095825d
am:
ee65c9f5fa
Change-Id: Ie50d774d1c007b3b9079d5b9ca149d1a25792c3b
Andreas Gampe [Mon, 12 Dec 2016 21:49:00 +0000 (13:49 -0800)]
ART: Add missing space in log line
Follow-up to commit
c560fc0b430816825add4125134b20eb791f6036.
Test: m
Change-Id: Ie558b2984ec629706d2122eca9dd96b8c3497298
Alex Light [Mon, 12 Dec 2016 21:45:28 +0000 (21:45 +0000)]
Merge "Disable test 964 with no-image" am:
d9fb4dd3f9
am:
7af0c534cf
Change-Id: Ia439f4420259ac64b0ff325d3edb7be44a301fb0
Andreas Gampe [Mon, 12 Dec 2016 21:45:24 +0000 (21:45 +0000)]
Merge changes Ieb86f678,I8e7280f0
am:
0ee6447c63
Change-Id: If0ddecf05d828c42a50b77916c4a350389269bcb
Andreas Gampe [Mon, 12 Dec 2016 21:45:23 +0000 (21:45 +0000)]
ART: Stack locals
am:
f10dfcdb76
Change-Id: I1a3b0eb5f7a55602bc7606c2d7097f0f58271704
Andreas Gampe [Mon, 12 Dec 2016 21:45:13 +0000 (21:45 +0000)]
ART: Add precise root visiting
am:
585da955bc
Change-Id: I3dca109401326b4494de963d37c490f2185beb61
Andreas Gampe [Mon, 12 Dec 2016 21:45:12 +0000 (21:45 +0000)]
Merge "ART: Report cputime in dex2oat" am:
3c7b8f4c45
am:
1d0095825d
Change-Id: I61ce6121f4ef804cb7b90ba12bdbc8c0c907fb8d
Alex Light [Mon, 12 Dec 2016 21:39:32 +0000 (21:39 +0000)]
Merge "Disable test 964 with no-image"
am:
d9fb4dd3f9
Change-Id: I398437a3be31d2913de3209c65d3c73885ec4ea2
Andreas Gampe [Mon, 12 Dec 2016 21:39:16 +0000 (21:39 +0000)]
Merge "ART: Report cputime in dex2oat"
am:
3c7b8f4c45
Change-Id: Ib1709151de04c20b452580a2e4c2a7ea36f9cb5f
Treehugger Robot [Mon, 12 Dec 2016 21:38:28 +0000 (21:38 +0000)]
Merge changes Ieb86f678,I8e7280f0
* changes:
ART: Stack locals
ART: Add precise root visiting
Alex Light [Mon, 12 Dec 2016 21:33:25 +0000 (21:33 +0000)]
Merge "Disable test 964 with no-image"
Treehugger Robot [Mon, 12 Dec 2016 21:29:20 +0000 (21:29 +0000)]
Merge "ART: Report cputime in dex2oat"
Andreas Gampe [Fri, 2 Dec 2016 22:42:33 +0000 (14:42 -0800)]
ART: Stack locals
Add reporting of stack-locals roots. Use the new
precise root visiting to get dalvik register
information for compiled frames.
Bug:
31385354
Test: m test-art-host-run-test-913-heaps
Change-Id: Ieb86f67829e546692c30faa08eb44e8dcf2b2c6a
Andreas Gampe [Fri, 2 Dec 2016 22:52:29 +0000 (14:52 -0800)]
ART: Add precise root visiting
Add VisitRootFlags::kVisitRootFlagPrecise to signal a
request for precise RootInfo objects.
Move VisitRootFlags to gc_root.h. Refactor VisitRoot
functions to pass flags. Add code in Thread visiting
to decode vregs in compiled code.
Bug:
31385354
Test: m test-art-host
Change-Id: I8e7280f0ab682871f729f2a1c6b18670cf2dbf82
Andreas Gampe [Mon, 12 Dec 2016 19:41:35 +0000 (19:41 +0000)]
Merge "ART: Implement FollowReferences for initial object" am:
ce29d18139 am:
e70e46afb6
am:
00be6c2fb8
Change-Id: I987772f0153d73e0ea8904c70bb72a23e3e8aeea
Andreas Gampe [Mon, 12 Dec 2016 19:35:04 +0000 (19:35 +0000)]
Merge "ART: Implement FollowReferences for initial object" am:
ce29d18139
am:
e70e46afb6
Change-Id: Ief02c6b4d7a5b4c56bb66ba78aaa9c54fdd0a1a2
Andreas Gampe [Mon, 12 Dec 2016 19:29:03 +0000 (19:29 +0000)]
Merge "ART: Implement FollowReferences for initial object"
am:
ce29d18139
Change-Id: I350196d99ee333320aeda6bced525dcac382bad9
Andreas Gampe [Wed, 16 Jul 2014 16:57:39 +0000 (09:57 -0700)]
ART: Report cputime in dex2oat
Add ProcessCpuNanoTime. Log cputime in dex2oat completion message.
Sample:
dex2oat took 20.036s(64.843s cpu) (threads: 48) arena alloc=25MB (
26760672B) java alloc=2MB (
2311688B) native alloc=44MB (
46792784B) free=35MB (
37502896B)
Test: m test-art-host
Change-Id: I78646c4808c8205f7f8e7995a82a1ba63cd15298
Treehugger Robot [Mon, 12 Dec 2016 19:16:43 +0000 (19:16 +0000)]
Merge "ART: Implement FollowReferences for initial object"
Mathieu Chartier [Mon, 12 Dec 2016 18:52:32 +0000 (18:52 +0000)]
Merge "Use store release for resolved types" am:
7d785fca4f am:
afe7270684
am:
b4472aa28a
Change-Id: I68982f5e10a02f53ab689f1667f848af1ade202f
Mathieu Chartier [Mon, 12 Dec 2016 18:46:04 +0000 (18:46 +0000)]
Merge "Use store release for resolved types" am:
7d785fca4f
am:
afe7270684
Change-Id: I96ae60263063e098e246ef9bcb8355ccc56cda92
Alex Light [Mon, 12 Dec 2016 18:39:50 +0000 (10:39 -0800)]
Disable test 964 with no-image
It often times out due to the large number of classes involved in the
test. Since it doesn't test anything particularly interesting for the
no-image case we are disabling it to reduce flakiness.
Test: TEST_ART_RUN_TEST_NO_IMAGE=true mma -j40 test-art-host
Change-Id: I9e51481e52dd1eb332d7563795f490b0e97001a5
Mathieu Chartier [Mon, 12 Dec 2016 18:39:01 +0000 (18:39 +0000)]
Merge "Use store release for resolved types"
am:
7d785fca4f
Change-Id: I33d3cc9daeedf6f63c5a2f2c97bf5abea39cce3b
Mathieu Chartier [Mon, 12 Dec 2016 18:32:57 +0000 (18:32 +0000)]
Merge "Use store release for resolved types"
Nicolas Geoffray [Mon, 12 Dec 2016 16:49:55 +0000 (16:49 +0000)]
Merge "Revert "Add kJitTableAddress for HLoadClass."" am:
4dd3f7d2e9 am:
a7f380facb
am:
d7325e3458
Change-Id: I407e1b979b87b15c95747e18ceb31b9f6faac7ea
Nicolas Geoffray [Mon, 12 Dec 2016 16:44:00 +0000 (16:44 +0000)]
Merge "Revert "Add kJitTableAddress for HLoadClass."" am:
4dd3f7d2e9
am:
a7f380facb
Change-Id: I769694709150e857a6189cff5bc09db78afdb8bd
Nicolas Geoffray [Mon, 12 Dec 2016 16:37:28 +0000 (16:37 +0000)]
Merge "Revert "Add kJitTableAddress for HLoadClass.""
am:
4dd3f7d2e9
Change-Id: Ib55836b23c6cb5d61c09ef3d0b7dd45ee90915db
Nicolas Geoffray [Mon, 12 Dec 2016 16:29:18 +0000 (16:29 +0000)]
Merge "Revert "Add kJitTableAddress for HLoadClass.""
Nicolas Geoffray [Mon, 12 Dec 2016 16:28:54 +0000 (16:28 +0000)]
Revert "Add kJitTableAddress for HLoadClass."
One test failure after merge.
This reverts commit
5b12f7973636bfea29da3956a9baa7a6bbe2b666.
Change-Id: I120c49e53274471fc1c82a10d52e99c83f5f85cc
Nicolas Geoffray [Mon, 12 Dec 2016 15:44:22 +0000 (15:44 +0000)]
Merge "Add kJitTableAddress for HLoadClass." am:
7d81bf2c9d am:
72c25940b7
am:
eff3dbc857
Change-Id: I77043fe4470dfcd074b36b98e91b50ff8b9735fe
Nicolas Geoffray [Mon, 12 Dec 2016 15:37:22 +0000 (15:37 +0000)]
Merge "Add kJitTableAddress for HLoadClass." am:
7d81bf2c9d
am:
72c25940b7
Change-Id: Ie98f521889cfe38313e50e0d6d792e6bd6c4c5a2
Nicolas Geoffray [Mon, 12 Dec 2016 15:30:51 +0000 (15:30 +0000)]
Merge "Add kJitTableAddress for HLoadClass."
am:
7d81bf2c9d
Change-Id: If90c5e91c2be184f5c521d881e2a060830750eb6
Nicolas Geoffray [Mon, 12 Dec 2016 15:26:10 +0000 (15:26 +0000)]
Merge "Add kJitTableAddress for HLoadClass."
Nicolas Geoffray [Fri, 9 Dec 2016 11:26:35 +0000 (11:26 +0000)]
Add kJitTableAddress for HLoadClass.
This new kind loads classes from the root table associated with
JIT compiled code.
Also remove kDexCacheAddress, which is replaced by kJitTableAddress.
test: ART_TEST_JIT=true test-art-host-jit test-art-target-jit
Change-Id: Ia23029688d1a60c178bf2ffa7463927c5d5de4d0
Nicolas Geoffray [Mon, 12 Dec 2016 10:50:22 +0000 (10:50 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Use DontCare for SetFlags + fix for GenerateFrameEntry.""" am:
c836b5a8a5 am:
c0e81e3b14
am:
c0dc4b6dd3
Change-Id: I94f52d4b227de465930db21a92d9d8c09d68234a
Vladimir Marko [Mon, 12 Dec 2016 10:50:04 +0000 (10:50 +0000)]
Merge "Revert^8 "Make sure that const-class linkage is preserved."" am:
726e517305 am:
cc17df57df
am:
a675738c45
Change-Id: Icc9cd4db0dda874a55dca2ea5b6110377c5765b0
Nicolas Geoffray [Mon, 12 Dec 2016 10:43:52 +0000 (10:43 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Use DontCare for SetFlags + fix for GenerateFrameEntry.""" am:
c836b5a8a5
am:
c0e81e3b14
Change-Id: I27bb93eb6b1a41a15d38f44ffc99c11608c05a25
Vladimir Marko [Mon, 12 Dec 2016 10:43:35 +0000 (10:43 +0000)]
Merge "Revert^8 "Make sure that const-class linkage is preserved."" am:
726e517305
am:
cc17df57df
Change-Id: Id8e64545e8c8a6ce1eb7453434afa9c310ffa9ae
Nicolas Geoffray [Mon, 12 Dec 2016 10:37:25 +0000 (10:37 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Use DontCare for SetFlags + fix for GenerateFrameEntry."""
am:
c836b5a8a5
Change-Id: I99d7792e8107b29aea43355851f74f58ccf55d0d
Vladimir Marko [Mon, 12 Dec 2016 10:37:05 +0000 (10:37 +0000)]
Merge "Revert^8 "Make sure that const-class linkage is preserved.""
am:
726e517305
Change-Id: I4eee4925831c3366e413b48e92c75c068a312b0a
Nicolas Geoffray [Mon, 12 Dec 2016 10:37:04 +0000 (10:37 +0000)]
Merge "Use System.out only." am:
bf4e45476d am:
a88879327e
am:
380de657d1
Change-Id: I5af86da96c82a92729c42abd948e2c7200b79503
Nicolas Geoffray [Mon, 12 Dec 2016 10:30:34 +0000 (10:30 +0000)]
Merge "Use System.out only." am:
bf4e45476d
am:
a88879327e
Change-Id: I60cae80d40c3602fd12553939595c28a1f3f6849
Nicolas Geoffray [Mon, 12 Dec 2016 10:30:24 +0000 (10:30 +0000)]
Merge "Revert "Revert "ARM: VIXL32: Use DontCare for SetFlags + fix for GenerateFrameEntry."""
Vladimir Marko [Mon, 12 Dec 2016 10:29:49 +0000 (10:29 +0000)]
Merge "Revert^8 "Make sure that const-class linkage is preserved.""
Nicolas Geoffray [Mon, 12 Dec 2016 10:24:33 +0000 (10:24 +0000)]
Merge "Use System.out only."
am:
bf4e45476d
Change-Id: I511dd09e4b44374e7d4888944288de268b81c003
Nicolas Geoffray [Mon, 12 Dec 2016 10:17:56 +0000 (10:17 +0000)]
Merge "Use System.out only."
Nicolas Geoffray [Sun, 11 Dec 2016 22:05:15 +0000 (22:05 +0000)]
Use System.out only.
Otherwise streams can get interleaved when printing.
test: 956-methodhandles
Change-Id: Ie734e24ed5bb73786e1972df784b365176bfd593
Andreas Gampe [Sat, 3 Dec 2016 03:11:17 +0000 (19:11 -0800)]
ART: Implement FollowReferences for initial object
Add code for FollowReferences with initial object. Simply skip
root visiting and add the initial object to the work list.
Bug:
31385354
Test: m test-art-host-run-test-913-heaps
Change-Id: I7d2a852fac54b13219df975d131f5b95e8094d9b
Mathieu Chartier [Wed, 7 Dec 2016 00:02:27 +0000 (16:02 -0800)]
Use store release for resolved types
For DefineClass, use a release store for SetResolvedType. This is
done to prevent other threads from seeing a class but not necessarily
seeing the loaded members like the static fields array.
It is theorized that a load acquire is not required since obtaining
the resolved class will always have an address depedency or a lock.
Bug:
32075261
Test: test-art-host
Change-Id: I8ab18edc2cc7c9eb4a30897903d5cf1c7f9eb24e
Aart Bik [Fri, 9 Dec 2016 22:07:18 +0000 (22:07 +0000)]
Merge "Added polynomial induction variables analysis. With tests." am:
57096b7231 am:
c8b31039d9
am:
4ef112914c
Change-Id: Ifea4e5836bf3dcdbd8bec56c41b2a12368998ea1
Aart Bik [Fri, 9 Dec 2016 22:01:49 +0000 (22:01 +0000)]
Merge "Added polynomial induction variables analysis. With tests." am:
57096b7231
am:
c8b31039d9
Change-Id: I45b4f0a96a09639f9737e75eff1a2659532e8dc3
Aart Bik [Fri, 9 Dec 2016 21:56:17 +0000 (21:56 +0000)]
Merge "Added polynomial induction variables analysis. With tests."
am:
57096b7231
Change-Id: I279b7719950eaa64921f70f43568a51ea74c0328
Treehugger Robot [Fri, 9 Dec 2016 21:48:43 +0000 (21:48 +0000)]
Merge "Added polynomial induction variables analysis. With tests."
Aart Bik [Tue, 6 Dec 2016 18:05:30 +0000 (10:05 -0800)]
Added polynomial induction variables analysis. With tests.
Rationale:
Information on polynomial sequences is nice to further enhance
BCE and last-value assignment. In this case, this CL enables more
loop optimizations for benchpress' Sum (80 x speedup). Also
changed rem-based geometric induction to wrap-around induction.
Test: test-art-host
Change-Id: Ie4d2659edefb814edda2c971c1f70ba400c31111
Vladimir Marko [Fri, 9 Dec 2016 15:56:26 +0000 (15:56 +0000)]
Merge "Clean up Class::GetDirectInterface()." am:
88e9168c5c am:
d70dccf5e2
am:
364f954e1e
Change-Id: I232a07edfdef0302fc9b41eb5559b214431ececd
Vladimir Marko [Fri, 9 Dec 2016 15:50:26 +0000 (15:50 +0000)]
Merge "Clean up Class::GetDirectInterface()." am:
88e9168c5c
am:
d70dccf5e2
Change-Id: I66a1208eb7cdf3db8915fbd90c40cfd0950c884d
Vladimir Marko [Fri, 9 Dec 2016 15:44:26 +0000 (15:44 +0000)]
Merge "Clean up Class::GetDirectInterface()."
am:
88e9168c5c
Change-Id: I112269a5b34bdb06f10390af9d5c9125a223aa98
Vladimir Marko [Fri, 9 Dec 2016 15:36:53 +0000 (15:36 +0000)]
Merge "Clean up Class::GetDirectInterface()."
Vladimir Marko [Thu, 8 Dec 2016 14:41:46 +0000 (14:41 +0000)]
Clean up Class::GetDirectInterface().
Once the `klass` has been resolved, this function should not
need to resolve interface types anymore. Drop the type
resolution from this function and pass the Class as ObjPtr<>
instead of Handle<>. Make callers that expect non-null
result DCHECK() that assumption. For the callers that may
actually need to resolve these interface classes, introduce
a new function ResolveDirectInterface().
Also improve ObjPtr<> constructors and assignment operator
to improve overload resolution. For example, if we have
foo(ObjPtr<T1>) and foo(ObjPtr<T2>), calling foo(.) with
a T1* would have previously been ambiguous even if T1 is
not a base of T2.
Test: m test-art-host
Change-Id: Iff44a7285f68f0af4507fc9ba37343865422fe84
Vladimir Marko [Fri, 9 Dec 2016 10:20:54 +0000 (10:20 +0000)]
Revert^8 "Make sure that const-class linkage is preserved."
Replaced two ReaderMutexLocks with WriterMutexLocks.
Removed some unnecessary debugging output.
Test: m test-art-host
Bug:
30627598
Original-Change-Id: Ie9b721464b4e9a5dcce8df8095548e983bba1fe8
This reverts commit
2c8c6b63da6ecb2ac701cc30f9b4fa4a8eea5cc8.
Change-Id: I3a1aeecf64e4b202cef61cceb248d48106a2f4a6
Nicolas Geoffray [Fri, 9 Dec 2016 11:40:12 +0000 (11:40 +0000)]
Merge "ARM: VIXL32: Implement read barriers." am:
f3dcdd9e24 am:
ff5b086126
am:
90e8b5685e
Change-Id: I0ea91b9d6a1dd573348796c4ac742e3d7e3bf465
Nicolas Geoffray [Fri, 9 Dec 2016 11:35:40 +0000 (11:35 +0000)]
Merge "ARM: VIXL32: Implement read barriers." am:
f3dcdd9e24
am:
ff5b086126
Change-Id: I7463a21d84535b3ab121e78498b26cec92dfadf1
Nicolas Geoffray [Fri, 9 Dec 2016 11:31:10 +0000 (11:31 +0000)]
Merge "ARM: VIXL32: Implement read barriers."
am:
f3dcdd9e24
Change-Id: Ibe808c4b576f23c1628ba2efded04d65a80cf45f
Nicolas Geoffray [Fri, 9 Dec 2016 11:23:42 +0000 (11:23 +0000)]
Merge "ARM: VIXL32: Implement read barriers."
Orion Hodson [Thu, 8 Dec 2016 14:43:57 +0000 (14:43 +0000)]
Merge "Revert "ART: Remove workaround in verifer after Jack update."" am:
aea9ffece7 am:
b115a80c1b
am:
1c61c39104
Change-Id: Ib1a0e5611bcf1c7a5641425401512933c58f7a2e
Orion Hodson [Thu, 8 Dec 2016 14:38:55 +0000 (14:38 +0000)]
Merge "Revert "ART: Remove workaround in verifer after Jack update."" am:
aea9ffece7
am:
b115a80c1b
Change-Id: Ic6acec772d313c56c3c8f2b158ed9d12dde65855
Orion Hodson [Thu, 8 Dec 2016 14:34:26 +0000 (14:34 +0000)]
Merge "Revert "ART: Remove workaround in verifer after Jack update.""
am:
aea9ffece7
Change-Id: Ia9fd8a6ee73b56ef10601f5b489dccceb9d987d8
Orion Hodson [Thu, 8 Dec 2016 14:26:09 +0000 (14:26 +0000)]
Merge "Revert "ART: Remove workaround in verifer after Jack update.""
Nicolas Geoffray [Thu, 8 Dec 2016 14:24:56 +0000 (14:24 +0000)]
Merge "Add libstdc++ as a dependency for build-target-art-golem." am:
b671dcff59 am:
aea3766a92
am:
5307faf98f
Change-Id: I8fdd601a0d46f1b4eeb133bfbe8ab1976fd672a6
Nicolas Geoffray [Thu, 8 Dec 2016 14:20:25 +0000 (14:20 +0000)]
Merge "Add libstdc++ as a dependency for build-target-art-golem." am:
b671dcff59
am:
aea3766a92
Change-Id: Ie1d5334a3a3e4dc182134561e4bf96fb9b448255
Nicolas Geoffray [Thu, 8 Dec 2016 14:15:54 +0000 (14:15 +0000)]
Merge "Add libstdc++ as a dependency for build-target-art-golem."
am:
b671dcff59
Change-Id: Ic8d150248edb5dd6948d05f5b8a9e33a3fe74d36
Orion Hodson [Thu, 8 Dec 2016 14:15:25 +0000 (14:15 +0000)]
Revert "ART: Remove workaround in verifer after Jack update."
This reverts commit
1aab04df52529d3cabe28fd9f0cb008bf8180a56.
Change-Id: Ifecad6a16f2c6dfeea99adcdca7da05fb71592a8
Nicolas Geoffray [Thu, 8 Dec 2016 14:11:10 +0000 (14:11 +0000)]
Merge "Add libstdc++ as a dependency for build-target-art-golem."
Nicolas Geoffray [Thu, 8 Dec 2016 13:49:54 +0000 (13:49 +0000)]
Add libstdc++ as a dependency for build-target-art-golem.
Needed for running with ART_TARGET_LINUX=true
Test: builds and runs.
Change-Id: Idf74eff0a4114952b71781ed80de5bbe75f666ae
Orion Hodson [Thu, 8 Dec 2016 13:05:52 +0000 (13:05 +0000)]
Merge "ART: Remove workaround in verifer after Jack update." am:
e063a7f0f8 am:
178908181d
am:
7bfb1c88b2
Change-Id: I07a76fce0f39d16d48e7e6dec48ce401a7203287
Orion Hodson [Thu, 8 Dec 2016 13:01:22 +0000 (13:01 +0000)]
Merge "ART: Remove workaround in verifer after Jack update." am:
e063a7f0f8
am:
178908181d
Change-Id: Ic91a4dfe25a54d5b1b81112e926fcc9b069317e3
Orion Hodson [Thu, 8 Dec 2016 12:56:51 +0000 (12:56 +0000)]
Merge "ART: Remove workaround in verifer after Jack update."
am:
e063a7f0f8
Change-Id: I12f71bbf4abc8b840efa39aa327c833d52709e92
Orion Hodson [Thu, 8 Dec 2016 12:49:46 +0000 (12:49 +0000)]
Merge "ART: Remove workaround in verifer after Jack update."
Orion Hodson [Thu, 8 Dec 2016 10:29:53 +0000 (10:29 +0000)]
ART: Remove workaround in verifer after Jack update.
Bug:
33099829,
30550796
Test: m test-art-host
Change-Id: I812809e7f043ec2a9651f22e970312e094b78966
OSDN Git Service
