OSDN Git Service
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: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: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 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
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: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: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.
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
Andreas Gampe [Fri, 8 May 2015 00:54:37 +0000 (00:54 +0000)]
am
e15eea0b: am
659f4c14: Merge "ART: Refactor 082-inline-execute"
* commit '
e15eea0b6548fe933b5a22d5d9b2c97908399403':
ART: Refactor 082-inline-execute
Andreas Gampe [Fri, 8 May 2015 00:25:47 +0000 (00:25 +0000)]
am
659f4c14: Merge "ART: Refactor 082-inline-execute"
* commit '
659f4c14e8e044f8efe5405ba0da50aa894dd25f':
ART: Refactor 082-inline-execute
Andreas Gampe [Fri, 8 May 2015 00:17:56 +0000 (00:17 +0000)]
Merge "ART: Refactor 082-inline-execute"
Andreas Gampe [Thu, 7 May 2015 23:44:58 +0000 (16:44 -0700)]
ART: Refactor 082-inline-execute
Refactor the indexOf intrinsics tests so that the optimizing
compiler would actually compile them.
Bug:
20889065
Change-Id: I69bfda7fa3eb4ce42c593203731e3ddd61f7e1ed
Sebastien Hertz [Thu, 7 May 2015 21:35:17 +0000 (21:35 +0000)]
am
c3cde2c0: JDWP: properly combine location events
* commit '
c3cde2c00bcbe97c9b0c119919500fcbbe824baa':
JDWP: properly combine location events
Sebastien Hertz [Wed, 1 Apr 2015 14:34:17 +0000 (16:34 +0200)]
Support multiple instrumentation clients
Changes Instrumentation::ConfigureStubs to support multiple clients
that need different levels of instrumenation. A client is identified
by a string key used to save the desired instrumentation level.
Also adds regression gtest instrumentation_test and some cleanup.
Bug:
19829329
(cherry picked from commit
0462c4c87c39db6cfcd338f323844738109ac3c9)
Change-Id: I1fc24a86fcb7cb46d4be806895376c25cc0a0b3c
Sebastien Hertz [Fri, 10 Apr 2015 10:12:33 +0000 (12:12 +0200)]
JDWP: properly combine location events
This CL properly groups JDWP events at the same location: Breakpoint,
Single-step, Method Entry and Method Exit. This is necessary if the
debugger is not the only instrumentation listener. This matches the
behavior of Dalvik, especially for methods with a single return
instruction.
The interpreter was tuned so the instrumentation callbacks were
called to satisfy the debugger with the idea the debugger was the
only instrumentation listener. This is not true when method tracing
is enabled at the same time.
When tracing is enabled, there is always a listener for MethodEntry
and MethodExit events (art::Trace class). However, if the debugger
is only listening to DexPcMoved event (to manage JDWP Breakpoint
event), it will not be notified of this event.
We now properly call all the instrumentation callbacks in the
interpreter and move the logic specific to debugging into the class
DebugInstrumentationListener. This allows to properly group JDWP
location events together depending on the sequence of instrumentation
callbacks.
We add Thread::tls_32bit_sized_values::debug_method_entry_ flag to
remember we just entered a method. It replaces the local variable
notified_method_entry_event in the interpreter and simplifies the
code.
Bump oat version to force recompilation because the layout of the
Thread class is modified.
Bug:
19829329
Bug:
20205350
(cherry picked from commit
9d6bf69ad3012a9d843268fdd5325b6719b6d5f2)
Change-Id: I204af9112e37d2eebc86661fb7c961a41c74e598
Vladimir Marko [Thu, 7 May 2015 19:11:30 +0000 (19:11 +0000)]
am
5260d145: Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis." into mnc-dev
* commit '
5260d14566d13b1767ca63d2768d9b0e0a1bba33':
Quick: Fix DCE to rename SSA regs for degenerate Phis.
Vladimir Marko [Thu, 7 May 2015 19:11:29 +0000 (19:11 +0000)]
am
f80552b7: Quick: Abolish kMirOpCheckPart2.
* commit '
f80552b7e5f627a5dd07af017b7d65dec010ca48':
Quick: Abolish kMirOpCheckPart2.
Vladimir Marko [Thu, 7 May 2015 18:27:06 +0000 (18:27 +0000)]
am
ea1c03e1: am
7b4de07f: Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis."
* commit '
ea1c03e1ab324a43077fa22feb247f14c8699165':
Quick: Fix DCE to rename SSA regs for degenerate Phis.
Vladimir Marko [Thu, 7 May 2015 18:27:05 +0000 (18:27 +0000)]
am
9888b444: am
b5784d47: Merge "Quick: Abolish kMirOpCheckPart2."
* commit '
9888b44423953f71b4d29843d423663a56f5901d':
Quick: Abolish kMirOpCheckPart2.
Vladimir Marko [Thu, 7 May 2015 18:23:00 +0000 (18:23 +0000)]
Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis." into mnc-dev
Vladimir Marko [Thu, 7 May 2015 14:53:41 +0000 (15:53 +0100)]
Quick: Fix DCE to rename SSA regs for degenerate Phis.
If we're inserting a new Phi and all its inputs are the same
SSA reg (for example, we allow a single-input Phi), some
subsequent insn may actually refer to that reg, so we need
to rename it to keep the graph in a consistent state.
(cherry picked from commit
f60715c2c0a2398822a143ffb6b75507bffca703)
Change-Id: I46822b0db21c187601b79d2ff1a650494558772a
Richard Uhler [Thu, 7 May 2015 17:52:28 +0000 (10:52 -0700)]
Fix typo in comments.
Change-Id: I6569c0fdc878f797b37509432b59b0d5c9bc5533
Vladimir Marko [Thu, 7 May 2015 11:25:40 +0000 (12:25 +0100)]
Quick: Abolish kMirOpCheckPart2.
The tricks played with kMirOpCheckPart2 are making the
native GC map generation unnecessarily complex. They have
caused problems in the past and now there is bad interaction
with the DCE. Rather than fixing it time and again, remove
the pseudo-insn.
(The whole purpose of those tricks seems to be to allow the
register tracking to be used for the throwing insn before
resetting the tracking for the next block. However, it's
questionable whether that's better than processing the
throwing insn with the subsequent instructions.)
Bug:
20736048
(cherry picked from commit
e299f167c9559401548eab71678d4b779e46c2fb)
Change-Id: I8a60d26c5e6b6b608d68b8bb6b66d411f9a28f90
Vladimir Marko [Thu, 7 May 2015 17:30:35 +0000 (17:30 +0000)]
am
7b4de07f: Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis."
* commit '
7b4de07fffc6dbbbd986bb21b212fa0c4a2aec58':
Quick: Fix DCE to rename SSA regs for degenerate Phis.
Vladimir Marko [Thu, 7 May 2015 17:30:33 +0000 (17:30 +0000)]
am
b5784d47: Merge "Quick: Abolish kMirOpCheckPart2."
* commit '
b5784d4703d8f99921d69b6b97542f2fbcac3a51':
Quick: Abolish kMirOpCheckPart2.
Vladimir Marko [Thu, 7 May 2015 17:21:51 +0000 (17:21 +0000)]
Merge "Quick: Fix DCE to rename SSA regs for degenerate Phis."
Vladimir Marko [Thu, 7 May 2015 17:21:31 +0000 (17:21 +0000)]
Merge "Quick: Abolish kMirOpCheckPart2."
Sebastien Hertz [Thu, 7 May 2015 16:34:02 +0000 (16:34 +0000)]
am
4a75e3c2: am
ba9ef537: Merge "Support multiple instrumentation clients"
* commit '
4a75e3c22ccd4680ff0416c1609dafad1130ede8':
Support multiple instrumentation clients
Sebastien Hertz [Thu, 7 May 2015 16:20:41 +0000 (16:20 +0000)]
am
ba9ef537: Merge "Support multiple instrumentation clients"
* commit '
ba9ef5377b21a627ec502da3e475b34e45d0c435':
Support multiple instrumentation clients
Sebastien Hertz [Thu, 7 May 2015 16:16:14 +0000 (16:16 +0000)]
am
a8b4dfcc: am
b882da74: Merge "Remove unused InvokeWithShadowFrame"
* commit '
a8b4dfcc22b0fdbdeeb87ce91368e88d46ab43e6':
Remove unused InvokeWithShadowFrame
Narayan Kamath [Thu, 7 May 2015 16:16:12 +0000 (16:16 +0000)]
am
f3a8c70a: am
6d2d4806: Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
* commit '
f3a8c70aeb1ca2f4c1eb7a65a8f6df97698dc03a':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Sebastien Hertz [Thu, 7 May 2015 16:16:09 +0000 (16:16 +0000)]
am
c42bd509: am
eb7c5b19: Merge "JDWP: properly combine location events"
* commit '
c42bd509e5a0e5a7634b7c8ebb18196523af08a9':
JDWP: properly combine location events
Nicolas Geoffray [Thu, 7 May 2015 16:16:07 +0000 (16:16 +0000)]
am
205db690: am
f07f71f9: Merge "Use a growable array instead of an environment during SSA."
* commit '
205db6908eeca3f38c2da79cd25878d74537bf46':
Use a growable array instead of an environment during SSA.
Nicolas Geoffray [Thu, 7 May 2015 16:16:05 +0000 (16:16 +0000)]
am
905a88d3: am
46a4b268: Merge "Relax the only one back-edge restriction."
* commit '
905a88d309be4c41af4addd1ec2a821ecdcc9725':
Relax the only one back-edge restriction.
Nicolas Geoffray [Thu, 7 May 2015 16:16:03 +0000 (16:16 +0000)]
am
5199f914: am
bc3b93ea: Merge "No need to relocate the core image for the art script."
* commit '
5199f91486c1dac9037456c3f940dfd9faf673aa':
No need to relocate the core image for the art script.
Andreas Gampe [Thu, 7 May 2015 16:15:58 +0000 (16:15 +0000)]
am
9a950dec: am
a6591ef9: Merge "ART: Fix mips64 jni bugs."
* commit '
9a950decdf11303d47a450ff0d71ea64ae3d75ea':
ART: Fix mips64 jni bugs.
Jeff Hao [Thu, 7 May 2015 16:15:56 +0000 (16:15 +0000)]
am
75b27b57: am
225f679f: Merge "In quick compiler, force string init invoke to be fast path."
* commit '
75b27b57ad23da4c85fc13c644a763d541b8f0dd':
In quick compiler, force string init invoke to be fast path.
Andreas Gampe [Thu, 7 May 2015 16:15:43 +0000 (16:15 +0000)]
am
86b09d0f: am
8771be9a: Merge "Fix mips64 bugs."
* commit '
86b09d0fecd1d01819a8680ae7be087be90489aa':
Fix mips64 bugs.
Sebastien Hertz [Thu, 7 May 2015 16:10:43 +0000 (16:10 +0000)]
Merge "Support multiple instrumentation clients"
Sebastien Hertz [Wed, 1 Apr 2015 14:34:17 +0000 (16:34 +0200)]
Support multiple instrumentation clients
Changes Instrumentation::ConfigureStubs to support multiple clients
that need different levels of instrumenation. A client is identified
by a string key used to save the desired instrumentation level.
Also adds regression gtest instrumentation_test and some cleanup.
Bug:
19829329
Change-Id: I1fc24a86fcb7cb46d4be806895376c25cc0a0b3c
Sebastien Hertz [Thu, 7 May 2015 15:57:34 +0000 (15:57 +0000)]
am
b882da74: Merge "Remove unused InvokeWithShadowFrame"
* commit '
b882da74db950246b5731aecad9737b63bdefef7':
Remove unused InvokeWithShadowFrame
Sebastien Hertz [Thu, 7 May 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Remove unused InvokeWithShadowFrame"
Sebastien Hertz [Thu, 7 May 2015 15:23:16 +0000 (17:23 +0200)]
Remove unused InvokeWithShadowFrame
This is an artifact of the Portable compiler, probably left after its
removal https://android-review.googlesource.com/119049.
Change-Id: I7f6caa008e37e7a93792840c79713e90d0c7e1e1
Narayan Kamath [Thu, 7 May 2015 15:02:42 +0000 (15:02 +0000)]
am
6d2d4806: Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
* commit '
6d2d48066f503c16aaf15661a22c75fde7ab76c2':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Vladimir Marko [Thu, 7 May 2015 11:25:40 +0000 (12:25 +0100)]
Quick: Abolish kMirOpCheckPart2.
The tricks played with kMirOpCheckPart2 are making the
native GC map generation unnecessarily complex. They have
caused problems in the past and now there is bad interaction
with the DCE. Rather than fixing it time and again, remove
the pseudo-insn.
(The whole purpose of those tricks seems to be to allow the
register tracking to be used for the throwing insn before
resetting the tracking for the next block. However, it's
questionable whether that's better than processing the
throwing insn with the subsequent instructions.)
Bug:
20736048
Change-Id: I4767e4609914d3b6990da4416e5093e4ca209780
Narayan Kamath [Thu, 7 May 2015 14:54:47 +0000 (14:54 +0000)]
am
3ba8671d: Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
* commit '
3ba8671d60061359fd833f60f7a9dca14878cc0b':
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
Narayan Kamath [Thu, 7 May 2015 14:54:45 +0000 (14:54 +0000)]
Merge "Fix broken checks in IsValidPartOfMemberNameUtf8Slow."
Vladimir Marko [Thu, 7 May 2015 14:53:41 +0000 (15:53 +0100)]
Quick: Fix DCE to rename SSA regs for degenerate Phis.
If we're inserting a new Phi and all its inputs are the same
SSA reg (for example, we allow a single-input Phi), some
subsequent insn may actually refer to that reg, so we need
to rename it to keep the graph in a consistent state.
Change-Id: Ic6a1907c3138f4a7d3b13f9e58e9107ca2d92f17
Sebastien Hertz [Thu, 7 May 2015 14:32:57 +0000 (14:32 +0000)]
am
eb7c5b19: Merge "JDWP: properly combine location events"
* commit '
eb7c5b192257c92fc38a163c57e0a8bb771e476e':
JDWP: properly combine location events
Sebastien Hertz [Thu, 7 May 2015 14:22:34 +0000 (14:22 +0000)]
Merge "JDWP: properly combine location events"
Narayan Kamath [Wed, 6 May 2015 13:55:43 +0000 (14:55 +0100)]
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
GetUtf16FromUtf8 returns a surrogate pair only if it encounters
a 4-byte UTF sequence. Three byte UTF sequences will only return the
first or second half of a pair so we need to check for that
explicitly.
bug:
20844537
(cherry picked from commit
3ba8671d60061359fd833f60f7a9dca14878cc0b)
Change-Id: I2e2a4f9f736cd11050a2b634b3bb27b75a0ee0ba
Nicolas Geoffray [Thu, 7 May 2015 11:07:53 +0000 (11:07 +0000)]
am
f07f71f9: Merge "Use a growable array instead of an environment during SSA."
* commit '
f07f71f9af8f56e738ef0451c60734ec6022d08e':
Use a growable array instead of an environment during SSA.
Nicolas Geoffray [Thu, 7 May 2015 10:57:03 +0000 (10:57 +0000)]
Merge "Use a growable array instead of an environment during SSA."
Nicolas Geoffray [Thu, 7 May 2015 10:46:05 +0000 (11:46 +0100)]
Use a growable array instead of an environment during SSA.
Using an environment was convenient because it contains
a growable array. But there's no need for the environment
abstraction when being used as a temporary holder for values
of locals.
Change-Id: Idf2883fe4b8f97a31ee70b3627c1bdd23ebfff0e
Narayan Kamath [Wed, 6 May 2015 13:55:43 +0000 (14:55 +0100)]
Fix broken checks in IsValidPartOfMemberNameUtf8Slow.
GetUtf16FromUtf8 returns a surrogate pair only if it encounters
a 4-byte UTF sequence. Three byte UTF sequences will only return the
first or second half of a pair so we need to check for that
explicitly.
bug:
20844537
Change-Id: Icb660fae77ac8a852fc768e6c1cd5766117e68e4
Nicolas Geoffray [Thu, 7 May 2015 09:27:26 +0000 (09:27 +0000)]
am
46a4b268: Merge "Relax the only one back-edge restriction."
* commit '
46a4b26855ae9fcd14c6e4435f37f09ceb134f61':
Relax the only one back-edge restriction.
Nicolas Geoffray [Thu, 7 May 2015 09:27:24 +0000 (09:27 +0000)]
am
bc3b93ea: Merge "No need to relocate the core image for the art script."
* commit '
bc3b93eadd155342b6124d2d5ef3806ecec5dfd6':
No need to relocate the core image for the art script.
Nicolas Geoffray [Thu, 7 May 2015 08:57:23 +0000 (08:57 +0000)]
Merge "Relax the only one back-edge restriction."
Nicolas Geoffray [Tue, 5 May 2015 16:02:20 +0000 (17:02 +0100)]
Relax the only one back-edge restriction.
The rule is in the way for better register allocation, as
it creates an artificial join point between multiple paths.
Change-Id: Ia4392890f95bcea56d143138f28ddce6c572ad58
Nicolas Geoffray [Thu, 7 May 2015 08:15:41 +0000 (08:15 +0000)]
Merge "No need to relocate the core image for the art script."
Jeff Hao [Thu, 7 May 2015 05:28:54 +0000 (05:28 +0000)]
am
5c8fe302: In quick compiler, force string init invoke to be fast path.
* commit '
5c8fe3028655b2f1fcab77080272f071cc0d8bc4':
In quick compiler, force string init invoke to be fast path.
Andreas Gampe [Thu, 7 May 2015 03:59:37 +0000 (03:59 +0000)]
am
a6591ef9: Merge "ART: Fix mips64 jni bugs."
* commit '
a6591ef95afa6bc9d89c0c6044635ec7a13d4c55':
ART: Fix mips64 jni bugs.
Andreas Gampe [Thu, 7 May 2015 03:50:01 +0000 (03:50 +0000)]
Merge "ART: Fix mips64 jni bugs."
Douglas Leung [Fri, 1 May 2015 02:22:49 +0000 (19:22 -0700)]
ART: Fix mips64 jni bugs.
For mips64, 32-bits loads can be zero extended or sign extended to
64-bits. The extension type must match the data type to be loaded.
Also re-enable mips64 generic jni testing.
Change-Id: I9cabaf80b4fde63d9868fccd74593b36d1c324e8
Jeff Hao [Thu, 7 May 2015 01:36:39 +0000 (01:36 +0000)]
am
225f679f: Merge "In quick compiler, force string init invoke to be fast path."
* commit '
225f679f1d276e16e95960fcbe9743f95012adfa':
In quick compiler, force string init invoke to be fast path.
Jeff Hao [Thu, 7 May 2015 01:29:19 +0000 (01:29 +0000)]
Merge "In quick compiler, force string init invoke to be fast path."
Jeff Hao [Thu, 7 May 2015 00:41:32 +0000 (17:41 -0700)]
In quick compiler, force string init invoke to be fast path.
Was running into an issue where a secondary dex file was falling back on
the quick compiler, and IsFastInvoke returned 0 because the
referrer_class was nullptr, causing the string init to be slow path. The
string init technically does not have to be fast path, but there's no
reason to duplicate the logic to call off a thread pointer on the slow
path.
Bug:
20870917
(cherry picked from commit I47e1524d939eb7e9b1da8186092fafc6e925009e)
Change-Id: Ieacd965943759de2b075c30e03cf0a71863f499e
Jeff Hao [Thu, 7 May 2015 00:41:32 +0000 (17:41 -0700)]
In quick compiler, force string init invoke to be fast path.
Was running into an issue where a secondary dex file was falling back on
the quick compiler, and IsFastInvoke returned 0 because the
referrer_class was nullptr, causing the string init to be slow path. The
string init technically does not have to be fast path, but there's no
reason to duplicate the logic to call off a thread pointer on the slow
path.
Bug:
20870917
Change-Id: I47e1524d939eb7e9b1da8186092fafc6e925009e
Andreas Gampe [Thu, 7 May 2015 00:08:29 +0000 (00:08 +0000)]
am
8771be9a: Merge "Fix mips64 bugs."
* commit '
8771be9a5826ebe12cea0c2feb0fa085df5d60a2':
Fix mips64 bugs.
Andreas Gampe [Wed, 6 May 2015 23:53:00 +0000 (23:53 +0000)]
Merge "Fix mips64 bugs."
Vladimir Marko [Wed, 6 May 2015 23:47:56 +0000 (23:47 +0000)]
am
f986daa2: am
23d358b6: Merge "Quick: Inline synthetic accessors generated by jack."
* commit '
f986daa21a790af412482195137dcc7f50d9d0f3':
Quick: Inline synthetic accessors generated by jack.
Nicolas Geoffray [Wed, 6 May 2015 23:47:53 +0000 (23:47 +0000)]
am
07a13059: am
dceab011: Merge "Bump jdwp timeout to 12 minutes."
* commit '
07a1305927997fa944d4a3f65e45bdbeb16ac916':
Bump jdwp timeout to 12 minutes.
Nicolas Geoffray [Wed, 6 May 2015 23:47:40 +0000 (23:47 +0000)]
am
b1c02d37: am
9cce14f5: Merge "Re-enable JDWP tests on volantis."
* commit '
b1c02d374ba8acab72a35c43b1e2e700ce0de8a3':
Re-enable JDWP tests on volantis.
Sebastien Hertz [Wed, 6 May 2015 23:47:39 +0000 (23:47 +0000)]
am
1b1ca21f: am
644fa22a: Merge "Fix instrumentation exit stub for arm64"
* commit '
1b1ca21fcaff3cd124e3f7a134be5fee57217ba9':
Fix instrumentation exit stub for arm64
Andreas Gampe [Wed, 6 May 2015 22:56:11 +0000 (22:56 +0000)]
am
e92d0afc: am
3acc27f4: Merge "Fix Mips64 utils.h typo"
* commit '
e92d0afc3b1b2bb7f33a94bd491451ba99746c34':
Fix Mips64 utils.h typo
Hiroshi Yamauchi [Wed, 6 May 2015 22:55:40 +0000 (22:55 +0000)]
am
6b87b6bd: am
35b6625c: Merge "Temporarily suppress 098-ddmc for the read barrier config."
* commit '
6b87b6bdff5d04a24a2531ab942b578925078747':
Temporarily suppress 098-ddmc for the read barrier config.
Roland Levillain [Wed, 6 May 2015 22:44:58 +0000 (22:44 +0000)]
am
95072ae7: am
2b689e37: Merge "Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts"""""
* commit '
95072ae7446ceaa080c71a7296d98a17325539d8':
Revert "Revert "Revert "Revert "[optimizing] Improve x86 shifts""""
Nicolas Geoffray [Wed, 6 May 2015 22:44:51 +0000 (22:44 +0000)]
am
9b9cb18c: am
898fa9b9: Merge "Find better split positions in the register allocator."
* commit '
9b9cb18cfad2b94aa8d353569ccefae139562f5f':
Find better split positions in the register allocator.