OSDN Git Service
Nicolas Geoffray [Wed, 10 Jun 2015 14:17:48 +0000 (14:17 +0000)]
am
8241f718: Merge "Revert "art/tools: add new tests for the build bot""
* commit '
8241f7188b2c2b0feb330403e6178ee7b3ed31f1':
Revert "art/tools: add new tests for the build bot"
Nicolas Geoffray [Wed, 10 Jun 2015 14:06:47 +0000 (14:06 +0000)]
Merge "Revert "art/tools: add new tests for the build bot""
Nicolas Geoffray [Wed, 10 Jun 2015 14:06:31 +0000 (14:06 +0000)]
Revert "art/tools: add new tests for the build bot"
Unfortunately too many "localhost" netd failures.
This reverts commit
10ec4f937e351bc21c0eebada30c6df3f8570406.
Change-Id: Ibe28977e1e9f207f00a24f4c3167d08aa36cce5f
Sergio Giro [Wed, 10 Jun 2015 11:48:46 +0000 (11:48 +0000)]
am
7c0efe18: Merge "art/tools: add new tests for the build bot"
* commit '
7c0efe186dff1dd457fd1f7932021fa7cfdf9d6f':
art/tools: add new tests for the build bot
Sergio Giro [Wed, 10 Jun 2015 11:40:08 +0000 (11:40 +0000)]
Merge "art/tools: add new tests for the build bot"
Sergio Giro [Fri, 5 Jun 2015 10:17:18 +0000 (11:17 +0100)]
art/tools: add new tests for the build bot
Otherwise, it's difficult to know when they start to fail
Bug:
21722374
Change-Id: I599e62ebafc28cf0dd60104c156f09ada8868bdc
Nicolas Geoffray [Wed, 10 Jun 2015 09:57:43 +0000 (09:57 +0000)]
am
5a176fb8: Merge "Add boilerplate code for architecture-specific HInstructions."
* commit '
5a176fb8738f20fbbac0b65d65f82b23e0be5d18':
Add boilerplate code for architecture-specific HInstructions.
Nicolas Geoffray [Wed, 10 Jun 2015 09:46:53 +0000 (09:46 +0000)]
Merge "Add boilerplate code for architecture-specific HInstructions."
Alexandre Rames [Tue, 9 Jun 2015 09:29:30 +0000 (10:29 +0100)]
Add boilerplate code for architecture-specific HInstructions.
Change-Id: I2723cd96e5f03012c840863dd38d7b2168117db8
David Srbecky [Wed, 10 Jun 2015 04:02:41 +0000 (04:02 +0000)]
am
864a2d95: Merge "Revert "Test that we can unwind framework code.""
* commit '
864a2d955aa85ab989c86d7f1eeacbe0b11f8b0f':
Revert "Test that we can unwind framework code."
David Srbecky [Wed, 10 Jun 2015 03:53:10 +0000 (03:53 +0000)]
Merge "Revert "Test that we can unwind framework code.""
David Srbecky [Wed, 10 Jun 2015 03:51:48 +0000 (03:51 +0000)]
Revert "Test that we can unwind framework code."
This reverts commit
5c40961dc2c7aa80a183e2eaa828580e0e89e2dd.
Change-Id: Ib4d827623fe76c9c3b639e7d1e205c7033fc2bc7
David Srbecky [Tue, 9 Jun 2015 23:28:46 +0000 (23:28 +0000)]
am
2ecc308d: Merge "Test that we can unwind framework code."
* commit '
2ecc308d8a02c3ba59b5a7a5431c0c9b1146bd47':
Test that we can unwind framework code.
David Srbecky [Tue, 9 Jun 2015 23:16:19 +0000 (23:16 +0000)]
Merge "Test that we can unwind framework code."
Andreas Gampe [Tue, 9 Jun 2015 23:13:36 +0000 (23:13 +0000)]
am
73d01bc3: Merge "ART: Check long and double register pairs in invokes"
* commit '
73d01bc3b227a2090be4b383c4731e1a520a282d':
ART: Check long and double register pairs in invokes
Andreas Gampe [Tue, 9 Jun 2015 23:00:48 +0000 (23:00 +0000)]
Merge "ART: Check long and double register pairs in invokes"
Jeff Hao [Tue, 9 Jun 2015 21:24:47 +0000 (21:24 +0000)]
am
edc9ea10: Merge "Make dex file verifier check for dups between direct and virtual methods."
* commit '
edc9ea1047a0e31fc55442c60871ebe1f7eb15f4':
Make dex file verifier check for dups between direct and virtual methods.
Jeff Hao [Tue, 9 Jun 2015 21:12:19 +0000 (21:12 +0000)]
Merge "Make dex file verifier check for dups between direct and virtual methods."
Mathieu Chartier [Tue, 9 Jun 2015 20:33:30 +0000 (20:33 +0000)]
am
e0a9ee09: Merge "Increase ulimit to 64MB for --no-relocate"
* commit '
e0a9ee09b9147f80009bc9b287079e894d1d46d3':
Increase ulimit to 64MB for --no-relocate
Mathieu Chartier [Tue, 9 Jun 2015 20:23:40 +0000 (20:23 +0000)]
Merge "Increase ulimit to 64MB for --no-relocate"
Mathieu Chartier [Tue, 9 Jun 2015 20:02:50 +0000 (13:02 -0700)]
Increase ulimit to 64MB for --no-relocate
Fixes hprof test.
Bug:
21730274
Change-Id: I70e49ca4a5d66414715e8ad894e3b5b5322052ee
David Srbecky [Mon, 8 Jun 2015 22:41:25 +0000 (23:41 +0100)]
Test that we can unwind framework code.
Change-Id: I8c0c6c14f3b95ac1fea6ca6a969a1baea80d55fc
Jeff Hao [Fri, 5 Jun 2015 01:12:26 +0000 (18:12 -0700)]
Make dex file verifier check for dups between direct and virtual methods.
The dex file verifier now rejects classes that have the same method index
in both direct and virtual methods.
Bug:
17878919
Change-Id: I431b4715e39ca2cce4df3ebef020b7ec0661a4c0
Andreas Gampe [Sat, 6 Jun 2015 03:22:12 +0000 (20:22 -0700)]
ART: Check long and double register pairs in invokes
For invokes, ensure that long and double parameters are actually
in registers pairs. We were testing the pair, but skipping the
actual high parameter register.
Bug:
17410612
Change-Id: I8f4c3335ea8b7dc3cf252bee52a5a706ae8905f8
Nicolas Geoffray [Tue, 9 Jun 2015 16:28:50 +0000 (16:28 +0000)]
am
26b97f87: Merge "Add support for inlining already sharpened interface calls."
* commit '
26b97f87dcd86934f8b75e018c80bb4e8d501b03':
Add support for inlining already sharpened interface calls.
Sebastien Hertz [Tue, 9 Jun 2015 16:19:44 +0000 (16:19 +0000)]
am
6b0d6c62: Merge "Bring back verbosity override"
* commit '
6b0d6c62cbfad62c42e426de1641f2ff7473a446':
Bring back verbosity override
Nicolas Geoffray [Tue, 9 Jun 2015 16:19:14 +0000 (16:19 +0000)]
Merge "Add support for inlining already sharpened interface calls."
Sebastien Hertz [Tue, 9 Jun 2015 16:05:14 +0000 (16:05 +0000)]
Merge "Bring back verbosity override"
Sebastien Hertz [Tue, 9 Jun 2015 15:45:53 +0000 (15:45 +0000)]
am
559f11f0: Merge "Follow up on CL 151605"
* commit '
559f11f0d5f6b932e5b01f2a7c26604908b7d48d':
Follow up on CL 151605
Sebastien Hertz [Tue, 9 Jun 2015 15:36:58 +0000 (15:36 +0000)]
Merge "Follow up on CL 151605"
Nicolas Geoffray [Tue, 9 Jun 2015 15:32:44 +0000 (15:32 +0000)]
am
a4207b70: Merge "Revert "Revert "Pass current method to HNewInstance and HNewArray."""
* commit '
a4207b70a1b607a192a447bcc4929b2689dc23d2':
Revert "Revert "Pass current method to HNewInstance and HNewArray.""
Nicolas Geoffray [Tue, 9 Jun 2015 15:24:08 +0000 (15:24 +0000)]
Merge "Revert "Revert "Pass current method to HNewInstance and HNewArray."""
Sebastien Hertz [Tue, 9 Jun 2015 12:09:14 +0000 (14:09 +0200)]
Follow up on CL 151605
- Fixes return type of StackedShadowFrameRecord::GetType
- Makes StackedShadowFrameType an enum class (scoped enum)
- Moves DeoptimizationReturnValueRecord and StackedShadowFrameRecord
to thread.cc file and use forward declaration in thread.h header
- Fixes tools/generate-operator-out.py for scoped enum classes.
Bug:
20845490
Change-Id: I6b67e288b1db563699161e58ec2e2330d42dd8f5
Nicolas Geoffray [Tue, 9 Jun 2015 09:34:25 +0000 (10:34 +0100)]
Revert "Revert "Pass current method to HNewInstance and HNewArray.""
Problem exposed by this change was fixed in:
https://android-review.googlesource.com/#/c/154031/
This reverts commit
7b0e353b49ac3f464c662f20e20e240f0231afff.
Change-Id: I680c13dc9db9ba223ab11c7af255222860b4e6d2
Nicolas Geoffray [Tue, 9 Jun 2015 15:00:41 +0000 (15:00 +0000)]
am
aa77f6e5: Merge "Fix a crash in optimizing compiler with the current method."
* commit '
aa77f6e5839b2ad3bf8ca2c06a44ec92e2667af1':
Fix a crash in optimizing compiler with the current method.
Nicolas Geoffray [Tue, 9 Jun 2015 14:51:21 +0000 (14:51 +0000)]
Merge "Fix a crash in optimizing compiler with the current method."
Nicolas Geoffray [Tue, 9 Jun 2015 14:43:38 +0000 (15:43 +0100)]
Add support for inlining already sharpened interface calls.
Change-Id: Ia6b557c5e98e493b187b1f30da0c62449d9dd4d4
Nicolas Geoffray [Tue, 9 Jun 2015 13:12:28 +0000 (14:12 +0100)]
Fix a crash in optimizing compiler with the current method.
Crash was due to overwriting the location of the current method
in the slow path of an intrinsic.
Change-Id: I6ca58ef5b3cea19925e60b9500aef543bc5f71ef
Sebastien Hertz [Mon, 1 Jun 2015 06:28:18 +0000 (08:28 +0200)]
Bring back verbosity override
Brings back the possibility to override verbosity locally (after
command-line parser changes). Also adds a test for "-verbose:deopt"
command-line option.
Change-Id: I634d5226ef473ec4d965d620e973e9e677c0069d
Nicolas Geoffray [Tue, 9 Jun 2015 09:46:59 +0000 (09:46 +0000)]
am
7c5e26b3: Merge "Revert "Pass current method to HNewInstance and HNewArray.""
* commit '
7c5e26b3ea5262c0aea3374148750e81340a4bf9':
Revert "Pass current method to HNewInstance and HNewArray."
Vladimir Marko [Tue, 9 Jun 2015 09:46:58 +0000 (09:46 +0000)]
am
93ce3528: Merge "Quick: Fix LoopRepeatingTopologicalSortIterator."
* commit '
93ce3528cbf61579a0f2929ae56f0dd1fe554973':
Quick: Fix LoopRepeatingTopologicalSortIterator.
Nicolas Geoffray [Tue, 9 Jun 2015 09:46:57 +0000 (09:46 +0000)]
am
b0c85983: Merge "Pass current method to HNewInstance and HNewArray."
* commit '
b0c85983741d695fc568b61a1e0d8f318cd4828f':
Pass current method to HNewInstance and HNewArray.
Nicolas Geoffray [Tue, 9 Jun 2015 09:26:04 +0000 (09:26 +0000)]
Merge "Revert "Pass current method to HNewInstance and HNewArray.""
Nicolas Geoffray [Tue, 9 Jun 2015 09:25:50 +0000 (09:25 +0000)]
Revert "Pass current method to HNewInstance and HNewArray."
082-inline-execute fails on x86.
This reverts commit
e21aa42e1341d34250742abafdd83311ad9fa737.
Change-Id: Ib3fd25faee2e0128001e40d3d51a74f959bc4449
Vladimir Marko [Tue, 9 Jun 2015 09:05:36 +0000 (09:05 +0000)]
Merge "Quick: Fix LoopRepeatingTopologicalSortIterator."
Nicolas Geoffray [Tue, 9 Jun 2015 08:13:15 +0000 (08:13 +0000)]
Merge "Pass current method to HNewInstance and HNewArray."
Nicolas Geoffray [Tue, 9 Jun 2015 08:07:44 +0000 (08:07 +0000)]
am
f7bd8faf: Merge "Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect."""
* commit '
f7bd8fafdf3bbf05fbcfc659cd798b3fd59051d5':
Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Nicolas Geoffray [Tue, 9 Jun 2015 07:55:16 +0000 (07:55 +0000)]
Merge "Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect."""
David Srbecky [Tue, 9 Jun 2015 01:53:38 +0000 (01:53 +0000)]
am
430afefe: Merge "Enable 64-bit CFI tests."
* commit '
430afefe1cced35cf5eb12ce7a6dcbfc5007c97e':
Enable 64-bit CFI tests.
David Srbecky [Tue, 9 Jun 2015 01:41:11 +0000 (01:41 +0000)]
Merge "Enable 64-bit CFI tests."
David Srbecky [Tue, 9 Jun 2015 00:21:23 +0000 (01:21 +0100)]
Enable 64-bit CFI tests.
Those should work now since we have switched to ELF-64.
Change-Id: Id95b8b309843b30864a860c745d16b50d7f88bda
Mathieu Chartier [Mon, 8 Jun 2015 18:49:24 +0000 (18:49 +0000)]
am
0f683394: Merge "More LOW_4G optimizations"
* commit '
0f6833940b4c58884ebab685d8d22e56c02be0d5':
More LOW_4G optimizations
Mathieu Chartier [Mon, 8 Jun 2015 18:33:42 +0000 (18:33 +0000)]
Merge "More LOW_4G optimizations"
Mathieu Chartier [Thu, 4 Jun 2015 23:22:41 +0000 (16:22 -0700)]
More LOW_4G optimizations
Eagerly try to map at an address when it doesn't overlap with
the ART known maps.
Reduces time spent creating the heap on N9 from ~100ms to ~10ms.
(cherry picked from commit
3ae250c16bae3462e040b844dbc2e2fc732d67ba)
Bug:
20727525
Change-Id: Ie8982ca9d1f3158104b2b53b992c3a28841fc443
Mingyao Yang [Mon, 8 Jun 2015 17:50:14 +0000 (17:50 +0000)]
am
a56b2e09: Merge "Fix nested deoptimization."
* commit '
a56b2e09cc311d3b8eb9384decc76a13ed5da6e9':
Fix nested deoptimization.
Mingyao Yang [Mon, 8 Jun 2015 17:41:30 +0000 (17:41 +0000)]
Merge "Fix nested deoptimization."
Vladimir Marko [Mon, 8 Jun 2015 15:39:02 +0000 (16:39 +0100)]
Quick: Fix LoopRepeatingTopologicalSortIterator.
Always push the loop head on the loop head stack. This fixes
a bug where we failed to return to an unnatural loop head to
recalculate its GVN data.
Bug:
17410955
Change-Id: I3a2c3225e5d16268c3f56f7f90228759c7da37a9
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:04 +0000 (18:21 +0100)]
Revert "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Fix was to special case baseline for x86, which does not have enough
registers to allocate the current method.
This reverts commit
c345f141f11faad177aa9635a78088d00cf66086.
Change-Id: I5997aa52f8d4df373ae5ff4d4150dac0c44c4c10
Nicolas Geoffray [Mon, 8 Jun 2015 16:02:08 +0000 (16:02 +0000)]
am
8c4cce0a: Merge "Revert "Support for inlining virtual and interface calls.""
* commit '
8c4cce0abe6cfa8f4157cfa42b18474d9536c159':
Revert "Support for inlining virtual and interface calls."
Nicolas Geoffray [Mon, 8 Jun 2015 16:02:04 +0000 (16:02 +0000)]
am
c2c22074: Merge "Revert "Do a type check for knowing if we can inline.""
* commit '
c2c22074a4d24a53e66a4aa2afbb039746fef498':
Revert "Do a type check for knowing if we can inline."
Nicolas Geoffray [Mon, 8 Jun 2015 15:54:38 +0000 (15:54 +0000)]
Merge "Revert "Support for inlining virtual and interface calls.""
Nicolas Geoffray [Mon, 8 Jun 2015 15:52:23 +0000 (15:52 +0000)]
Revert "Support for inlining virtual and interface calls."
Fails for some apps.
bug:
21674542
This reverts commit
1d5006c34d75758752bf3499892e3d5beb11d5dc.
Change-Id: Ia74b5e54d59f8ffe9992591324a12f71efb67af4
Nicolas Geoffray [Mon, 8 Jun 2015 15:53:30 +0000 (15:53 +0000)]
Merge "Revert "Do a type check for knowing if we can inline.""
Nicolas Geoffray [Mon, 8 Jun 2015 15:53:16 +0000 (15:53 +0000)]
Revert "Do a type check for knowing if we can inline."
Fails for some apps.
bug:
21674542
This reverts commit
7ce4b3d4c1c562959a8a3640df764ab50f1cbdf1.
Change-Id: Ie25852c022391834858b2f5e34e8c7aeb1c3b3dd
Nicolas Geoffray [Mon, 8 Jun 2015 14:35:07 +0000 (15:35 +0100)]
Pass current method to HNewInstance and HNewArray.
Also remove unsed CodeGenerator::LoadCurrentMethod.
Change-Id: I4b8d3f2a30b8e2c76b6b329a72555483c993cb73
Mingyao Yang [Mon, 18 May 2015 19:12:50 +0000 (12:12 -0700)]
Fix nested deoptimization.
Handle nested deoptimization cases. Create a stacked shadow frame
records to keep track of deoptimization shadow frames. Shadow frames
under construction can be tracked in the same stack.
Bug:
20845490
Change-Id: I768285792c29e7c3cfcd21e7a2600802506024d8
Andreas Gampe [Sun, 7 Jun 2015 22:44:52 +0000 (22:44 +0000)]
am
ccd6337f: Merge "ART: Reload class on miranda method in verifier"
* commit '
ccd6337f31d13706c602f3d9436e9b4025075b63':
ART: Reload class on miranda method in verifier
Andreas Gampe [Sun, 7 Jun 2015 22:44:51 +0000 (22:44 +0000)]
am
eb459894: Merge "Revert "Revert "Turn off duplicate-classes checking"""
* commit '
eb4598948fdf013241f8f8598c559f0ce92eb8b4':
Revert "Revert "Turn off duplicate-classes checking""
Andreas Gampe [Sun, 7 Jun 2015 22:44:49 +0000 (22:44 +0000)]
am
7048c404: (-s ours) Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes checking""
* commit '
7048c40488532843dd2fad9730c3ab16be613e13':
Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"
Andreas Gampe [Sun, 7 Jun 2015 22:44:48 +0000 (22:44 +0000)]
am
346bf296: (-s ours) Merge "DO NOT MERGE ART: Turn off duplicate-classes checking"
* commit '
346bf29623ca0e9471064406a5d29d461f1b27ae':
DO NOT MERGE ART: Turn off duplicate-classes checking
Andreas Gampe [Sun, 7 Jun 2015 22:39:51 +0000 (22:39 +0000)]
Merge "ART: Reload class on miranda method in verifier"
Andreas Gampe [Sun, 7 Jun 2015 22:36:15 +0000 (22:36 +0000)]
Merge "Revert "Revert "Turn off duplicate-classes checking"""
Andreas Gampe [Sun, 7 Jun 2015 22:36:00 +0000 (22:36 +0000)]
Merge "Revert "DO NOT MERGE ART: Turn off duplicate-classes checking""
Andreas Gampe [Sun, 7 Jun 2015 22:35:42 +0000 (22:35 +0000)]
Merge "DO NOT MERGE ART: Turn off duplicate-classes checking"
Andreas Gampe [Fri, 5 Jun 2015 05:19:58 +0000 (22:19 -0700)]
ART: Reload class on miranda method in verifier
When checking the receiver of a call and we have a miranda method,
reload the class from the method index instead of using the declared
class - which is the interface class, not the abstract class.
Bug:
21646347
Change-Id: I5bceab75c3b76233cb42ea5cf0214d32c8149994
Andreas Gampe [Wed, 3 Jun 2015 22:43:16 +0000 (15:43 -0700)]
Revert "Revert "Turn off duplicate-classes checking""
This reverts commit
18a1827a159f1b235f3fcc934f428059185f550e.
Bug:
21333911
(cherry picked from commit
0fc16a09b4d2323f9c2b6aabc81ce120b278329b)
Change-Id: I8cb96efbf7151b238f3ee137a938b20ddfaf0ebc
Andreas Gampe [Thu, 21 May 2015 20:33:40 +0000 (20:33 +0000)]
Revert "DO NOT MERGE ART: Turn off duplicate-classes checking"
This reverts commit
aafcfca5fe545365ef377fff2897b8a908f03e71.
Bug:
21333911
(cherry picked from commit
18a1827a159f1b235f3fcc934f428059185f550e)
Change-Id: Ibbc6b1be8bebc1d0ab9c5955b34eb89f40577baa
Andreas Gampe [Wed, 20 May 2015 21:48:10 +0000 (14:48 -0700)]
DO NOT MERGE ART: Turn off duplicate-classes checking
Bug:
21333911
(cherry picked from commit
aafcfca5fe545365ef377fff2897b8a908f03e71)
Change-Id: I9832526a6d2996aadb459e3ec0930cbaf151478a
Andreas Gampe [Sat, 6 Jun 2015 03:59:39 +0000 (03:59 +0000)]
am
c1d8da19: Merge "ART: Add SetSpecialSignalHandlerFn to version-script.txt"
* commit '
c1d8da19488f78f06c9c7b09cfcce9523d755d51':
ART: Add SetSpecialSignalHandlerFn to version-script.txt
Andreas Gampe [Sat, 6 Jun 2015 03:52:31 +0000 (03:52 +0000)]
Merge "ART: Add SetSpecialSignalHandlerFn to version-script.txt"
Andreas Gampe [Sat, 6 Jun 2015 03:45:31 +0000 (20:45 -0700)]
ART: Add SetSpecialSignalHandlerFn to version-script.txt
Expose the new function from the sigchainlib implementation.
Bug:
20217701
Change-Id: I7d21025595775e057ea703236ca88ceb07173136
Mathieu Chartier [Fri, 5 Jun 2015 23:52:48 +0000 (23:52 +0000)]
am
6d359184: Merge "Use runFinalizationWithTimeout for native allocations"
* commit '
6d3591845235b9effd2e7b0238443b94ecabf967':
Use runFinalizationWithTimeout for native allocations
Mathieu Chartier [Fri, 5 Jun 2015 23:44:27 +0000 (23:44 +0000)]
Merge "Use runFinalizationWithTimeout for native allocations"
Mathieu Chartier [Fri, 5 Jun 2015 20:21:05 +0000 (13:21 -0700)]
Use runFinalizationWithTimeout for native allocations
Prevents deadlocks by not waiting longer than 250ms for finalizers
to complete.
(cherry picked from commit
3b532d744034b43ed329a3198f15846d80fec3f0)
Bug:
21544853
Change-Id: I57b2f7ae8b74185922eb3c15ba0ab71a4d2348aa
Mathieu Chartier [Thu, 4 Jun 2015 23:28:56 +0000 (23:28 +0000)]
am
38b66b6f: Merge "Add atrace calls to runtime start and heap create"
* commit '
38b66b6fed1adcc1da4b931a32f78c5290a97c1e':
Add atrace calls to runtime start and heap create
Mathieu Chartier [Thu, 4 Jun 2015 23:19:26 +0000 (23:19 +0000)]
Merge "Add atrace calls to runtime start and heap create"
Richard Uhler [Tue, 7 Apr 2015 17:56:50 +0000 (10:56 -0700)]
Add atrace calls to runtime start and heap create
(cherry picked from commit
7fabaa6ba1927d21a317c03499b705cbde4f6a47)
Bug:
20727525
Change-Id: I91a74b793fb9eda8ed580244a6a5fd313ef2eb27
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:50:01 +0000 (22:50 +0000)]
am
da2fd5aa: Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
* commit '
da2fd5aa2cbdab371f9a1c29ff4e4dfd09305fdc':
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
Hiroshi Yamauchi [Thu, 4 Jun 2015 22:38:10 +0000 (22:38 +0000)]
Merge "If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS."
Mathieu Chartier [Thu, 4 Jun 2015 22:32:39 +0000 (22:32 +0000)]
am
8c46e0d5: Merge "Add optimization for LOW_4G allocator"
* commit '
8c46e0d57e52d78196f981d41b9d0434abd6d592':
Add optimization for LOW_4G allocator
Mathieu Chartier [Thu, 4 Jun 2015 22:21:35 +0000 (22:21 +0000)]
Merge "Add optimization for LOW_4G allocator"
Mathieu Chartier [Thu, 4 Jun 2015 20:42:14 +0000 (13:42 -0700)]
Add optimization for LOW_4G allocator
The optimization uses the maps_ field to skip over regions which we
know wont be large enough for the request.
Reduces time to create heap from 500-700ms to 100ms on N9.
(cherry picked from commit
1c8bef4a71612f10b89b102434f70de5a127cc74)
Bug:
20727525
Change-Id: I4fa92d58c2e135ba31a03ababff46669089bb542
Roland Levillain [Thu, 4 Jun 2015 16:50:27 +0000 (17:50 +0100)]
If heap poisoning is on, pass the relevant flag to LOCAL_ASFLAGS.
This change ensures assembly files honoring heap poisoning
(notably used by stub_test) are compiled with
-DART_HEAP_POISONING=1 when this feature is turned on.
Bug:
21621105
Change-Id: I13fe456cd2733a09bdfd3a9808cfd70513b14698
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:41 +0000 (17:21 +0000)]
am
6a1c92f1: Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
* commit '
6a1c92f1e4a455d802ab0d0ac47504cdd7c12f0f':
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Nicolas Geoffray [Thu, 4 Jun 2015 17:21:39 +0000 (17:21 +0000)]
am
8a9fba91: Merge "Do a type check for knowing if we can inline."
* commit '
8a9fba9154310ddc8024150ca8cd5a7c4b76b71b':
Do a type check for knowing if we can inline.
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:45 +0000 (17:17 +0000)]
Merge "Revert "Use HCurrentMethod in HInvokeStaticOrDirect.""
Nicolas Geoffray [Thu, 4 Jun 2015 17:17:32 +0000 (17:17 +0000)]
Revert "Use HCurrentMethod in HInvokeStaticOrDirect."
Fails on baseline/x86.
This reverts commit
38207af82afb6f99c687f64b15601ed20d82220a.
Change-Id: Ib71018367eb7c6046965494a7e996c22af3de403
Nicolas Geoffray [Thu, 4 Jun 2015 17:12:17 +0000 (17:12 +0000)]
Merge "Do a type check for knowing if we can inline."
Brian Carlstrom [Thu, 4 Jun 2015 17:04:24 +0000 (17:04 +0000)]
am
fd0fb02c: Merge "Fix JNI GetSuperClasss"
* commit '
fd0fb02c728689ca32a12476c707b96f6ca3e1fe':
Fix JNI GetSuperClasss
Nicolas Geoffray [Thu, 4 Jun 2015 17:02:34 +0000 (18:02 +0100)]
Do a type check for knowing if we can inline.
Otherwise, we might successfully inline:
((String)nonStringObject).charAt()
Because the lookup of the method is based on the index of charAt,
and not its name.
Change-Id: I72ce802fd50cfb71343197f0a32bb1ef56549097