OSDN Git Service
Hiroshi Yamauchi [Tue, 12 May 2015 21:21:34 +0000 (14:21 -0700)]
Add notes about fast JNI calls.
(cherry pick commit
36bce58f01a6b37e4d07ff9544c03a3238be087f)
Bug:
19665903
Change-Id: I7cc37ab572d2e9ff86f6388c80a3c453a2bca046
Vladimir Marko [Tue, 12 May 2015 17:27:20 +0000 (18:27 +0100)]
Quick: Fix DCE to mark wide register overlaps correctly.
Previously we missed some cases of overlap with registers
coming from previous blocks.
Bug:
20640451
(cherry picked from commit
83d46ef1eaa8fdecadfdb9564d80e50b42646c37)
Change-Id: I1be879edfbc900b70cee411d9e31e5a4b524530a
Jeff Hao [Tue, 12 May 2015 01:39:28 +0000 (18:39 -0700)]
Add test for String init called from unresolvable class.
Bug:
20971268
Change-Id: I0cb027f5e29667e9d522eb01a6b966cd69abb104
Jeff Hao [Mon, 11 May 2015 20:38:14 +0000 (13:38 -0700)]
Merge art project from goog/master into goog/mnc-dev.
Sebastien Hertz [Mon, 11 May 2015 19:36:17 +0000 (19:36 +0000)]
am
d0d3b974: am
1774ca95: am
bdd9f2d8: Merge "Remove unused StackHandleScope"
* commit '
d0d3b974998111ee4b0c6692590f6b05a765bacc':
Remove unused StackHandleScope
Sebastien Hertz [Mon, 11 May 2015 19:20:12 +0000 (19:20 +0000)]
am
1774ca95: am
bdd9f2d8: Merge "Remove unused StackHandleScope"
* commit '
1774ca95e2cae05eeb312567a68dd93eaf792acb':
Remove unused StackHandleScope
Sebastien Hertz [Mon, 11 May 2015 19:08:27 +0000 (19:08 +0000)]
am
bdd9f2d8: Merge "Remove unused StackHandleScope"
* commit '
bdd9f2d870099e326a281ac90993b37b999c35ea':
Remove unused StackHandleScope
Sebastien Hertz [Mon, 11 May 2015 18:58:31 +0000 (18:58 +0000)]
Merge "Remove unused StackHandleScope"
Hiroshi Yamauchi [Mon, 11 May 2015 18:38:22 +0000 (18:38 +0000)]
am
f3713fbe: am
cbfc2b94: am
1d316ada: Merge "Insert a read barrier in the JNI bridge."
* commit '
f3713fbe906c9aa1196382602cb870ae3f3e12d7':
Insert a read barrier in the JNI bridge.
Hiroshi Yamauchi [Mon, 11 May 2015 18:26:37 +0000 (18:26 +0000)]
am
cbfc2b94: am
1d316ada: Merge "Insert a read barrier in the JNI bridge."
* commit '
cbfc2b9443e4d18948d5bbd054b5dd3569d8943c':
Insert a read barrier in the JNI bridge.
Richard Uhler [Mon, 11 May 2015 18:14:15 +0000 (18:14 +0000)]
am
a34ea222: am
1ed3ab7c: am
bd0cfef5: Merge "Fix typo in VLOG message."
* commit '
a34ea222385996d9b6c6e057bad3ca7dae79cfba':
Fix typo in VLOG message.
Richard Uhler [Mon, 11 May 2015 18:14:14 +0000 (18:14 +0000)]
am
c6c4b52d: am
fa389ffa: am
c55efc73: Merge "Add more diagnostics info to flaky oat file assistant test."
* commit '
c6c4b52dfa8d4883338e922cd7200062d3e5c735':
Add more diagnostics info to flaky oat file assistant test.
Andreas Gampe [Mon, 11 May 2015 18:14:13 +0000 (18:14 +0000)]
am
a57a8f86: am
2f8a04dc: am
9dfba720: Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
* commit '
a57a8f86c9f6c5c3667df7d87e0ee49ef184fd61':
ART: x86 indexOf intrinsics for the optimizing compiler
Hiroshi Yamauchi [Mon, 11 May 2015 18:13:39 +0000 (18:13 +0000)]
am
1d316ada: Merge "Insert a read barrier in the JNI bridge."
* commit '
1d316adafda81cb2f30e210d3d108b97c7c11f15':
Insert a read barrier in the JNI bridge.
Hiroshi Yamauchi [Mon, 11 May 2015 18:04:09 +0000 (18:04 +0000)]
Merge "Insert a read barrier in the JNI bridge."
Richard Uhler [Mon, 11 May 2015 18:00:14 +0000 (18:00 +0000)]
am
1ed3ab7c: am
bd0cfef5: Merge "Fix typo in VLOG message."
* commit '
1ed3ab7c07ff2ff281ae8bc960ce31bba37f8d67':
Fix typo in VLOG message.
Richard Uhler [Mon, 11 May 2015 18:00:13 +0000 (18:00 +0000)]
am
fa389ffa: am
c55efc73: Merge "Add more diagnostics info to flaky oat file assistant test."
* commit '
fa389ffa36e0c6ad74b5f01adce733e502efc992':
Add more diagnostics info to flaky oat file assistant test.
Andreas Gampe [Mon, 11 May 2015 18:00:11 +0000 (18:00 +0000)]
am
2f8a04dc: am
9dfba720: Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
* commit '
2f8a04dca06c417c6c8cd4eb74025aba1d49020b':
ART: x86 indexOf intrinsics for the optimizing compiler
Richard Uhler [Mon, 11 May 2015 17:52:44 +0000 (17:52 +0000)]
am
bd0cfef5: Merge "Fix typo in VLOG message."
* commit '
bd0cfef567012fa6c75243d9157ddceaab7cdaac':
Fix typo in VLOG message.
Richard Uhler [Mon, 11 May 2015 17:52:42 +0000 (17:52 +0000)]
am
c55efc73: Merge "Add more diagnostics info to flaky oat file assistant test."
* commit '
c55efc7335e35f6731b04afc3a1db838c086beb3':
Add more diagnostics info to flaky oat file assistant test.
Andreas Gampe [Mon, 11 May 2015 17:52:40 +0000 (17:52 +0000)]
am
9dfba720: Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
* commit '
9dfba7202b3777a14792759f097fe4da37264988':
ART: x86 indexOf intrinsics for the optimizing compiler
Richard Uhler [Mon, 11 May 2015 17:46:44 +0000 (17:46 +0000)]
Merge "Fix typo in VLOG message."
Richard Uhler [Mon, 11 May 2015 17:46:06 +0000 (17:46 +0000)]
Merge "Add more diagnostics info to flaky oat file assistant test."
Andreas Gampe [Mon, 11 May 2015 17:42:21 +0000 (17:42 +0000)]
Merge "ART: x86 indexOf intrinsics for the optimizing compiler"
Andreas Gampe [Thu, 7 May 2015 21:46:15 +0000 (14:46 -0700)]
ART: x86 indexOf intrinsics for the optimizing compiler
Add intrinsics implementations for indexOf in the optimizing
compiler. These are mostly ported from Quick. Add instruction
support to assemblers where necessary.
Change-Id: Ife90ed0245532a5c436a26fe84715dc357f353c8
Sebastien Hertz [Mon, 11 May 2015 15:53:27 +0000 (17:53 +0200)]
Remove unused StackHandleScope
It is causing crashes when there is no current thread (because it has
been detached from the runtime). It happens when we sanity check the
stack during runtime shutdown after stopping method tracing.
Bug:
20993343
Change-Id: I549664932f513a01339e5b1c34b3ddc5744888c3
Richard Uhler [Mon, 11 May 2015 16:36:57 +0000 (09:36 -0700)]
Fix typo in VLOG message.
Change-Id: Iaf4ce1787816afce947c6e963df19d20ef5f5e1b
Richard Uhler [Mon, 11 May 2015 16:32:47 +0000 (09:32 -0700)]
Add more diagnostics info to flaky oat file assistant test.
Change-Id: Ifd0029d389ba7585a819c01fc9cc846681d0a349
Nicolas Geoffray [Mon, 11 May 2015 15:56:33 +0000 (15:56 +0000)]
am
ee623ea4: am
1c324341: am
6108ed86: Merge "Add a flag to StackVisitor for inlining."
* commit '
ee623ea4432a393d0bab6918829356f63c5d8716':
Add a flag to StackVisitor for inlining.
Nicolas Geoffray [Mon, 11 May 2015 15:49:47 +0000 (15:49 +0000)]
am
1c324341: am
6108ed86: Merge "Add a flag to StackVisitor for inlining."
* commit '
1c3243416088c2f2072f6db413cfb3c8bf2dacfb':
Add a flag to StackVisitor for inlining.
Nicolas Geoffray [Mon, 11 May 2015 15:39:50 +0000 (15:39 +0000)]
am
6108ed86: Merge "Add a flag to StackVisitor for inlining."
* commit '
6108ed86bb2663e73262e290463f014e2698abc1':
Add a flag to StackVisitor for inlining.
Nicolas Geoffray [Mon, 11 May 2015 15:29:41 +0000 (15:29 +0000)]
Merge "Add a flag to StackVisitor for inlining."
Nicolas Geoffray [Wed, 6 May 2015 10:34:34 +0000 (11:34 +0100)]
Add a flag to StackVisitor for inlining.
The flag tells whether the stack walk needs to include inlined
Java frames.
This does not do anything just yet, as we're not inlining anyways.
Change-Id: I716e25094fe56fa335ca1f9a398c1bcdba478e73
Roland Levillain [Mon, 11 May 2015 14:08:33 +0000 (14:08 +0000)]
am
2a9c047d: am
e2243670: am
119b21a6: Merge "[optimizing] Improve 32 bit long shift by 1."
* commit '
2a9c047ddc6e411df1dcd8d00ab5a701d530569f':
[optimizing] Improve 32 bit long shift by 1.
Roland Levillain [Mon, 11 May 2015 13:57:08 +0000 (13:57 +0000)]
am
e2243670: am
119b21a6: Merge "[optimizing] Improve 32 bit long shift by 1."
* commit '
e2243670d3acae8556b47be8bbd9bae3e340541f':
[optimizing] Improve 32 bit long shift by 1.
Nicolas Geoffray [Mon, 11 May 2015 13:46:48 +0000 (13:46 +0000)]
am
ec696e7f: am
796008a3: am
0e4c27e5: Merge "Add a parent environment to HEnvironment."
* commit '
ec696e7fcdf1e519ad6710222975619d3ddb3e48':
Add a parent environment to HEnvironment.
Roland Levillain [Mon, 11 May 2015 13:46:34 +0000 (13:46 +0000)]
am
119b21a6: Merge "[optimizing] Improve 32 bit long shift by 1."
* commit '
119b21a6dfdb09d983a9e56a837fbf5c98e57096':
[optimizing] Improve 32 bit long shift by 1.
Roland Levillain [Mon, 11 May 2015 13:37:09 +0000 (13:37 +0000)]
Merge "[optimizing] Improve 32 bit long shift by 1."
Nicolas Geoffray [Mon, 11 May 2015 13:33:47 +0000 (13:33 +0000)]
am
796008a3: am
0e4c27e5: Merge "Add a parent environment to HEnvironment."
* commit '
796008a32b19d7ce5f49c8e2981f641ba3c28664':
Add a parent environment to HEnvironment.
Nicolas Geoffray [Mon, 11 May 2015 13:26:40 +0000 (13:26 +0000)]
am
0e4c27e5: Merge "Add a parent environment to HEnvironment."
* commit '
0e4c27e555d854f00185603138a6434358d07757':
Add a parent environment to HEnvironment.
Nicolas Geoffray [Mon, 11 May 2015 13:18:05 +0000 (13:18 +0000)]
Merge "Add a parent environment to HEnvironment."
Nicolas Geoffray [Thu, 7 May 2015 10:57:35 +0000 (11:57 +0100)]
Add a parent environment to HEnvironment.
This code has no functionality change. It adds a placeholder
for chaining inlined frames.
Change-Id: I5ec57335af76ee406052345b947aad98a6a4423a
Mark Mendell [Wed, 6 May 2015 01:34:03 +0000 (21:34 -0400)]
[optimizing] Improve 32 bit long shift by 1.
Also change FOO << 1 to FOO+FOO in the instruction simplifier. This is
an architecture independent simplification, which helps 'long << 1' for
32 bit architectures.
Generate an add/adc for long << 1 in x86, in case something is generated
after the simplifier.
Add test cases for the simplification.
Change-Id: I0d512331ef13cc4ccf10c80f11c370a10ed02294
Signed-off-by: Mark Mendell <mark.p.mendell@intel.com>
Nicolas Geoffray [Sat, 9 May 2015 14:43:07 +0000 (14:43 +0000)]
am
b4fa99ea: am
b4833e52: am
cdeb0b5f: Merge "[optimizing] Tune some x86_64 moves"
* commit '
b4fa99ea723393d014bab6aae25eeb78e3ed05e6':
[optimizing] Tune some x86_64 moves
Nicolas Geoffray [Sat, 9 May 2015 14:36:11 +0000 (14:36 +0000)]
am
b4833e52: am
cdeb0b5f: Merge "[optimizing] Tune some x86_64 moves"
* commit '
b4833e528a9b638b435ed5f61317ac3b4bb0a40a':
[optimizing] Tune some x86_64 moves
Nicolas Geoffray [Sat, 9 May 2015 14:25:48 +0000 (14:25 +0000)]
am
cdeb0b5f: Merge "[optimizing] Tune some x86_64 moves"
* commit '
cdeb0b5fede4c06488f43a212591e661d946bc78':
[optimizing] Tune some x86_64 moves
Nicolas Geoffray [Sat, 9 May 2015 14:17:51 +0000 (14:17 +0000)]
Merge "[optimizing] Tune some x86_64 moves"
Mathieu Chartier [Sat, 9 May 2015 01:50:20 +0000 (01:50 +0000)]
am
f93dbb45: am
56869c1f: Don\'t allow JIT to compile native methods
* commit '
f93dbb455b03a3eac151a616f72a9fa9067d7a64':
Don't allow JIT to compile native methods
Mathieu Chartier [Sat, 9 May 2015 01:37:23 +0000 (01:37 +0000)]
am
56869c1f: Don\'t allow JIT to compile native methods
* commit '
56869c1f6441f5ba05ee155c5d8fcf4b821e0be2':
Don't allow JIT to compile native methods
Mathieu Chartier [Sat, 9 May 2015 00:33:31 +0000 (00:33 +0000)]
am
3e130a77: am
c628cc9a: am
775b7b88: Merge "Don\'t allow JIT to compile native methods"
* commit '
3e130a77fdc701253c81c1a1602521394c026c8b':
Don't allow JIT to compile native methods
Mathieu Chartier [Sat, 9 May 2015 00:27:18 +0000 (00:27 +0000)]
am
c628cc9a: am
775b7b88: Merge "Don\'t allow JIT to compile native methods"
* commit '
c628cc9a45ea2d50e95bab9084b590500c371b24':
Don't allow JIT to compile native methods
Mathieu Chartier [Sat, 9 May 2015 00:17:33 +0000 (00:17 +0000)]
am
775b7b88: Merge "Don\'t allow JIT to compile native methods"
* commit '
775b7b888a13315b8b7722564c2824baabb98221':
Don't allow JIT to compile native methods
Mathieu Chartier [Sat, 9 May 2015 00:05:01 +0000 (17:05 -0700)]
Don't allow JIT to compile native methods
Change-Id: I12722309ba52c430e23ab862b29f7a48383f00d2
Mathieu Chartier [Sat, 9 May 2015 00:07:34 +0000 (00:07 +0000)]
Merge "Don't allow JIT to compile native methods"
Mathieu Chartier [Sat, 9 May 2015 00:05:01 +0000 (17:05 -0700)]
Don't allow JIT to compile native methods
Change-Id: I12722309ba52c430e23ab862b29f7a48383f00d2
Andreas Gampe [Fri, 8 May 2015 23:55:40 +0000 (23:55 +0000)]
am
623f0882: am
dc5b620f: am
591d8e4e: Merge "Add stub_test implementation for mips & mips64"
* commit '
623f0882c0f0f756512aa010060960e571751bdf':
Add stub_test implementation for mips & mips64
Andreas Gampe [Fri, 8 May 2015 23:55:39 +0000 (23:55 +0000)]
am
11f663fc: am
05c67f03: am
e20df2a6: Merge "Fix stub_test for Mips64"
* commit '
11f663fc3c7737cb99399b2de2ea219de9b22034':
Fix stub_test for Mips64
Mathieu Chartier [Fri, 8 May 2015 23:55:38 +0000 (23:55 +0000)]
am
74388c53: am
8515f6a5: am
0172c5b0: Merge "Check IsReferenceVReg during deopt"
* commit '
74388c530621556f93530d7b0e334bd5ae904f3b':
Check IsReferenceVReg during deopt
Andreas Gampe [Fri, 8 May 2015 23:42:59 +0000 (23:42 +0000)]
am
dc5b620f: am
591d8e4e: Merge "Add stub_test implementation for mips & mips64"
* commit '
dc5b620fa1ad60b81c8fdcf81bff058fc1e0aab6':
Add stub_test implementation for mips & mips64
Andreas Gampe [Fri, 8 May 2015 23:42:57 +0000 (23:42 +0000)]
am
05c67f03: am
e20df2a6: Merge "Fix stub_test for Mips64"
* commit '
05c67f03fe14cbc8cff58353fd35984b84225df5':
Fix stub_test for Mips64
Mathieu Chartier [Fri, 8 May 2015 23:42:56 +0000 (23:42 +0000)]
am
8515f6a5: am
0172c5b0: Merge "Check IsReferenceVReg during deopt"
* commit '
8515f6a55c7f010cde743c8ace5c218173c0dc9b':
Check IsReferenceVReg during deopt
Andreas Gampe [Fri, 8 May 2015 23:31:20 +0000 (23:31 +0000)]
am
591d8e4e: Merge "Add stub_test implementation for mips & mips64"
* commit '
591d8e4e6a171c2cc7417bec55f48858ffc1e677':
Add stub_test implementation for mips & mips64
Andreas Gampe [Fri, 8 May 2015 23:31:19 +0000 (23:31 +0000)]
am
e20df2a6: Merge "Fix stub_test for Mips64"
* commit '
e20df2a6a48ca4e35289459354dc25247aad7406':
Fix stub_test for Mips64
Mathieu Chartier [Fri, 8 May 2015 23:31:18 +0000 (23:31 +0000)]
am
0172c5b0: Merge "Check IsReferenceVReg during deopt"
* commit '
0172c5b0a4baae0c1eb05555dabf56bc4c08f5b0':
Check IsReferenceVReg during deopt
Andreas Gampe [Fri, 8 May 2015 23:22:24 +0000 (23:22 +0000)]
Merge "Add stub_test implementation for mips & mips64"
Andreas Gampe [Fri, 8 May 2015 23:21:03 +0000 (23:21 +0000)]
Merge "Fix stub_test for Mips64"
Goran Jakovljevic [Thu, 23 Apr 2015 13:27:23 +0000 (15:27 +0200)]
Fix stub_test for Mips64
Force ENTRY macro to load GP. Instead .cpload (used for o32 abi,
not working for n64) use .cpsetup to set up GP and save previous
GP value.
Fix expectations in GetSet32Static.
Change-Id: Ie97e32fa2fee7a6e8bae6bc36e78976b8be62b79
Mathieu Chartier [Fri, 8 May 2015 23:19:41 +0000 (23:19 +0000)]
Merge "Check IsReferenceVReg during deopt"
Mathieu Chartier [Fri, 8 May 2015 23:00:21 +0000 (23:00 +0000)]
am
e4102105: am
b39cc9d6: Merge "Check IsReferenceVReg during deopt" into mnc-dev
* commit '
e4102105b0293662ec4a9b1abd1fcd955e588e30':
Check IsReferenceVReg during deopt
Mathieu Chartier [Fri, 8 May 2015 22:46:27 +0000 (22:46 +0000)]
am
b39cc9d6: Merge "Check IsReferenceVReg during deopt" into mnc-dev
* commit '
b39cc9d64b255921b7cf3f9bcf526c29e9cd7c9d':
Check IsReferenceVReg during deopt
Mathieu Chartier [Fri, 8 May 2015 22:22:07 +0000 (22:22 +0000)]
Merge "Check IsReferenceVReg during deopt" into mnc-dev
Vladimir Marko [Fri, 8 May 2015 22:13:18 +0000 (22:13 +0000)]
am
e129b631: am
dd5a4d0a: ART: Merge entries with same name and protect in MemMap dump.
* commit '
e129b6316cf65ce92c4d217ab00422c023845a4f':
ART: Merge entries with same name and protect in MemMap dump.
Vladimir Marko [Fri, 8 May 2015 22:13:17 +0000 (22:13 +0000)]
am
e786a7ba: am
2619371b: am
2c68641c: Merge "ART: Merge entries with same name and protect in MemMap dump."
* commit '
e786a7babc291a13e8338012bb1d503ba1be494b':
ART: Merge entries with same name and protect in MemMap dump.
Mathieu Chartier [Fri, 8 May 2015 21:19:26 +0000 (14:19 -0700)]
Check IsReferenceVReg during deopt
Required since the quick GC maps may not agree with the verifier
ones. Without this check we may copy stale object references into
the shadow frame.
(cherry picked from commit
f00baf56ef647684888a407dbb6adadd704a2039)
Bug:
20736048
Change-Id: I7783c8a8ee45cf601b08b4c38f1dec7f7d11380c
Vladimir Marko [Fri, 8 May 2015 21:56:30 +0000 (21:56 +0000)]
am
dd5a4d0a: ART: Merge entries with same name and protect in MemMap dump.
* commit '
dd5a4d0a9cdf75e8fffc3cc3a08c808bbd997b22':
ART: Merge entries with same name and protect in MemMap dump.
Vladimir Marko [Fri, 8 May 2015 21:53:10 +0000 (21:53 +0000)]
am
2619371b: am
2c68641c: Merge "ART: Merge entries with same name and protect in MemMap dump."
* commit '
2619371bd4dc0eab0862b193f0fbfc90706f2278':
ART: Merge entries with same name and protect in MemMap dump.
Vladimir Marko [Fri, 8 May 2015 21:42:46 +0000 (21:42 +0000)]
am
2c68641c: Merge "ART: Merge entries with same name and protect in MemMap dump."
* commit '
2c68641c0f0d8fb410cf73182acb4e498c0e558f':
ART: Merge entries with same name and protect in MemMap dump.
Mathieu Chartier [Fri, 8 May 2015 21:19:26 +0000 (14:19 -0700)]
Check IsReferenceVReg during deopt
Required since the quick GC maps may not agree with the verifier
ones. Without this check we may copy stale object references into
the shadow frame.
Bug:
20736048
Change-Id: I7783c8a8ee45cf601b08b4c38f1dec7f7d11380c
Vladimir Marko [Fri, 8 May 2015 14:17:32 +0000 (15:17 +0100)]
ART: Merge entries with same name and protect in MemMap dump.
This should make the MemMap dump less chatty and allow the
logger to keep more relevant output.
Bug:
20873174
(cherry picked from commit
17a924abde2b0f1f37f6008b451a0a75190c71ff)
Change-Id: I1748f57a1f149a5498b42ee246f13d2bf1e8c2f7
Vladimir Marko [Fri, 8 May 2015 21:26:37 +0000 (21:26 +0000)]
Merge "ART: Merge entries with same name and protect in MemMap dump."
Vladimir Marko [Fri, 8 May 2015 14:17:32 +0000 (15:17 +0100)]
ART: Merge entries with same name and protect in MemMap dump.
This should make the MemMap dump less chatty and allow the
logger to keep more relevant output.
Bug:
20873174
Change-Id: I09058798faa8f79d154cee5008017b03700df8db
Vladimir Marko [Fri, 8 May 2015 16:58:56 +0000 (16:58 +0000)]
am
00dcbc36: am
8ee43e3c: ART: Fix debug output for bad reused MemMap.
* commit '
00dcbc3651b53a930e9003b3f2e6d052e4624aa2':
ART: Fix debug output for bad reused MemMap.
Sebastien Hertz [Fri, 8 May 2015 16:58:55 +0000 (16:58 +0000)]
am
aa41220a: am
5eae4555: Support multiple instrumentation clients
* commit '
aa41220a9ebdc149b2e8ef069a9f2bcb9f7cd7e5':
Support multiple instrumentation clients
Vladimir Marko [Fri, 8 May 2015 16:40:24 +0000 (16:40 +0000)]
am
8ee43e3c: ART: Fix debug output for bad reused MemMap.
* commit '
8ee43e3ce18e90bfbf8cbeb05ff78ad281015d1a':
ART: Fix debug output for bad reused MemMap.
Sebastien Hertz [Fri, 8 May 2015 16:40:11 +0000 (16:40 +0000)]
am
5eae4555: Support multiple instrumentation clients
* commit '
5eae455507399286c845ba54796c47087a72b3e2':
Support multiple instrumentation clients
Calin Juravle [Fri, 8 May 2015 16:24:13 +0000 (16:24 +0000)]
am
c744a5d3: am
7381073d: am
6727a481: Merge "Skip compilation when falling-through out of method code."
* commit '
c744a5d36002614ec4337f240359fb09a23374d9':
Skip compilation when falling-through out of method code.
Calin Juravle [Fri, 8 May 2015 16:12:43 +0000 (16:12 +0000)]
am
7381073d: am
6727a481: Merge "Skip compilation when falling-through out of method code."
* commit '
7381073d52bb1598674e5eb3af483780b1848dcd':
Skip compilation when falling-through out of method code.
Richard Uhler [Fri, 8 May 2015 16:04:10 +0000 (16:04 +0000)]
am
863fd4ae: am
1f927a86: am
add1d9ba: Merge "Fix typo in comments."
* commit '
863fd4aea0b4270e841ba867e0f7d1762e4613bb':
Fix typo in comments.
Vladimir Marko [Fri, 8 May 2015 16:04:06 +0000 (16:04 +0000)]
am
5c34846a: am
0b4408d5: am
2e8da8ec: Merge "ART: Fix debug output for bad reused MemMap."
* commit '
5c34846aec68e55dd7e5a77bb6f2fa8d9ab536bd':
ART: Fix debug output for bad reused MemMap.
Andreas Gampe [Fri, 8 May 2015 16:03:27 +0000 (16:03 +0000)]
am
7f951ac5: am
e15eea0b: am
659f4c14: Merge "ART: Refactor 082-inline-execute"
* commit '
7f951ac53315f8abc477f3c7fc18750d87e95dea':
ART: Refactor 082-inline-execute
Calin Juravle [Fri, 8 May 2015 16:00:40 +0000 (16:00 +0000)]
am
6727a481: Merge "Skip compilation when falling-through out of method code."
* commit '
6727a48193db2a0cf01af971cccffe1a6518c247':
Skip compilation when falling-through out of method code.
Calin Juravle [Fri, 8 May 2015 15:52:48 +0000 (15:52 +0000)]
Merge "Skip compilation when falling-through out of method code."
Richard Uhler [Fri, 8 May 2015 15:45:02 +0000 (15:45 +0000)]
am
1f927a86: am
add1d9ba: Merge "Fix typo in comments."
* commit '
1f927a86e3e70619a0005eb976c229c9dbfda9e3':
Fix typo in comments.
Richard Uhler [Fri, 8 May 2015 15:33:28 +0000 (15:33 +0000)]
am
add1d9ba: Merge "Fix typo in comments."
* commit '
add1d9ba61b6ddd52f2161587baf3ae4bc8717af':
Fix typo in comments.
Richard Uhler [Fri, 8 May 2015 15:24:25 +0000 (15:24 +0000)]
Merge "Fix typo in comments."
Vladimir Marko [Fri, 8 May 2015 10:53:33 +0000 (10:53 +0000)]
am
0b4408d5: am
2e8da8ec: Merge "ART: Fix debug output for bad reused MemMap."
* commit '
0b4408d5587af57c76cd7f2af2d975f4eae20f8e':
ART: Fix debug output for bad reused MemMap.
Vladimir Marko [Fri, 8 May 2015 10:42:39 +0000 (10:42 +0000)]
am
2e8da8ec: Merge "ART: Fix debug output for bad reused MemMap."
* commit '
2e8da8ecb94134081c3ea18a217294db367888a3':
ART: Fix debug output for bad reused MemMap.
Vladimir Marko [Fri, 8 May 2015 10:10:16 +0000 (11:10 +0100)]
ART: Fix debug output for bad reused MemMap.
Log the error_msg instead of a pointer to it.
Raise the log level to ERROR for the process maps.
(cherry picked from commit
b5505823ad3d0bab8fc9c15c266a3d8cd96ee59e)
Change-Id: Ib0c258961e2384125907aca4bae2108f36067d5f
Vladimir Marko [Fri, 8 May 2015 10:31:05 +0000 (10:31 +0000)]
Merge "ART: Fix debug output for bad reused MemMap."
Vladimir Marko [Fri, 8 May 2015 10:10:16 +0000 (11:10 +0100)]
ART: Fix debug output for bad reused MemMap.
Log the error_msg instead of a pointer to it.
Raise the log level to ERROR for the process maps.
Change-Id: I95f82f013d1c6360f40e6315652d1a2dda0f39e2
OSDN Git Service
