OSDN Git Service
Igor Murashkin [Fri, 17 Oct 2014 09:02:32 +0000 (09:02 +0000)]
am
dddb8d89: Merge "dex2oat: Add a --compile-pic option"
* commit '
dddb8d891adad3f55308a725658134b6c9f5559b':
dex2oat: Add a --compile-pic option
Ian Rogers [Fri, 17 Oct 2014 09:02:31 +0000 (09:02 +0000)]
am
b3f18cf7: Merge "Make ART compile with GCC -O0 again."
* commit '
b3f18cf7466f85e15c6b7f005f544867a4d6847a':
Make ART compile with GCC -O0 again.
Mathieu Chartier [Fri, 17 Oct 2014 09:02:30 +0000 (09:02 +0000)]
am
cb142101: Merge "Add way to ensure we are at the front of the sigaction chain"
* commit '
cb142101f29a4f1e097f03a220db3da6d4bd679f':
Add way to ensure we are at the front of the sigaction chain
Mathieu Chartier [Fri, 17 Oct 2014 09:02:29 +0000 (09:02 +0000)]
am
d866c761: Merge "Add OOME try catch around gc-thrash dive logic"
* commit '
d866c7616cb3426c431b635ae69964ce69c2ecb5':
Add OOME try catch around gc-thrash dive logic
Mathieu Chartier [Fri, 17 Oct 2014 07:50:06 +0000 (07:50 +0000)]
am
1f24296c: (-s ours) Add way to ensure we are at the front of the sigaction chain
* commit '
1f24296c7c8a6501ee2388c0d20b48f471b48660':
Add way to ensure we are at the front of the sigaction chain
Igor Murashkin [Fri, 17 Oct 2014 03:13:06 +0000 (03:13 +0000)]
Merge "dex2oat: Add a --compile-pic option"
Ian Rogers [Fri, 17 Oct 2014 02:29:32 +0000 (02:29 +0000)]
Merge "Make ART compile with GCC -O0 again."
Ian Rogers [Wed, 15 Oct 2014 00:41:57 +0000 (17:41 -0700)]
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug:
17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Mathieu Chartier [Fri, 17 Oct 2014 02:17:11 +0000 (02:17 +0000)]
Merge "Add way to ensure we are at the front of the sigaction chain"
Mathieu Chartier [Wed, 15 Oct 2014 23:59:47 +0000 (16:59 -0700)]
Add way to ensure we are at the front of the sigaction chain
Calling this after jni_on_load fixes the unity apps. This is
not exactly correct since we may already have the following chain.
Start up:
Us -> debuggerd
After app goes in front:
App -> us -> debuggerd
After we put ourself back at the front:
Us -> app -> us -> app -> .... stack overflow.
Bug:
17620677
Change-Id: I9183997e3d5ebd51c320b5d51425be5142e938f3
(cherry picked from commit
1f24296c7c8a6501ee2388c0d20b48f471b48660)
Igor Murashkin [Fri, 17 Oct 2014 01:36:16 +0000 (18:36 -0700)]
dex2oat: Add a --compile-pic option
Change-Id: I80e03613e3b6ac079bcbc7e068bbaae760c364c9
Mathieu Chartier [Wed, 15 Oct 2014 23:59:47 +0000 (16:59 -0700)]
Add way to ensure we are at the front of the sigaction chain
Calling this after jni_on_load fixes the unity apps. This is
not exactly correct since we may already have the following chain.
Start up:
Us -> debuggerd
After app goes in front:
App -> us -> debuggerd
After we put ourself back at the front:
Us -> app -> us -> app -> .... stack overflow.
Bug:
17620677
Change-Id: I9183997e3d5ebd51c320b5d51425be5142e938f3
Mathieu Chartier [Thu, 16 Oct 2014 22:20:00 +0000 (22:20 +0000)]
Merge "Add OOME try catch around gc-thrash dive logic"
Ian Rogers [Thu, 16 Oct 2014 19:37:28 +0000 (19:37 +0000)]
am
2eb03e6f: Merge "Remove test dependencies on phony targets."
* commit '
2eb03e6f2af292c8b8cd518a662a61d3fcb17449':
Remove test dependencies on phony targets.
Ian Rogers [Thu, 16 Oct 2014 19:26:54 +0000 (19:26 +0000)]
Merge "Remove test dependencies on phony targets."
Vladimir Marko [Thu, 16 Oct 2014 18:10:22 +0000 (18:10 +0000)]
am
4ffed256: Merge "Quick: Avoid node iteration for passes that don\'t need it."
* commit '
4ffed256cfae742e36ee735f806137f0d4a2f4b6':
Quick: Avoid node iteration for passes that don't need it.
Vladimir Marko [Thu, 16 Oct 2014 18:10:17 +0000 (18:10 +0000)]
am
9ab7816a: Merge "Quick: Handle kMirOpNullCheck in LVN/GVN."
* commit '
9ab7816aec7264d79750e93021ab8714822a038f':
Quick: Handle kMirOpNullCheck in LVN/GVN.
Vladimir Marko [Thu, 16 Oct 2014 18:02:25 +0000 (18:02 +0000)]
Merge "Quick: Avoid node iteration for passes that don't need it."
Vladimir Marko [Thu, 16 Oct 2014 18:01:00 +0000 (18:01 +0000)]
Merge "Quick: Handle kMirOpNullCheck in LVN/GVN."
Mathieu Chartier [Thu, 16 Oct 2014 17:01:39 +0000 (10:01 -0700)]
Add OOME try catch around gc-thrash dive logic
Bug:
17962200
Change-Id: I4ed1f7ac2b07795b5e30ccb5b322cbe47e237ba8
Nicolas Geoffray [Thu, 16 Oct 2014 14:27:58 +0000 (14:27 +0000)]
am
dc43794b: Merge "Don\'t use assembler classes in code_generator.h."
* commit '
dc43794b146283b2ba588db83d1fac1f8a3af6d3':
Don't use assembler classes in code_generator.h.
Nicolas Geoffray [Thu, 16 Oct 2014 14:20:58 +0000 (14:20 +0000)]
Merge "Don't use assembler classes in code_generator.h."
Nicolas Geoffray [Thu, 16 Oct 2014 10:12:52 +0000 (11:12 +0100)]
Don't use assembler classes in code_generator.h.
The arm64 backend uses its own assembler and does not share
the same classes as the other backends. To avoid conflicts
or unnecessary mappings, just don't use those classes in the
shared part of the code generator.
Change-Id: I9e5fa40c1021d2e83a4ef14c52cd1ccd03f2f73d
Roland Levillain [Thu, 16 Oct 2014 13:33:40 +0000 (13:33 +0000)]
am
ec2ea6ff: Merge "Implement default traversals in CFG & SSA graph checkers."
* commit '
ec2ea6ff6e3d7816df889454866a28b58ce6e6f5':
Implement default traversals in CFG & SSA graph checkers.
Roland Levillain [Thu, 16 Oct 2014 13:26:29 +0000 (13:26 +0000)]
Merge "Implement default traversals in CFG & SSA graph checkers."
Roland Levillain [Thu, 16 Oct 2014 13:20:00 +0000 (13:20 +0000)]
am
c15c4066: Merge "Improve art::SSAChecker::VisitInstruction."
* commit '
c15c4066233b644f3086eef80007a7cf878d4867':
Improve art::SSAChecker::VisitInstruction.
Roland Levillain [Thu, 16 Oct 2014 13:12:56 +0000 (13:12 +0000)]
Merge "Improve art::SSAChecker::VisitInstruction."
Roland Levillain [Thu, 16 Oct 2014 13:04:42 +0000 (13:04 +0000)]
am
dd36b428: Merge "Do not remove NullChecks & BoundsChecks in HDeadCodeElimination."
* commit '
dd36b42837b78876eabe86b136474490e3d016cc':
Do not remove NullChecks & BoundsChecks in HDeadCodeElimination.
Roland Levillain [Thu, 16 Oct 2014 12:59:58 +0000 (12:59 +0000)]
am
1604027a: Merge "Turn constant conditional jumps into unconditional jumps."
* commit '
1604027a8a87fc100aa3b8899ad710c2f313ca45':
Turn constant conditional jumps into unconditional jumps.
Roland Levillain [Thu, 16 Oct 2014 12:59:34 +0000 (12:59 +0000)]
Merge "Do not remove NullChecks & BoundsChecks in HDeadCodeElimination."
Roland Levillain [Thu, 16 Oct 2014 12:51:34 +0000 (12:51 +0000)]
Merge "Turn constant conditional jumps into unconditional jumps."
Vladimir Marko [Thu, 16 Oct 2014 12:38:44 +0000 (13:38 +0100)]
Quick: Handle kMirOpNullCheck in LVN/GVN.
Change-Id: I0274e98cc61ccd1dbe0bd3e50deeb7d62bd1cb22
Vladimir Marko [Thu, 16 Oct 2014 11:38:37 +0000 (11:38 +0000)]
am
f1eb1002: Merge "Quick: Improve the BBCombine pass."
* commit '
f1eb10024d616c15af3b0cd81acabe59131be918':
Quick: Improve the BBCombine pass.
Vladimir Marko [Thu, 16 Oct 2014 11:29:59 +0000 (11:29 +0000)]
Merge "Quick: Improve the BBCombine pass."
Vladimir Marko [Thu, 16 Oct 2014 09:32:29 +0000 (09:32 +0000)]
am
8fc5acfd: Merge "Rewrite null check elimination to work on dalvik regs."
* commit '
8fc5acfd382bdc0d7920e8a13439b64344a8988a':
Rewrite null check elimination to work on dalvik regs.
Vladimir Marko [Thu, 16 Oct 2014 08:58:35 +0000 (08:58 +0000)]
Merge "Rewrite null check elimination to work on dalvik regs."
Jeff Hao [Thu, 16 Oct 2014 00:35:45 +0000 (00:35 +0000)]
am
16b842af: Merge "Store exiting thread ids and names while tracing to output later."
* commit '
16b842af16286243baa5e1ad07ce25f14a730df3':
Store exiting thread ids and names while tracing to output later.
Jeff Hao [Thu, 16 Oct 2014 00:25:14 +0000 (00:25 +0000)]
Merge "Store exiting thread ids and names while tracing to output later."
Mathieu Chartier [Wed, 15 Oct 2014 21:55:19 +0000 (21:55 +0000)]
am
8fd9bc91: Merge "Add more logging to finalization test"
* commit '
8fd9bc91c0511c3d17618b1f33df0ee85ef429ab':
Add more logging to finalization test
Mathieu Chartier [Wed, 15 Oct 2014 21:46:25 +0000 (21:46 +0000)]
Merge "Add more logging to finalization test"
Ian Rogers [Wed, 15 Oct 2014 18:57:01 +0000 (11:57 -0700)]
Remove test dependencies on phony targets.
We already depend in the test on the presence of the executable, depending on
the phony causes make to complain about "don't know how to build".
Change-Id: I0db61d184106df6642791909d416666c3d4f370e
Mathieu Chartier [Wed, 15 Oct 2014 18:10:43 +0000 (18:10 +0000)]
am
edfc4ca2: (-s ours) Fix oatdump for no image
* commit '
edfc4ca2c8e1de6a1d42700cc0bc41d5b243ea04':
Fix oatdump for no image
Vladimir Marko [Tue, 7 Oct 2014 14:01:57 +0000 (15:01 +0100)]
Quick: Improve the BBCombine pass.
Eliminate exception edges for insns that cannot throw even
when inside a try-block. Run the BBCombine pass before the
SSA transformation to reduce the compilation time.
Bug:
16398693
Change-Id: I8e91df593e316c994679b9d482b0ae20700b9499
Mathieu Chartier [Wed, 15 Oct 2014 17:41:42 +0000 (17:41 +0000)]
am
e163a3a1: Merge "Fix oatdump for no image"
* commit '
e163a3a150983943ea08d5c8487e3789875ffe7e':
Fix oatdump for no image
Mathieu Chartier [Wed, 15 Oct 2014 17:39:23 +0000 (10:39 -0700)]
Fix oatdump for no image
Added MemMap::Init if we dont initialize the runtime.
(cherry picked from commit
d424d0856927a5d771644b0ef18cb48ef8c04817)
Bug:
18000219
Change-Id: Ice068edea04708551b3fb8b75eae4e97758a18f9
Mathieu Chartier [Wed, 15 Oct 2014 17:33:37 +0000 (17:33 +0000)]
Merge "Fix oatdump for no image"
Mathieu Chartier [Wed, 15 Oct 2014 17:31:46 +0000 (10:31 -0700)]
Fix oatdump for no image
Added MemMap::Init if we dont initialize the runtime.
Bug:
18000219
Change-Id: I1bd715e18838919c0773db5fa25623348326baa6
Mathieu Chartier [Wed, 15 Oct 2014 16:59:03 +0000 (09:59 -0700)]
Add more logging to finalization test
We now print which elements were not finalized then attempt a
sleep to see if the error is a race condition or a another error.
Bug:
17932313
Change-Id: I4d41abfff0fa6838dd513cf23821bb486305d74f
Vladimir Marko [Thu, 9 Oct 2014 17:01:24 +0000 (18:01 +0100)]
Rewrite null check elimination to work on dalvik regs.
And move the null check and class init check elimination
before the SSA transformation. The new pass ordering is in
anticipation of subsequent changes. (An improved class init
check elimination can benefit special method inlining. An
improved block combination pass before SSA transformation
can improve compilation time.)
Also add tests for the NCE.
Change-Id: Ie4fb1880e06334a703295aef454b437d58a3e878
Vladimir Marko [Wed, 15 Oct 2014 12:45:01 +0000 (12:45 +0000)]
am
5c5efc25: Merge "ART: NullCheckElimination should converge with MIR_IGNORE_NULL_CHECK"
* commit '
5c5efc253507eb43265997c9afcd778f72b6cef4':
ART: NullCheckElimination should converge with MIR_IGNORE_NULL_CHECK
Vladimir Marko [Wed, 15 Oct 2014 12:35:54 +0000 (12:35 +0000)]
Merge "ART: NullCheckElimination should converge with MIR_IGNORE_NULL_CHECK"
Vladimir Marko [Wed, 15 Oct 2014 10:35:44 +0000 (11:35 +0100)]
Quick: Avoid node iteration for passes that don't need it.
Change-Id: Ic1f6796a29ba861cee37a31193e07b497b84eb3f
Yevgeny Rouban [Wed, 15 Oct 2014 10:32:25 +0000 (17:32 +0700)]
ART: NullCheckElimination should converge with MIR_IGNORE_NULL_CHECK
If the MIRGraph::EliminateNullChecksAndInferTypes() function managed
to prove that some regs are non-null then it sets the flag
MIR_IGNORE_NULL_CHECK and resets this flag for all the other regs.
If some previous optimizations have already set MIR_IGNORE_NULL_CHECK
then it can be reset by EliminateNullChecksAndInferTypes. This way
NullCheckElimination discards some optimization efforts.
Optimization passes should not reset MIR_IGNORE_NULL_CHECK unless
they 100% sure NullCheck is needed.
This patch makes the NCE_TypeInference pass merge its own
calculated MIR_IGNORE_NULL_CHECK with the one came from previous
optimizations. Technically NCE_TypeInference calculates the flag
in a temporary MIR_MARK-th bit by preserving MIR_IGNORE_NULL_CHECK.
Then at the end of NCE pass MIR_MARK is or-ed with
MIR_IGNORE_NULL_CHECK.
Change-Id: Ib26997c70ecf2c158f61496dee9b1fe45c812096
Signed-off-by: Yevgeny Rouban <yevgeny.y.rouban@intel.com>
Brian Carlstrom [Wed, 15 Oct 2014 04:44:40 +0000 (04:44 +0000)]
am
2df6840f: Merge "Add tests for missing classes"
* commit '
2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4':
Add tests for missing classes
Brian Carlstrom [Wed, 15 Oct 2014 04:36:12 +0000 (04:36 +0000)]
Merge "Add tests for missing classes"
Dmitriy Ivanov [Wed, 15 Oct 2014 02:44:01 +0000 (02:44 +0000)]
am
d2caad30: Merge "Fix mac build (second attempt)"
* commit '
d2caad30be6598c78f900bb27738466875efaeec':
Fix mac build (second attempt)
Dmitriy Ivanov [Wed, 15 Oct 2014 01:34:56 +0000 (01:34 +0000)]
Merge "Fix mac build (second attempt)"
Jeff Hao [Tue, 14 Oct 2014 20:12:01 +0000 (13:12 -0700)]
Store exiting thread ids and names while tracing to output later.
Bug:
17909204
(cherry picked from commit
fdcbc5c4c7c67bba06e038ac96a2e8bc49b91f84)
Change-Id: Iea087560ba8b983412a6dde2ec166c9e7214f3a1
Dmitriy Ivanov [Wed, 15 Oct 2014 00:55:28 +0000 (17:55 -0700)]
Fix mac build (second attempt)
It appears that the version of mac ld with
-export_dynamic is pretty recent.
Remove -export_dynamic to fix build for older
mac versions (?)
Change-Id: Ibc3b2f9a0aeec9125cd73b7df0cf22de9e8e4d16
Brian Carlstrom [Wed, 15 Oct 2014 00:20:35 +0000 (00:20 +0000)]
am
cfd8adec: Merge "Add VLOG(class_linker) for clinit errors"
* commit '
cfd8adec84701752a56ddccf556b8c40142a9e0f':
Add VLOG(class_linker) for clinit errors
Brian Carlstrom [Tue, 14 Oct 2014 07:06:31 +0000 (00:06 -0700)]
Add tests for missing classes
Bug:
17959926
Change-Id: I659e410051dc52e054953a779d573807f8aa54fa
Brian Carlstrom [Wed, 15 Oct 2014 00:03:55 +0000 (00:03 +0000)]
Merge "Add VLOG(class_linker) for clinit errors"
Brian Carlstrom [Tue, 14 Oct 2014 23:56:50 +0000 (23:56 +0000)]
am
eff81605: Merge "Use exit(1), not exit(-1)"
* commit '
eff81605b674f75ff541f84ef63523fdc9939a9a':
Use exit(1), not exit(-1)
Brian Carlstrom [Thu, 9 Oct 2014 00:55:21 +0000 (17:55 -0700)]
Add VLOG(class_linker) for clinit errors
Bug:
17915141
Change-Id: I3002cf4348ec3fa241f63ff1515f813f6051c267
Brian Carlstrom [Tue, 14 Oct 2014 23:49:24 +0000 (23:49 +0000)]
Merge "Use exit(1), not exit(-1)"
Mathieu Chartier [Tue, 14 Oct 2014 23:48:03 +0000 (23:48 +0000)]
am
c54e12a4: (-s ours) Change MemMap::maps_ to not be global variable
* commit '
c54e12a413e16f90526318f1f466a900a717fbb0':
Change MemMap::maps_ to not be global variable
Dmitriy Ivanov [Tue, 14 Oct 2014 23:23:03 +0000 (23:23 +0000)]
am
67555f1f: Merge "Fixing mac build"
* commit '
67555f1f1c890b12f5936bfa5a25efa70865970a':
Fixing mac build
Mathieu Chartier [Tue, 14 Oct 2014 23:22:41 +0000 (16:22 -0700)]
Change MemMap::maps_ to not be global variable
Runtime.exit() was causing globals to get destructed at the same time
that another thread was using it for allocating a new mem map.
(cherry picked from commit
6e88ef6b604a7a945a466784580c42e6554c1289)
Bug:
17962201
Change-Id: I400cb7b8141d858f3c08a6fe59a02838c04c6962
Dmitriy Ivanov [Tue, 14 Oct 2014 23:12:15 +0000 (23:12 +0000)]
Merge "Fixing mac build"
Brian Carlstrom [Tue, 14 Oct 2014 22:39:01 +0000 (15:39 -0700)]
Use exit(1), not exit(-1)
Change-Id: If59f988ee8b37f6f87363fe8ea8edfde738f3397
Mathieu Chartier [Tue, 14 Oct 2014 23:04:15 +0000 (23:04 +0000)]
am
b13d4c59: Merge "Change MemMap::maps_ to not be global variable"
* commit '
b13d4c592c187c54d6870b1d46601f3c00783fc7':
Change MemMap::maps_ to not be global variable
Mathieu Chartier [Tue, 14 Oct 2014 22:57:06 +0000 (22:57 +0000)]
Merge "Change MemMap::maps_ to not be global variable"
Dmitriy Ivanov [Tue, 14 Oct 2014 19:18:10 +0000 (12:18 -0700)]
Fixing mac build
MacOS static linker does not understand --export-dynamic
and --version-script. According to man ld there is
-export_dynamic option which should do the same
thing.
Change-Id: I8cde8c6c7305bebbbcc9dded143fa5cdaf386d65
Mathieu Chartier [Tue, 14 Oct 2014 22:01:24 +0000 (15:01 -0700)]
Change MemMap::maps_ to not be global variable
Runtime.exit() was causing globals to get destructed at the same time
that another thread was using it for allocating a new mem map.
Bug:
17962201
Change-Id: I400cb7b8141d858f3c08a6fe59a02838c04c6962
Dmitriy Ivanov [Tue, 14 Oct 2014 18:54:15 +0000 (18:54 +0000)]
am
58e51f38: Merge "Untie gtest executables from LD_PRELOAD"
* commit '
58e51f38e2304a08aa9ec380383e0b3614f96a96':
Untie gtest executables from LD_PRELOAD
Dmitriy Ivanov [Tue, 14 Oct 2014 18:44:26 +0000 (18:44 +0000)]
Merge "Untie gtest executables from LD_PRELOAD"
Dmitriy Ivanov [Tue, 14 Oct 2014 18:38:46 +0000 (11:38 -0700)]
Untie gtest executables from LD_PRELOAD
Bug:
15345057
Bug:
15426766
Change-Id: I053ddbacaf918405ce6b38a5ba0d623299c7b5c8
Dmitriy Ivanov [Tue, 14 Oct 2014 17:44:40 +0000 (17:44 +0000)]
am
e4228d93: Merge "Remove libsigchain from LD_PRELOADS"
* commit '
e4228d93de256c72df9d57f0def938b11cfe21a1':
Remove libsigchain from LD_PRELOADS
Dmitriy Ivanov [Tue, 14 Oct 2014 17:36:34 +0000 (17:36 +0000)]
Merge "Remove libsigchain from LD_PRELOADS"
Roland Levillain [Wed, 1 Oct 2014 13:12:25 +0000 (14:12 +0100)]
Implement default traversals in CFG & SSA graph checkers.
- Check CFG graphs using an insertion order traversal.
- Check SSA form graphs using a reverse post-order traversal.
Change-Id: Ib9062599bdbf3c17b9f213b743274b2d71a9fa90
Roland Levillain [Wed, 1 Oct 2014 09:48:29 +0000 (10:48 +0100)]
Improve art::SSAChecker::VisitInstruction.
Actually inspect the uses of an instruction to ensure the
latter dominates all of the former, instead of browsing the
inputs of this instruction (to ensure they dominate the
instruction).
Also check instruction domination with respect to environment
uses.
Change-Id: I967f34a45f48930607bf9683180d02e7c27b4e06
Roland Levillain [Fri, 3 Oct 2014 11:45:18 +0000 (12:45 +0100)]
Do not remove NullChecks & BoundsChecks in HDeadCodeElimination.
Removing a NullCheck or a BoundsCheck instruction may change
the behavior of a program.
Change-Id: Ib2c9beff0cc98c382210e7cc88b1fa9af3c61887
Roland Levillain [Fri, 10 Oct 2014 12:56:31 +0000 (13:56 +0100)]
Turn constant conditional jumps into unconditional jumps.
If a condition (input of an art::HIf instruction) is
constant (an art::HConstant object), evaluate it at
compile time and generate an unconditional branch
instruction if it is true (in lieu of a conditional jump).
Change-Id: I262e43ffe66d5c25dbbfa98092a41c8b3c4c75d6
Nicolas Geoffray [Tue, 14 Oct 2014 09:35:52 +0000 (09:35 +0000)]
am
b8f24808: Merge "Merge reference-run-test-classes and run-test-jar."
* commit '
b8f2480853aeca1db33ed623b9a9b2648954906e':
Merge reference-run-test-classes and run-test-jar.
Nicolas Geoffray [Tue, 14 Oct 2014 09:28:07 +0000 (09:28 +0000)]
Merge "Merge reference-run-test-classes and run-test-jar."
Sebastien Hertz [Tue, 14 Oct 2014 07:11:57 +0000 (09:11 +0200)]
resolved conflicts for merge of
5d1c1bbd to lmp-dev-plus-aosp
Change-Id: Ibf08c35044e3f6ac2aac1bf4f418f35a4ecc42e4
Mathieu Chartier [Mon, 13 Oct 2014 22:10:04 +0000 (22:10 +0000)]
am
35274252: Merge "Make finalization test more robust"
* commit '
35274252040670cec78b7abe8322e5dd9b24ee26':
Make finalization test more robust
Ian Rogers [Mon, 13 Oct 2014 22:10:01 +0000 (22:10 +0000)]
am
cbcbd909: Merge "Revert "Adjust the suspend check interval to 16.""
* commit '
cbcbd90981c1e85984759c504df662616d7f93b7':
Revert "Adjust the suspend check interval to 16."
Mathieu Chartier [Mon, 13 Oct 2014 22:09:59 +0000 (22:09 +0000)]
am
bbacc2c3: Merge "Make gc-thrash able to handle OOME"
* commit '
bbacc2c3a0473b067b58524c58015be193af03cc':
Make gc-thrash able to handle OOME
Hiroshi Yamauchi [Mon, 13 Oct 2014 22:09:52 +0000 (22:09 +0000)]
am
f14cc2cb: Merge "Adjust the suspend check interval to 16."
* commit '
f14cc2cb813b34536e94a851daf53a89c5c7dd3e':
Adjust the suspend check interval to 16.
Vladimir Marko [Mon, 13 Oct 2014 22:09:51 +0000 (22:09 +0000)]
am
c39eb4ae: Merge "Add regression test for null check elimination."
* commit '
c39eb4aef19b7fe64283fb3ae7ce6d13cd6c8294':
Add regression test for null check elimination.
Vladimir Marko [Mon, 13 Oct 2014 22:09:50 +0000 (22:09 +0000)]
am
72ab3cad: Merge "Revert "ART: fix NullCheckElimination to preserve MIR_IGNORE_NULL_CHECK""
* commit '
72ab3cadce5002163783d7b76781b9f26413b773':
Revert "ART: fix NullCheckElimination to preserve MIR_IGNORE_NULL_CHECK"
Mathieu Chartier [Mon, 13 Oct 2014 20:24:25 +0000 (20:24 +0000)]
Merge "Make finalization test more robust"
Ian Rogers [Mon, 13 Oct 2014 19:28:50 +0000 (19:28 +0000)]
Merge "Revert "Adjust the suspend check interval to 16.""
Ian Rogers [Mon, 13 Oct 2014 19:28:25 +0000 (19:28 +0000)]
Revert "Adjust the suspend check interval to 16."
This reverts commit
dc0f40e484dc4bf72032f6d9f1c5db694c6fad55.
Change-Id: I4dd1acf2adfc49b03bac9c9fbd0ea3deebbd054e
Mathieu Chartier [Mon, 13 Oct 2014 19:01:56 +0000 (19:01 +0000)]
Merge "Make gc-thrash able to handle OOME"
Mathieu Chartier [Mon, 13 Oct 2014 18:45:52 +0000 (11:45 -0700)]
Make gc-thrash able to handle OOME
Bug:
17962200
Change-Id: I0dab063af7583bd4f34bbf101858be4c9c0955fa
Hiroshi Yamauchi [Mon, 13 Oct 2014 18:09:55 +0000 (18:09 +0000)]
Merge "Adjust the suspend check interval to 16."
Vladimir Marko [Mon, 13 Oct 2014 18:00:28 +0000 (18:00 +0000)]
Merge "Add regression test for null check elimination."
Mathieu Chartier [Mon, 13 Oct 2014 17:58:01 +0000 (10:58 -0700)]
Make finalization test more robust
Moved some logic to its own function to prevent vregs keeping objects
live. Not sure if it fixes flaky test, can't reproduce.
Bug:
17932313
Change-Id: Ib9c70d954a9692d6529f6ac645c9d0e9f596e502