OSDN Git Service
Andreas Gampe [Fri, 26 Jun 2015 21:47:11 +0000 (21:47 +0000)]
am
1bbec636: am
2d0ad78f: Merge "ART: Fix streaming tracing issues"
* commit '
1bbec6364415713c33673a193390b9e921e03707':
ART: Fix streaming tracing issues
Andreas Gampe [Fri, 26 Jun 2015 21:32:40 +0000 (21:32 +0000)]
am
2d0ad78f: Merge "ART: Fix streaming tracing issues"
* commit '
2d0ad78f50cae58d1ca11a497614ca3e1178acc3':
ART: Fix streaming tracing issues
Andreas Gampe [Fri, 26 Jun 2015 21:25:19 +0000 (21:25 +0000)]
Merge "ART: Fix streaming tracing issues"
Andreas Gampe [Tue, 23 Jun 2015 05:53:45 +0000 (22:53 -0700)]
ART: Fix streaming tracing issues
Fix a lock ordering issue in streaming-mode tracing.
Fix a moving-GC issue in streaming-mode tracing. DexCache
objects are not good keys for a map.
Expose streaming mode for testing in run-tests.
Bug:
21760614
(cherry picked from commit
b91205e40fe692061edde19ecb87d51414a7fcee)
Change-Id: Idcd0575684ee3cc0cec3f81b4fdd0d5988c11e8c
Mathieu Chartier [Fri, 26 Jun 2015 21:20:53 +0000 (21:20 +0000)]
am
86b9e90d: am
ffd43f62: Merge "Require mutator lock for DeleteLocalRef" into mnc-dev
* commit '
86b9e90d4c5577d05c574869f6f7fb7abc90b2ae':
Require mutator lock for DeleteLocalRef
Mathieu Chartier [Fri, 26 Jun 2015 21:06:29 +0000 (21:06 +0000)]
am
ffd43f62: Merge "Require mutator lock for DeleteLocalRef" into mnc-dev
* commit '
ffd43f62c23d2cbf84ab549dc37ca1dda2ac438d':
Require mutator lock for DeleteLocalRef
Mathieu Chartier [Fri, 26 Jun 2015 20:58:22 +0000 (20:58 +0000)]
am
46cdab7f: am
83f0a080: Merge "Require mutator lock for DeleteLocalRef"
* commit '
46cdab7f6761c740f58617980f3c47c8e531ad03':
Require mutator lock for DeleteLocalRef
Mathieu Chartier [Fri, 26 Jun 2015 20:57:03 +0000 (20:57 +0000)]
Merge "Require mutator lock for DeleteLocalRef" into mnc-dev
Mathieu Chartier [Fri, 26 Jun 2015 20:46:46 +0000 (20:46 +0000)]
am
83f0a080: Merge "Require mutator lock for DeleteLocalRef"
* commit '
83f0a080b68e9cff9333af030f20f242a7ac9168':
Require mutator lock for DeleteLocalRef
Mathieu Chartier [Fri, 26 Jun 2015 17:47:08 +0000 (10:47 -0700)]
Require mutator lock for DeleteLocalRef
There was a race condition where suspended threads could call
DeleteLocalRef while the GC was marking their roots. This could
cause the GC to attempt to mark a null object.
(cherry picked from commit
dd06afecd67fc6a60856436ab150a4d1b9a8ad29)
Bug:
22119403
Change-Id: I962c717bb87b2acb2a4710a2d7ab16793e031401
Andreas Gampe [Fri, 26 Jun 2015 20:27:48 +0000 (20:27 +0000)]
am
1ac55c79: am
b91205e4: ART: Fix streaming tracing issues
* commit '
1ac55c79e1acafa0ed967ce63217953be7d54d20':
ART: Fix streaming tracing issues
Mathieu Chartier [Fri, 26 Jun 2015 20:08:26 +0000 (20:08 +0000)]
Merge "Require mutator lock for DeleteLocalRef"
Andreas Gampe [Fri, 26 Jun 2015 20:01:39 +0000 (20:01 +0000)]
am
b91205e4: ART: Fix streaming tracing issues
* commit '
b91205e40fe692061edde19ecb87d51414a7fcee':
ART: Fix streaming tracing issues
Mathieu Chartier [Fri, 26 Jun 2015 17:47:08 +0000 (10:47 -0700)]
Require mutator lock for DeleteLocalRef
There was a race condition where suspended threads could call
DeleteLocalRef while the GC was marking their roots. This could
cause the GC to attempt to mark a null object.
Bug:
22119403
Change-Id: I962c717bb87b2acb2a4710a2d7ab16793e031401
David Brazdil [Fri, 26 Jun 2015 19:26:06 +0000 (20:26 +0100)]
Revert "ART: Bail out immediately on try/catch"
This is an MNC-only CL and should not be merged downstream.
This reverts commit
1ff04abecc7318826248c24850c1116df5b68b33.
Vladimir Marko [Fri, 26 Jun 2015 17:42:24 +0000 (17:42 +0000)]
am
2b86c8c3: am
8d1a8c00: Merge "ART: Ignore repeated field indexes when loading a class."
* commit '
2b86c8c382b924251df866fec7be8ef6d69a3f05':
ART: Ignore repeated field indexes when loading a class.
Vladimir Marko [Fri, 26 Jun 2015 17:32:40 +0000 (17:32 +0000)]
am
8d1a8c00: Merge "ART: Ignore repeated field indexes when loading a class."
* commit '
8d1a8c00b89775a251ac5e26a557f81ac1491a44':
ART: Ignore repeated field indexes when loading a class.
Vladimir Marko [Fri, 26 Jun 2015 17:25:29 +0000 (17:25 +0000)]
Merge "ART: Ignore repeated field indexes when loading a class."
Andreas Gampe [Tue, 23 Jun 2015 05:53:45 +0000 (22:53 -0700)]
ART: Fix streaming tracing issues
Fix a lock ordering issue in streaming-mode tracing.
Fix a moving-GC issue in streaming-mode tracing. DexCache
objects are not good keys for a map.
Expose streaming mode for testing in run-tests.
Bug:
21760614
Change-Id: Idcd0575684ee3cc0cec3f81b4fdd0d5988c11e8c
David Brazdil [Fri, 26 Jun 2015 16:30:08 +0000 (16:30 +0000)]
am
1f90bf36: am
1ff04abe: ART: Bail out immediately on try/catch
* commit '
1f90bf360423b1600c90f667a01357d2bb29eedf':
ART: Bail out immediately on try/catch
David Brazdil [Fri, 26 Jun 2015 16:18:09 +0000 (16:18 +0000)]
am
1ff04abe: ART: Bail out immediately on try/catch
* commit '
1ff04abecc7318826248c24850c1116df5b68b33':
ART: Bail out immediately on try/catch
David Brazdil [Fri, 26 Jun 2015 15:58:14 +0000 (16:58 +0100)]
ART: Bail out immediately on try/catch
Optimizing builds the graph even if it knows it will delegate to
Quick. This patch moves the decision at the beginning of the
TryCompile function to save a little bit of compile time.
Bug:
22115561
Change-Id: I18b5a686e10592080ea3c49d53a0dd81aa3b3010
David Brazdil [Fri, 26 Jun 2015 15:14:24 +0000 (15:14 +0000)]
am
fdd43656: am
b485915a: Merge "Revert "Revert "ART: Implement try/catch blocks in Builder"""
* commit '
fdd43656956af2a86d1ec0115b93ccda251b9f0c':
Revert "Revert "ART: Implement try/catch blocks in Builder""
Andreas Gampe [Fri, 26 Jun 2015 15:09:25 +0000 (15:09 +0000)]
am
9aa4b6cb: am
5597b422: Merge "ART: Fix kEverything compiler filter" into mnc-dev
* commit '
9aa4b6cb6d8d51a9f8573d37dc963828b0b702df':
ART: Fix kEverything compiler filter
Andreas Gampe [Fri, 26 Jun 2015 15:09:24 +0000 (15:09 +0000)]
am
1be6044b: am
ad805685: ART: Only print stripped dex2oat command line
* commit '
1be6044be3c5b390120b250acaa2dbb7d0e47e07':
ART: Only print stripped dex2oat command line
David Brazdil [Fri, 26 Jun 2015 15:02:31 +0000 (15:02 +0000)]
am
b485915a: Merge "Revert "Revert "ART: Implement try/catch blocks in Builder"""
* commit '
b485915afd8a6396df7863b651dfe832038fd680':
Revert "Revert "ART: Implement try/catch blocks in Builder""
David Brazdil [Fri, 26 Jun 2015 14:52:36 +0000 (14:52 +0000)]
Merge "Revert "Revert "ART: Implement try/catch blocks in Builder"""
Vladimir Marko [Wed, 24 Jun 2015 13:28:03 +0000 (14:28 +0100)]
ART: Ignore repeated field indexes when loading a class.
This provides a deterministic behavior for classes with
duplicate field indexes in class_data_item and avoids
failures when verifying the field ordering in debug build.
Regression test not feasible without hand-edited dex file.
(Smali deduplicates field definitions.)
Bug:
21868015
Change-Id: I4f97ba005e063686f8f44248ed7f1286d987888a
David Brazdil [Fri, 26 Jun 2015 10:33:45 +0000 (10:33 +0000)]
Revert "Revert "ART: Implement try/catch blocks in Builder""
This patch enables the GraphBuilder to generate blocks and edges which
represent the exceptional control flow when try/catch blocks are
present in the code. Actual compilation is still delegated to Quick
and Baseline ignores the additional code.
To represent the relationship between try and catch blocks, Builder
splits the edges which enter/exit a try block and links the newly
created blocks to the corresponding exception handlers. This layout
will later enable the SsaBuilder to correctly infer the dominators of
the catch blocks and to produce the appropriate reverse post ordering.
It will not, however, allow for building the complete SSA form of the
catch blocks and consequently optimizing such blocks.
To this end, a new TryBoundary control-flow instruction is introduced.
Codegen treats it the same as a Goto but it allows for additional
successors (the handlers).
This reverts commit
3e18738bd338e9f8363b26bc895f38c0ec682824.
Change-Id: I4f5ea961848a0b83d8db3673763861633e9bfcfb
Roland Levillain [Fri, 26 Jun 2015 11:56:40 +0000 (11:56 +0000)]
am
a08a60a3: am
4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisation framework."
* commit '
a08a60a323b42d1e712e8c610b00141097352625':
Minor fixes to mips64 for the arch-specific optimisation framework.
Roland Levillain [Fri, 26 Jun 2015 11:43:14 +0000 (11:43 +0000)]
am
4a08e17a: Merge "Minor fixes to mips64 for the arch-specific optimisation framework."
* commit '
4a08e17a9db0f68b9623849bc288c31a47868fbc':
Minor fixes to mips64 for the arch-specific optimisation framework.
Roland Levillain [Fri, 26 Jun 2015 11:33:01 +0000 (11:33 +0000)]
Merge "Minor fixes to mips64 for the arch-specific optimisation framework."
David Brazdil [Fri, 26 Jun 2015 10:22:19 +0000 (10:22 +0000)]
am
ccc95333: am
d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""
* commit '
ccc95333e2a166ba8c06bd3fd339e4f679c28dd4':
Revert "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 10:22:18 +0000 (10:22 +0000)]
am
24067c2f: am
610a0499: Merge "Revert "ART: Fix gtests after try/catch change""
* commit '
24067c2f0d02903d3c2560f4711b3edcb2469c7e':
Revert "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 10:10:43 +0000 (10:10 +0000)]
am
d3eaade8: Merge "Revert "ART: Implement try/catch blocks in Builder""
* commit '
d3eaade87ac079accca30473ef0a3b38ab600828':
Revert "ART: Implement try/catch blocks in Builder"
David Brazdil [Fri, 26 Jun 2015 10:10:41 +0000 (10:10 +0000)]
am
610a0499: Merge "Revert "ART: Fix gtests after try/catch change""
* commit '
610a04994ea5988bd6e2e056b658182ec9c445e3':
Revert "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 10:00:03 +0000 (10:00 +0000)]
Merge "Revert "ART: Implement try/catch blocks in Builder""
David Brazdil [Fri, 26 Jun 2015 09:59:52 +0000 (09:59 +0000)]
Revert "ART: Implement try/catch blocks in Builder"
Causes OutOfMemory issues, need to investigate.
This reverts commit
0b5c7d1994b76090afcc825e737f2b8c546da2f8.
Change-Id: I263e6cc4df5f9a56ad2ce44e18932ca51d7e349f
David Brazdil [Fri, 26 Jun 2015 09:59:19 +0000 (09:59 +0000)]
Merge "Revert "ART: Fix gtests after try/catch change""
David Brazdil [Fri, 26 Jun 2015 09:59:06 +0000 (09:59 +0000)]
Revert "ART: Fix gtests after try/catch change"
Need to revert the whole try/catch CL until issues are fixed.
This reverts commit
a65930de077a4d7c1110e66ccd950061a85353d0.
Change-Id: Idd69215c87230a8616923665a55fe81891c78bec
David Brazdil [Fri, 26 Jun 2015 09:46:54 +0000 (09:46 +0000)]
am
126a9db3: am
6808a0e5: Merge "ART: Fix gtests after try/catch change"
* commit '
126a9db37db4867ba2c2433c9ef0bf1e84d1b74d':
ART: Fix gtests after try/catch change
David Brazdil [Fri, 26 Jun 2015 09:46:53 +0000 (09:46 +0000)]
am
580ed5ee: am
2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"
* commit '
580ed5ee62eacb0d9dfd602acc473025a940697d':
ART: Implement try/catch blocks in Builder
Nicolas Geoffray [Fri, 26 Jun 2015 09:46:51 +0000 (09:46 +0000)]
am
92e8c947: am
e4a15549: Merge "List test as flaky."
* commit '
92e8c9470869c5bf83afe3d0b747ec990542a281':
List test as flaky.
David Brazdil [Fri, 26 Jun 2015 09:38:45 +0000 (09:38 +0000)]
am
6808a0e5: Merge "ART: Fix gtests after try/catch change"
* commit '
6808a0e50a3caca2ccdf22e87cae1796d886d9aa':
ART: Fix gtests after try/catch change
David Brazdil [Fri, 26 Jun 2015 09:38:43 +0000 (09:38 +0000)]
am
2f81cd8f: Merge "ART: Implement try/catch blocks in Builder"
* commit '
2f81cd8f4ff21caf133024795bd5ae028c9f68cd':
ART: Implement try/catch blocks in Builder
Nicolas Geoffray [Fri, 26 Jun 2015 09:38:42 +0000 (09:38 +0000)]
am
e4a15549: Merge "List test as flaky."
* commit '
e4a15549608b1c5b1e1cb32f840a8467602dcc14':
List test as flaky.
David Brazdil [Fri, 26 Jun 2015 09:33:32 +0000 (09:33 +0000)]
Merge "ART: Fix gtests after try/catch change"
David Brazdil [Fri, 26 Jun 2015 09:26:47 +0000 (10:26 +0100)]
ART: Fix gtests after try/catch change
The try/catch CL changed the order in which instructions were added
into entry/exit blocks which broke the sensitive gtests. This patch
swaps the order back.
Change-Id: Ib337491e5571a2cd38d6784275642f008886cc2a
David Brazdil [Fri, 26 Jun 2015 08:56:45 +0000 (08:56 +0000)]
Merge "ART: Implement try/catch blocks in Builder"
Nicolas Geoffray [Fri, 26 Jun 2015 08:25:03 +0000 (08:25 +0000)]
Merge "List test as flaky."
Nicolas Geoffray [Fri, 26 Jun 2015 08:24:16 +0000 (09:24 +0100)]
List test as flaky.
bug:
22106064
Change-Id: I54b7d38162bebdd1338d498f4f89734ffe28c563
Andreas Gampe [Fri, 26 Jun 2015 03:28:01 +0000 (03:28 +0000)]
am
5597b422: Merge "ART: Fix kEverything compiler filter" into mnc-dev
* commit '
5597b422882a5ab9dc5eaaedd644e30bc2fd7c05':
ART: Fix kEverything compiler filter
Andreas Gampe [Fri, 26 Jun 2015 03:28:00 +0000 (03:28 +0000)]
am
ad805685: ART: Only print stripped dex2oat command line
* commit '
ad805685621cd6cd8a8144f7f83a69fd1fc171e5':
ART: Only print stripped dex2oat command line
Andreas Gampe [Fri, 26 Jun 2015 03:16:10 +0000 (03:16 +0000)]
Merge "ART: Fix kEverything compiler filter" into mnc-dev
Andreas Gampe [Fri, 26 Jun 2015 02:52:35 +0000 (02:52 +0000)]
am
bbecbeae: am
eeca5451: Merge "ART: Only print stripped dex2oat command line"
* commit '
bbecbeae909a38c63ac83a8e57c2b2e1f5f7961c':
ART: Only print stripped dex2oat command line
Andreas Gampe [Fri, 26 Jun 2015 02:40:58 +0000 (02:40 +0000)]
am
eeca5451: Merge "ART: Only print stripped dex2oat command line"
* commit '
eeca5451918dc36aab02a46e945330d3d4a9c18e':
ART: Only print stripped dex2oat command line
Andreas Gampe [Tue, 19 May 2015 06:22:54 +0000 (23:22 -0700)]
ART: Only print stripped dex2oat command line
To curb logcat noise, strip many dex2oat parameters from the
logcat printout.
Bug:
20501758
(cherry picked from commit
046c706707ea0f16c804136e237ac7cbfdc897a1)
Change-Id: Ifc367f91f593916e0773af1ca950c798f129889f
Andreas Gampe [Fri, 26 Jun 2015 02:32:14 +0000 (02:32 +0000)]
Merge "ART: Only print stripped dex2oat command line"
buzbee [Thu, 25 Jun 2015 22:53:45 +0000 (15:53 -0700)]
ART: Fix kEverything compiler filter
Previously the kEverything filter failed to compile class
initializers. Now it will.
Bug:
19576257
(cherry picked from commit
c83329952b4a313e747c8835a73699e2cae5a6e2)
Change-Id: I189d2b5b379aee112c4e95f8d3e6c32abab6ed41
Andreas Gampe [Tue, 19 May 2015 06:22:54 +0000 (23:22 -0700)]
ART: Only print stripped dex2oat command line
To curb logcat noise, strip many dex2oat parameters from the
logcat printout.
Bug:
20501758
Change-Id: Ifc367f91f593916e0773af1ca950c798f129889f
buzbee [Thu, 25 Jun 2015 23:28:07 +0000 (23:28 +0000)]
am
6b846ca9: am
52ce9a2d: Merge "ART: Fix kEverything compiler filter"
* commit '
6b846ca9ad84a3e842c150a5acd84478600746a1':
ART: Fix kEverything compiler filter
Igor Murashkin [Thu, 25 Jun 2015 23:28:05 +0000 (23:28 +0000)]
am
f7951fbc: am
6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"
* commit '
f7951fbc69ac2386135c8a1f427bada835f10be1':
interpreter: Fix string init for soft-failed invokes
buzbee [Thu, 25 Jun 2015 23:15:14 +0000 (23:15 +0000)]
am
52ce9a2d: Merge "ART: Fix kEverything compiler filter"
* commit '
52ce9a2d8d36a5f2f09c4de37182cd356cbd34cf':
ART: Fix kEverything compiler filter
Igor Murashkin [Thu, 25 Jun 2015 23:15:12 +0000 (23:15 +0000)]
am
6056c8fb: Merge "interpreter: Fix string init for soft-failed invokes"
* commit '
6056c8fb5d397e0cb97221dc70def239597c252e':
interpreter: Fix string init for soft-failed invokes
buzbee [Thu, 25 Jun 2015 23:07:46 +0000 (23:07 +0000)]
Merge "ART: Fix kEverything compiler filter"
Igor Murashkin [Thu, 25 Jun 2015 23:07:42 +0000 (23:07 +0000)]
Merge "interpreter: Fix string init for soft-failed invokes"
buzbee [Thu, 25 Jun 2015 22:53:45 +0000 (15:53 -0700)]
ART: Fix kEverything compiler filter
Previously the kEverything filter failed to compile class
initializers. Now it will.
Bug:
19576257
Change-Id: I189d2b5b379aee112c4e95f8d3e6c32abab6ed41
Mathieu Chartier [Thu, 25 Jun 2015 22:27:18 +0000 (22:27 +0000)]
am
c863f23e: am
d7f3c38f: Merge "Make allocation tracker use less memory"
* commit '
c863f23ede9ecc2d56b942b56b9b317d62a84c2d':
Make allocation tracker use less memory
Igor Murashkin [Thu, 25 Jun 2015 22:18:12 +0000 (15:18 -0700)]
interpreter: Fix string init for soft-failed invokes
Bug:
22040916
Change-Id: Id5b6f0f29e763c31bab4d85877cd8aaf02334e48
Mathieu Chartier [Thu, 25 Jun 2015 22:14:39 +0000 (22:14 +0000)]
am
d7f3c38f: Merge "Make allocation tracker use less memory"
* commit '
d7f3c38f1b1d23c08b91abb474e08da3105689f8':
Make allocation tracker use less memory
Mathieu Chartier [Thu, 25 Jun 2015 22:02:33 +0000 (22:02 +0000)]
Merge "Make allocation tracker use less memory"
Andreas Gampe [Thu, 25 Jun 2015 21:12:32 +0000 (21:12 +0000)]
am
c2ba5c38: am
dfda6d74: Merge "Fixed bug in debugging information in dex file"
* commit '
c2ba5c38677a01eb2dcf8575b6405a914410e5bf':
Fixed bug in debugging information in dex file
Man Cao [Tue, 23 Jun 2015 23:38:25 +0000 (16:38 -0700)]
Make allocation tracker use less memory
The allocation tracker no longer keeps recently allocated objects live.
Instead it just keeps their class objects live as strong roots. This fixed
the gc-stress test failure for 098-ddmc.
Also fixed the issue in DisableNewSystemWeak() for allocation tracker,
by making new allocation to wait until GC's sweeping to complete. I didn't
feel any significant slowdown with this wait.
Bug:
20037135
Change-Id: I6a98188832cf7ee478007e3788e742dc6e18f7b8
Andreas Gampe [Thu, 25 Jun 2015 21:01:11 +0000 (21:01 +0000)]
am
dfda6d74: Merge "Fixed bug in debugging information in dex file"
* commit '
dfda6d74f97891d1b61027de9b4dca9bcd7c197d':
Fixed bug in debugging information in dex file
Andreas Gampe [Thu, 25 Jun 2015 20:51:42 +0000 (20:51 +0000)]
Merge "Fixed bug in debugging information in dex file"
Andreas Gampe [Thu, 25 Jun 2015 20:21:27 +0000 (20:21 +0000)]
am
d7dcb25c: am
6415013f: ART: Reset runtime_throw_failure flag
* commit '
d7dcb25c86a0db2346521a9013eb24208f22f110':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 20:07:39 +0000 (20:07 +0000)]
am
6415013f: ART: Reset runtime_throw_failure flag
* commit '
6415013f0b9509fed8367871daaf66c6841223f1':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 19:54:51 +0000 (19:54 +0000)]
am
c4df3b9a: am
f3274f85: Merge "ART: Reset runtime_throw_failure flag"
* commit '
c4df3b9a46475c7e0e4d5815f11d374ec06cfb77':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 17:26:40 +0000 (10:26 -0700)]
ART: Reset runtime_throw_failure flag
The flag is instruction-specific. It transports the info from Fail
to the main loop. It must be cleared after each iteration.
Introduce a second flag to store whether we saw such a failure at
all.
Update test expectations.
Bug:
22080519
(cherry picked from commit
d12e782bcee03ecb6dec41aa9673ef53b638dcea)
Change-Id: I32be914819946233babaa4cb7343844d97b61ba5
Andreas Gampe [Thu, 25 Jun 2015 19:42:40 +0000 (19:42 +0000)]
am
f3274f85: Merge "ART: Reset runtime_throw_failure flag"
* commit '
f3274f8514636e7f52171a2e6b018017b34784e5':
ART: Reset runtime_throw_failure flag
Andreas Gampe [Thu, 25 Jun 2015 19:34:41 +0000 (19:34 +0000)]
Merge "ART: Reset runtime_throw_failure flag"
Andreas Gampe [Thu, 25 Jun 2015 17:26:40 +0000 (10:26 -0700)]
ART: Reset runtime_throw_failure flag
The flag is instruction-specific. It transports the info from Fail
to the main loop. It must be cleared after each iteration.
Introduce a second flag to store whether we saw such a failure at
all.
Update test expectations.
Bug:
22080519
Change-Id: I32be914819946233babaa4cb7343844d97b61ba5
Andreas Gampe [Thu, 25 Jun 2015 18:17:03 +0000 (18:17 +0000)]
am
e993dfd1: am
005deb0a: ART: Set methods to preverified in verify-none
* commit '
e993dfd1e8b75d1085b15e59f384926769cd078f':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 18:06:31 +0000 (18:06 +0000)]
am
005deb0a: ART: Set methods to preverified in verify-none
* commit '
005deb0a1683f9ee03a2cf2785dc6a7d7a8f16be':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 17:48:48 +0000 (17:48 +0000)]
am
ea65e429: am
292edf0d: Merge "ART: Set methods to preverified in verify-none"
* commit '
ea65e429e0170d032e4dc1460dbe20f386b25fbf':
ART: Set methods to preverified in verify-none
Andreas Gampe [Thu, 25 Jun 2015 17:34:31 +0000 (17:34 +0000)]
am
292edf0d: Merge "ART: Set methods to preverified in verify-none"
* commit '
292edf0dacca4b0220522c9b4465638da18dadf4':
ART: Set methods to preverified in verify-none
Aart Bik [Wed, 24 Jun 2015 23:33:32 +0000 (16:33 -0700)]
Fixed bug in debugging information in dex file
Rationale:
Not resetting signature field may cause "leaking" old extended
value into new non-extended value (exposed while implementing
an Art-based dexdump; it affects all debug iterators though)
Bug:
17442393
Change-Id: I4d1e2357ab7e0d77dbcf09786f24ac5cc54160b9
Andreas Gampe [Wed, 24 Jun 2015 23:25:33 +0000 (16:25 -0700)]
ART: Set methods to preverified in verify-none
Actually mark all methods to be verified, so that the interpreter
doesn't do access checks. Speedup is about 2x on a Nexus 6 when booting
in verify-none mode.
Bug:
22040916
(cherry picked from commit
1c284f2abdfe1b0ed87d5216021e69146f10b116)
Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560
Andreas Gampe [Thu, 25 Jun 2015 17:24:31 +0000 (17:24 +0000)]
Merge "ART: Set methods to preverified in verify-none"
Andreas Gampe [Wed, 24 Jun 2015 23:25:33 +0000 (16:25 -0700)]
ART: Set methods to preverified in verify-none
Actually mark all methods to be verified, so that the interpreter
doesn't do access checks. Speedup is about 2x on a Nexus 6 when booting
in verify-none mode.
Bug:
22040916
Change-Id: I2d6c8df2a68eae6e358da2639d980cb8bfcc1560
Richard Uhler [Thu, 25 Jun 2015 17:15:54 +0000 (17:15 +0000)]
am
d4c47ec9: am
1f77078d: Merge "Do not try to compile resource-only dex files."
* commit '
d4c47ec9c41e481ea9d2d10672eccb99564f916e':
Do not try to compile resource-only dex files.
Richard Uhler [Thu, 25 Jun 2015 17:09:15 +0000 (17:09 +0000)]
am
1f77078d: Merge "Do not try to compile resource-only dex files."
* commit '
1f77078d818648415f9cf193c2b36ae56bd1cf38':
Do not try to compile resource-only dex files.
Richard Uhler [Thu, 25 Jun 2015 16:52:45 +0000 (16:52 +0000)]
Merge "Do not try to compile resource-only dex files."
Richard Uhler [Thu, 25 Jun 2015 16:02:03 +0000 (16:02 +0000)]
am
c45f922c: am
9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
* commit '
c45f922c8fc1be789798236c9aeef0db55143dbd':
Do not try to compile resource-only dex files.
David Brazdil [Thu, 11 Jun 2015 10:17:49 +0000 (11:17 +0100)]
ART: Implement try/catch blocks in Builder
This patch enables the GraphBuilder to generate blocks and edges which
represent the exceptional control flow when try/catch blocks are
present in the code. Actual compilation is still delegated to Quick
and Baseline ignores the additional code.
To represent the relationship between try and catch blocks, Builder
splits the edges which enter/exit a try block and links the newly
created blocks to the corresponding exception handlers. This layout
will later enable the SsaBuilder to correctly infer the dominators of
the catch blocks and to produce the appropriate reverse post ordering.
It will not, however, allow for building the complete SSA form of the
catch blocks and consequently optimizing such blocks.
To this end, a new TryBoundary control-flow instruction is introduced.
Codegen treats it the same as a Goto but it allows for additional
successors (the handlers).
Change-Id: I415b985596d5bebb7b1bb358a46e08b7b04bb53a
Vladimir Marko [Thu, 25 Jun 2015 15:56:06 +0000 (16:56 +0100)]
resolved conflicts for merge of
85e9888d to mnc-dev-plus-aosp
Nicolas Geoffray [Thu, 25 Jun 2015 15:34:52 +0000 (16:34 +0100)]
resolved conflicts for merge of
f717cfc6 to mnc-dev-plus-aosp
Change-Id: Idbdcf3971240bace78e59cabb35d1815a794d903
Richard Uhler [Wed, 24 Jun 2015 15:44:19 +0000 (08:44 -0700)]
Do not try to compile resource-only dex files.
This changes behavior in the case where we are asked to load a dex
file that does not exist or has no classes.dex entry.
Previously we would run dex2oat, which would log an error message and
fail. Now we skip running dex2oat, we report the DexOptStatus as
kNoDexOptNeeded, and we do not try to fall back to the missing
original dex files.
Bug:
21722039
(cherry picked from commit
cb44b11a926696e34b3dc44288e762b4303cc128)
Change-Id: I84a85dc9ece54bcc0a5283f871e09bf68471c6e7
Richard Uhler [Thu, 25 Jun 2015 15:32:37 +0000 (15:32 +0000)]
am
9ae03f09: Merge "Do not try to compile resource-only dex files." into mnc-dev
* commit '
9ae03f09f33c64b6589e85faeac4142b80531b10':
Do not try to compile resource-only dex files.
Nicolas Geoffray [Thu, 25 Jun 2015 15:27:13 +0000 (15:27 +0000)]
am
de85ec30: am
7467fa30: Merge "Pass LD_USE_LOAD_BIAS to the art script."
* commit '
de85ec30d99997f0606dc4bc51dbf5918c4ee0aa':
Pass LD_USE_LOAD_BIAS to the art script.