OSDN Git Service
Andreas Gampe [Mon, 10 Aug 2015 20:08:04 +0000 (20:08 +0000)]
am
b1a71fa2: am
ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
* commit '
b1a71fa2355f737a1060c8064d0fb5fbc7b17496':
ART: Add complex UnresolvedMergedType test case
Andreas Gampe [Mon, 10 Aug 2015 20:08:03 +0000 (20:08 +0000)]
am
f0cdebde: am
081da0ad: Merge "ART: Change UnresolvedMergedType internal representation"
* commit '
f0cdebde0b0563758ce8bc27b8984a2623e50fd1':
ART: Change UnresolvedMergedType internal representation
Mathieu Chartier [Mon, 10 Aug 2015 20:08:02 +0000 (20:08 +0000)]
am
d6e41186: am
4814bbd6: Merge "Do read barriers on native roots in CopyClassVisitor"
* commit '
d6e411869989cadf9944042ab247ca57fb6d2c55':
Do read barriers on native roots in CopyClassVisitor
Nicolas Geoffray [Mon, 10 Aug 2015 18:32:11 +0000 (18:32 +0000)]
am
6e9c66e0: Fix a bug in the register allocator around pair allocation.
* commit '
6e9c66e099654b63ed3648bda2daeaf0a862f047':
Fix a bug in the register allocator around pair allocation.
Andreas Gampe [Mon, 10 Aug 2015 18:31:12 +0000 (18:31 +0000)]
am
ebccaad3: Merge "ART: Add complex UnresolvedMergedType test case"
* commit '
ebccaad3ad6bd32f7a37addc5df2381ce988846e':
ART: Add complex UnresolvedMergedType test case
Andreas Gampe [Mon, 10 Aug 2015 18:31:10 +0000 (18:31 +0000)]
am
081da0ad: Merge "ART: Change UnresolvedMergedType internal representation"
* commit '
081da0add911757a48df74e6ae817af1de6e047d':
ART: Change UnresolvedMergedType internal representation
Andreas Gampe [Mon, 10 Aug 2015 18:26:59 +0000 (18:26 +0000)]
Merge "ART: Add complex UnresolvedMergedType test case"
Andreas Gampe [Mon, 10 Aug 2015 18:26:46 +0000 (18:26 +0000)]
Merge "ART: Change UnresolvedMergedType internal representation"
Mathieu Chartier [Mon, 10 Aug 2015 18:22:33 +0000 (18:22 +0000)]
am
4814bbd6: Merge "Do read barriers on native roots in CopyClassVisitor"
* commit '
4814bbd62306dfe07a68cc5def6aad115bebc45f':
Do read barriers on native roots in CopyClassVisitor
Mathieu Chartier [Mon, 10 Aug 2015 18:16:03 +0000 (18:16 +0000)]
Merge "Do read barriers on native roots in CopyClassVisitor"
Mathieu Chartier [Mon, 10 Aug 2015 17:13:02 +0000 (10:13 -0700)]
Do read barriers on native roots in CopyClassVisitor
Fixes a race condition caused by making a copy of a class then
clearing the native root arrays of the original class. If the
original class was gray and the new class was black then the GC
would miss the native roots.
Bug:
22957957
Change-Id: I706110018220af12a2ad0d72eb803f1cfe3580b9
Andreas Gampe [Thu, 6 Aug 2015 18:31:56 +0000 (11:31 -0700)]
ART: Change UnresolvedMergedType internal representation
Use a BitVector instead of the tree representation. This
avoids flattening the components and other instances.
Bug:
22881413
Change-Id: Ibf7cfb54443affeb1753bf114c0f306125391c62
Andreas Gampe [Fri, 7 Aug 2015 15:07:16 +0000 (08:07 -0700)]
ART: Add complex UnresolvedMergedType test case
Add a test case that stresses the verifier. Add dex2oat timeout
to the host prebuild configuration.
Bug:
22881413
Change-Id: Ic4a0d16a4dc69f3d43bac40a560b6e6884df263f
Nicolas Geoffray [Mon, 10 Aug 2015 15:21:08 +0000 (15:21 +0000)]
am
0cedfd94: am
1a5625be: Merge "Fix a bug in the register allocator around pair allocation."
* commit '
0cedfd948bf3564a88891d359f7cdf519634b6a5':
Fix a bug in the register allocator around pair allocation.
Nicolas Geoffray [Mon, 10 Aug 2015 15:14:50 +0000 (15:14 +0000)]
am
1a5625be: Merge "Fix a bug in the register allocator around pair allocation."
* commit '
1a5625be743a4a84329930ac1c7e96425e24ca8d':
Fix a bug in the register allocator around pair allocation.
Nicolas Geoffray [Mon, 10 Aug 2015 15:07:43 +0000 (15:07 +0000)]
Merge "Fix a bug in the register allocator around pair allocation."
Nicolas Geoffray [Sat, 8 Aug 2015 01:13:03 +0000 (18:13 -0700)]
Fix a bug in the register allocator around pair allocation.
We may get hints that do not work with the current implementation
of register pairs, which forces the allocation of (low + 1)
for the high register. For example, if the hint is EBX, we will
allocate ESP for the high register.
bug:
23043730
(cherry picked from commit
f29758111e71a7d14f3e52d78773561a5d59961f)
Change-Id: Ib395e36616017a87d3055218d72417f4e9ff6501
Nicolas Geoffray [Sat, 8 Aug 2015 01:13:03 +0000 (18:13 -0700)]
Fix a bug in the register allocator around pair allocation.
We may get hints that do not work with the current implementation
of register pairs, which forces the allocation of (low + 1)
for the high register. For example, if the hint is EBX, we will
allocate ESP for the high register.
bug:
23043730
Change-Id: I371ebb0c61568f09d12eb9ab815c0bf0ea02d49b
Andreas Gampe [Sat, 8 Aug 2015 00:35:23 +0000 (00:35 +0000)]
am
1ea7786c: am
77bccdc5: Merge "ART: Clean up unnecessary ArtMethod**"
* commit '
1ea7786ce91eb6f2e11cd93c87608f4981b8bd33':
ART: Clean up unnecessary ArtMethod**
Andreas Gampe [Sat, 8 Aug 2015 00:28:47 +0000 (00:28 +0000)]
am
77bccdc5: Merge "ART: Clean up unnecessary ArtMethod**"
* commit '
77bccdc5e4f7bb150867c7aecd350efee84367bc':
ART: Clean up unnecessary ArtMethod**
Andreas Gampe [Sat, 8 Aug 2015 00:24:50 +0000 (00:24 +0000)]
am
f06f82dd: am
fc298560: Merge "ART: Remove TODO in BitVector"
* commit '
f06f82dd69d274633e5e6378e3fe30d232573554':
ART: Remove TODO in BitVector
Andreas Gampe [Sat, 8 Aug 2015 00:23:51 +0000 (00:23 +0000)]
Merge "ART: Clean up unnecessary ArtMethod**"
Andreas Gampe [Sat, 8 Aug 2015 00:20:11 +0000 (17:20 -0700)]
ART: Clean up unnecessary ArtMethod**
ArtMethods are no longer Java objects, so the additional indirection
is no longer necessary here.
Change-Id: If76756d875b418b3f6e83f51b3225a158e9ce29b
Andreas Gampe [Sat, 8 Aug 2015 00:20:55 +0000 (00:20 +0000)]
am
fc298560: Merge "ART: Remove TODO in BitVector"
* commit '
fc29856047d90d8f446d73b576c0c18de7a1380f':
ART: Remove TODO in BitVector
Andreas Gampe [Sat, 8 Aug 2015 00:14:42 +0000 (00:14 +0000)]
Merge "ART: Remove TODO in BitVector"
Mathieu Chartier [Fri, 7 Aug 2015 23:45:53 +0000 (23:45 +0000)]
am
672485f3: am
e6b307a8: Merge "Add class table field to class loader"
* commit '
672485f3fcfc1e28389e4203b8600df75b8df5c6':
Add class table field to class loader
Andreas Gampe [Fri, 7 Aug 2015 15:29:13 +0000 (08:29 -0700)]
ART: Remove TODO in BitVector
Refactor the BitVector constructor: split it up to remove the
possibility to provide contradicting parameters, and add a custom
copying constructor.
Change-Id: Ie943f279baa007db578aea0f2f33fa93311612ee
Mathieu Chartier [Fri, 7 Aug 2015 23:38:50 +0000 (23:38 +0000)]
am
e6b307a8: Merge "Add class table field to class loader"
* commit '
e6b307a833d3a0ba4327004c2a286680e01eae3b':
Add class table field to class loader
Dan Albert [Fri, 7 Aug 2015 23:35:07 +0000 (23:35 +0000)]
am
12a00ef3: am
4b2e98fc: Merge "Fix C++14 bitrot."
* commit '
12a00ef305c8ef5b2f2c8e361dd09de77ff90d09':
Fix C++14 bitrot.
Mathieu Chartier [Fri, 7 Aug 2015 23:33:43 +0000 (23:33 +0000)]
Merge "Add class table field to class loader"
Dan Albert [Fri, 7 Aug 2015 23:30:50 +0000 (23:30 +0000)]
am
4b2e98fc: Merge "Fix C++14 bitrot."
* commit '
4b2e98fc8c257a27a95fecbc859fcc617e2fa827':
Fix C++14 bitrot.
Dan Albert [Fri, 7 Aug 2015 23:21:25 +0000 (23:21 +0000)]
Merge "Fix C++14 bitrot."
Dan Albert [Fri, 7 Aug 2015 23:19:01 +0000 (16:19 -0700)]
Fix C++14 bitrot.
Change-Id: I22f7925a87bca45646c563971342a9a1b2090ba6
Mathieu Chartier [Wed, 5 Aug 2015 22:08:12 +0000 (15:08 -0700)]
Add class table field to class loader
Fixes bug with the class table where the comparator would cause read
barriers and break the map strict ordering properties.
Bug:
22957957
Change-Id: I8dbc042db6e22e2172ab4ec58ddf1db0345dcaaa
Nicolas Geoffray [Fri, 7 Aug 2015 21:16:57 +0000 (21:16 +0000)]
am
fee5335c: am
3ded7766: Merge "Ensure coherency of call kinds for LocationSummary."
* commit '
fee5335c4253b4f06632033e24233ad4a45853cb':
Ensure coherency of call kinds for LocationSummary.
Nicolas Geoffray [Fri, 7 Aug 2015 21:16:54 +0000 (21:16 +0000)]
am
a7808cb3: am
a001e3a0: Merge "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
* commit '
a7808cb3e25ff91ac5ce4c8c17bd8757dc23c3f4':
Revert "Pass the verified method to the inlinee DexCompilationUnit."
Nicolas Geoffray [Fri, 7 Aug 2015 21:16:53 +0000 (21:16 +0000)]
am
b23623e7: am
4320ff10: Merge "Pass the verified method to the inlinee DexCompilationUnit."
* commit '
b23623e740f0a934e9ded4214d74e4c9a418d0d1':
Pass the verified method to the inlinee DexCompilationUnit.
Roland Levillain [Fri, 7 Aug 2015 21:12:22 +0000 (22:12 +0100)]
resolved conflicts for merge of
bf3cc9e0 to mnc-dev-plus-aosp
Change-Id: I6079eac15e82065c437391ea5d7491226925c066
David Brazdil [Fri, 7 Aug 2015 20:21:12 +0000 (20:21 +0000)]
am
f1912607: am
33407564: Merge "Introduce arch-specific checker tests."
* commit '
f19126074d22cd16df1ea299e5f3403c52d00eb9':
Introduce arch-specific checker tests.
Nicolas Geoffray [Fri, 7 Aug 2015 16:13:53 +0000 (16:13 +0000)]
am
3ded7766: Merge "Ensure coherency of call kinds for LocationSummary."
* commit '
3ded7766981b3105c7686e0c9d75c378c42fa4a0':
Ensure coherency of call kinds for LocationSummary.
Nicolas Geoffray [Fri, 7 Aug 2015 16:04:33 +0000 (16:04 +0000)]
Merge "Ensure coherency of call kinds for LocationSummary."
Roland Levillain [Fri, 7 Aug 2015 16:00:26 +0000 (16:00 +0000)]
am
d333389c: Tighten default inlining settings when using the space filter.
* commit '
d333389cf635e002658a77e64547631e05004447':
Tighten default inlining settings when using the space filter.
Nicolas Geoffray [Fri, 7 Aug 2015 15:36:51 +0000 (15:36 +0000)]
am
a001e3a0: Merge "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
* commit '
a001e3a0200fe137feeaaead3c99026abce914cd':
Revert "Pass the verified method to the inlinee DexCompilationUnit."
Nicolas Geoffray [Fri, 7 Aug 2015 15:31:20 +0000 (15:31 +0000)]
Merge "Revert "Pass the verified method to the inlinee DexCompilationUnit.""
Nicolas Geoffray [Fri, 7 Aug 2015 15:31:10 +0000 (15:31 +0000)]
Revert "Pass the verified method to the inlinee DexCompilationUnit."
Crashes testing libcore on host/x86.
Bug:
22866717
This reverts commit
08624c50f488ecd845e48683e84726ff8c53e6a7.
Change-Id: Ia8f130d9ea32e171e554bd3e10c44f8453111b52
Nicolas Geoffray [Fri, 7 Aug 2015 14:57:50 +0000 (14:57 +0000)]
am
4320ff10: Merge "Pass the verified method to the inlinee DexCompilationUnit."
* commit '
4320ff10bb344140b75e029c6a4d46b070399682':
Pass the verified method to the inlinee DexCompilationUnit.
Nicolas Geoffray [Fri, 7 Aug 2015 14:47:18 +0000 (14:47 +0000)]
Merge "Pass the verified method to the inlinee DexCompilationUnit."
Roland Levillain [Fri, 7 Aug 2015 11:22:28 +0000 (12:22 +0100)]
Tighten default inlining settings when using the space filter.
(cherry picked from commit
a215b95d03cfe713018a245553b74d7eeee813df
and amended)
Bug:
21868508
Change-Id: Ic83813a966cef18e59447083926bf033aa587154
Roland Levillain [Fri, 7 Aug 2015 10:56:54 +0000 (10:56 +0000)]
am
62dee441: Merge "Tighten default inlining settings when using the space filter."
* commit '
62dee441fff15e951c577b9565f87bb5f27c5ffb':
Tighten default inlining settings when using the space filter.
Roland Levillain [Fri, 7 Aug 2015 10:50:06 +0000 (10:50 +0000)]
Merge "Tighten default inlining settings when using the space filter."
Roland Levillain [Fri, 7 Aug 2015 10:38:32 +0000 (11:38 +0100)]
Tighten default inlining settings when using the space filter.
Bug:
21868508
Change-Id: Ic83813a966cef18e59447083926bf033aa587154
Serguei Katkov [Fri, 7 Aug 2015 10:10:54 +0000 (10:10 +0000)]
am
f2ea71cd: ART: Fix the simplifier for add/sub
* commit '
f2ea71cdb3ee4f5198bc0298aa8be1f9e945ee1c':
ART: Fix the simplifier for add/sub
Alexandre Rames [Fri, 7 Aug 2015 09:26:17 +0000 (10:26 +0100)]
Ensure coherency of call kinds for LocationSummary.
The coherency is enforced with checks added in the `InvokeRuntime`
helper, that we now also use on x86 and x86_64.
Change-Id: I8cb92b042f25dc3c5fd390e9c61a45b477d081f4
David Brazdil [Fri, 7 Aug 2015 07:31:32 +0000 (07:31 +0000)]
am
33407564: Merge "Introduce arch-specific checker tests."
* commit '
33407564904d2186f536107e1ca8d88f2c760c83':
Introduce arch-specific checker tests.
David Brazdil [Fri, 7 Aug 2015 07:23:23 +0000 (07:23 +0000)]
Merge "Introduce arch-specific checker tests."
Nicolas Geoffray [Fri, 7 Aug 2015 04:10:30 +0000 (21:10 -0700)]
Pass the verified method to the inlinee DexCompilationUnit.
Sharpening and other optimizations in compiler driver rely
on having it there.
Also fixes a warning for the intrinsics code.
bug:
22866717
Change-Id: I6ac4f55e9e77452a4ea9e0d0dd0ad70124a95a55
Calin Juravle [Thu, 6 Aug 2015 18:10:03 +0000 (18:10 +0000)]
am
0c3ddba0: am
7fbaa22e: Merge "ART: Fix the simplifier for add/sub"
* commit '
0c3ddba0f3859bd518e07d90ce8936a0b225b228':
ART: Fix the simplifier for add/sub
Calin Juravle [Thu, 6 Aug 2015 17:58:12 +0000 (17:58 +0000)]
am
7fbaa22e: Merge "ART: Fix the simplifier for add/sub"
* commit '
7fbaa22e10979cf17b8c1c0c96bef4919e9d4163':
ART: Fix the simplifier for add/sub
Serguei Katkov [Wed, 5 Aug 2015 11:03:30 +0000 (17:03 +0600)]
ART: Fix the simplifier for add/sub
Instruction simplifier for add/sub should not proceed with floats
because that might cause the incorrect behavior with signed zero.
Bug:
23001681
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
(cherry picked from commit
115b53f609e74672fa93eea1845bb17340d5112a)
Change-Id: I9928724c4158b3961e32e376b9203fe01ba2e442
Calin Juravle [Thu, 6 Aug 2015 17:49:55 +0000 (17:49 +0000)]
Merge "ART: Fix the simplifier for add/sub"
Serguei Katkov [Wed, 5 Aug 2015 11:03:30 +0000 (17:03 +0600)]
ART: Fix the simplifier for add/sub
Instruction simplifier for add/sub should not proceed with floats
because that might cause the incorrect behavior with signed zero.
Change-Id: If0c9bf3931bcbf96b0814f8605a86997aea37145
Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
Pavel Vyssotski [Thu, 6 Aug 2015 16:33:44 +0000 (16:33 +0000)]
am
ce4b1329: ART: x86_64 RoundDouble/Float intrinsics should initialize out value.
* commit '
ce4b1329ca903d6b98734a27a46b54bb9cfd6d5b':
ART: x86_64 RoundDouble/Float intrinsics should initialize out value.
Sebastien Hertz [Thu, 6 Aug 2015 14:59:34 +0000 (14:59 +0000)]
am
c5e25863: am
a27a67c9: Merge "Fix image loading in interpeter-only mode"
* commit '
c5e25863d3acae834399701248840bbf51ceb36e':
Fix image loading in interpeter-only mode
Sebastien Hertz [Thu, 6 Aug 2015 14:54:12 +0000 (14:54 +0000)]
am
906e0def: am
bc7db535: Merge "Fix DDM reply buffer deallocation"
* commit '
906e0def4a08d7ae262b03d7d344997c0cf8fae4':
Fix DDM reply buffer deallocation
Sebastien Hertz [Thu, 6 Aug 2015 14:52:47 +0000 (14:52 +0000)]
am
a27a67c9: Merge "Fix image loading in interpeter-only mode"
* commit '
a27a67c98e12cd1a90431704a6d7bcbd546667fd':
Fix image loading in interpeter-only mode
Sebastien Hertz [Thu, 6 Aug 2015 14:48:55 +0000 (14:48 +0000)]
am
bc7db535: Merge "Fix DDM reply buffer deallocation"
* commit '
bc7db5356a68cf44d6497f6956e8a97dc9355b80':
Fix DDM reply buffer deallocation
Sebastien Hertz [Thu, 6 Aug 2015 14:46:41 +0000 (14:46 +0000)]
Merge "Fix image loading in interpeter-only mode"
Sebastien Hertz [Thu, 6 Aug 2015 14:43:58 +0000 (14:43 +0000)]
Merge "Fix DDM reply buffer deallocation"
Alexandre Rames [Thu, 6 Aug 2015 13:49:28 +0000 (14:49 +0100)]
Introduce arch-specific checker tests.
- The '.cfg' output is now created on target.
- Arch-specific checker tests can be created by inserting a
suffix. For example:
/// CHECK-START-ARM64: int Main.foo(int) register (after)
/// CHECK-DAG: <<Arg:i\d+>> ParameterValue
Change-Id: I55cdb37f8e806c7ffdde6b676c8f44ac30b59051
Sebastien Hertz [Thu, 6 Aug 2015 10:52:43 +0000 (12:52 +0200)]
Fix image loading in interpeter-only mode
Follow-up https://android-review.googlesource.com/162935. We now need
an ArtMethodVisitor to update entrypoints of methods in the image.
Bug:
22832610
Change-Id: I30ca9c369a73c3372694b446e73afa2e37890a65
Mathieu Chartier [Thu, 6 Aug 2015 12:40:27 +0000 (12:40 +0000)]
am
f1bb39e8: am
1f3f766d: Merge "Move ArtFields and ArtMethods to be a length prefixed array"
* commit '
f1bb39e81c12a11ed10e960a0efe8d2889de43aa':
Move ArtFields and ArtMethods to be a length prefixed array
Mathieu Chartier [Thu, 6 Aug 2015 12:33:35 +0000 (12:33 +0000)]
am
1f3f766d: Merge "Move ArtFields and ArtMethods to be a length prefixed array"
* commit '
1f3f766d3b365d01f36b85dc19d40f754fa48533':
Move ArtFields and ArtMethods to be a length prefixed array
Sebastien Hertz [Thu, 6 Aug 2015 09:37:02 +0000 (11:37 +0200)]
Fix DDM reply buffer deallocation
Reply buffer is an uint8_t* allocated with new uint8_t[...] so it
must be deallocated with delete[], not free.
Change-Id: Ib5d6387aa63f1e0393113f82602f661bbada4aa2
Mathieu Chartier [Thu, 6 Aug 2015 03:12:39 +0000 (03:12 +0000)]
Merge "Move ArtFields and ArtMethods to be a length prefixed array"
Pavel Vyssotski [Fri, 31 Jul 2015 07:03:17 +0000 (13:03 +0600)]
ART: x86_64 RoundDouble/Float intrinsics should initialize out value.
x86_64 RoundDouble intrinsic should initialize output register for the case of
"inPlusPointFive >= maxLong" as expected. The same for the RoundFloat intrinsic.
Fixed also the out register type in CreateSSE41FPToIntLocations provoking
a DCHECK failure.
Signed-off-by: Pavel Vyssotski <pavel.n.vyssotski@intel.com>
(cherry picked from commit
9ca257196b46fd7629bce0b338580e571e4113a8)
Bug:
22973442
Change-Id: If974e79d33311587d0b541a01ca8a4c9c11b9468
Andreas Gampe [Thu, 6 Aug 2015 01:39:45 +0000 (01:39 +0000)]
am
50fbbd29: am
275bc5e5: Merge "ART: Extend ISA features option for (host) run tests"
* commit '
50fbbd29c444930446615651240e74595d8a5a9c':
ART: Extend ISA features option for (host) run tests
Mathieu Chartier [Thu, 30 Jul 2015 23:20:06 +0000 (16:20 -0700)]
Move ArtFields and ArtMethods to be a length prefixed array
Fixes race conditions between changing method and fields arrays
being seen in the wrong order by the GC.
Bug:
22832610
Change-Id: Ia21d6698f73ba207a6392c3d6b9be2658933073f
Andreas Gampe [Wed, 5 Aug 2015 23:38:50 +0000 (23:38 +0000)]
am
275bc5e5: Merge "ART: Extend ISA features option for (host) run tests"
* commit '
275bc5e5f318ba6ea1bad6c89c2924d1248b7523':
ART: Extend ISA features option for (host) run tests
Andreas Gampe [Wed, 5 Aug 2015 23:06:02 +0000 (23:06 +0000)]
Merge "ART: Extend ISA features option for (host) run tests"
Andreas Gampe [Wed, 5 Aug 2015 16:24:45 +0000 (09:24 -0700)]
ART: Extend ISA features option for (host) run tests
To allow to test advanced intrinsics only available on (fairly)
modern processors, and because our build requirements are still
too low to enable them in the build system, pipe through the
existing make variables to the run-tests to allow to override
the dex2oat autodetection scheme.
Usage (standalone run-test): use the new --instruction-set-features
command line parameter to set the value for dex2oat (in the prebuild
configuration) or as an -Xcompiler-option (for no-prebuild). Note:
this is general and also works for target tests.
Usage (through make): set DEX2OAT_HOST_INSTRUCTION_SET_FEATURES and
2ND_DEX2OAT_HOST_INSTRUCTION_SET_FEATURES to set instruction set
features, as was possible before for the compilation of core files.
This option is now forwarded to host run-tests.
Change-Id: I9d89c82b6a5c8853748e5d1c153dde5d4050757a
Andreas Gampe [Wed, 5 Aug 2015 19:13:51 +0000 (19:13 +0000)]
am
8a8cefa3: am
d8406781: Merge "ART: Wire up DexToDexCompiler without extern"
* commit '
8a8cefa3d0331d07c49d11ea936b33d03d124e73':
ART: Wire up DexToDexCompiler without extern
Andreas Gampe [Wed, 5 Aug 2015 19:06:54 +0000 (19:06 +0000)]
am
d8406781: Merge "ART: Wire up DexToDexCompiler without extern"
* commit '
d8406781fdb8917ae0c45c1e2194f9a5ab874e78':
ART: Wire up DexToDexCompiler without extern
Igor Murashkin [Wed, 5 Aug 2015 19:05:21 +0000 (19:05 +0000)]
am
6541898f: am
02f0771b: Merge "Revert "cleanup: Replace pointers with out-parameters and fix-up formatting""
* commit '
6541898f6738794ff59a44b121e4a300d36ec393':
Revert "cleanup: Replace pointers with out-parameters and fix-up formatting"
Mathieu Chartier [Wed, 5 Aug 2015 19:05:19 +0000 (19:05 +0000)]
am
5970565b: am
94800f46: Merge "Address some comments and clean up"
* commit '
5970565b1fafc1b152680b4904ad5be0af4b355e':
Address some comments and clean up
Mathieu Chartier [Wed, 5 Aug 2015 19:05:11 +0000 (19:05 +0000)]
am
df9964ee: am
46e0f460: Merge "Fix mod-union logic for native roots"
* commit '
df9964eecad0821a791c54210d3fab67a06e9a19':
Fix mod-union logic for native roots
Andreas Gampe [Wed, 5 Aug 2015 18:59:25 +0000 (18:59 +0000)]
Merge "ART: Wire up DexToDexCompiler without extern"
Andreas Gampe [Thu, 23 Jul 2015 08:19:26 +0000 (01:19 -0700)]
ART: Wire up DexToDexCompiler without extern
The extern declaration actually had the wrong signature, a parameter
was missing, and we never noticed.
Remove the function field and extern. Add a header for the compiler.
Use the header file.
Change-Id: Ia4d4dd86211da6045709a45c7bf8430471d1b62b
Igor Murashkin [Wed, 5 Aug 2015 18:23:03 +0000 (18:23 +0000)]
am
02f0771b: Merge "Revert "cleanup: Replace pointers with out-parameters and fix-up formatting""
* commit '
02f0771bba69edd34b0b112902bb9132ed099c75':
Revert "cleanup: Replace pointers with out-parameters and fix-up formatting"
Igor Murashkin [Wed, 5 Aug 2015 18:18:59 +0000 (18:18 +0000)]
Merge "Revert "cleanup: Replace pointers with out-parameters and fix-up formatting""
Mathieu Chartier [Wed, 5 Aug 2015 18:08:39 +0000 (18:08 +0000)]
am
94800f46: Merge "Address some comments and clean up"
* commit '
94800f46da0aded5152545322ad842f89e8a21d8':
Address some comments and clean up
Mathieu Chartier [Wed, 5 Aug 2015 18:02:53 +0000 (18:02 +0000)]
Merge "Address some comments and clean up"
Mathieu Chartier [Wed, 5 Aug 2015 17:49:05 +0000 (17:49 +0000)]
am
46e0f460: Merge "Fix mod-union logic for native roots"
* commit '
46e0f460aa233a4a0ac161bfafde164357fe2b26':
Fix mod-union logic for native roots
Mathieu Chartier [Wed, 5 Aug 2015 17:42:56 +0000 (17:42 +0000)]
Merge "Fix mod-union logic for native roots"
Mathieu Chartier [Wed, 5 Aug 2015 17:10:07 +0000 (10:10 -0700)]
Fix mod-union logic for native roots
Bug:
22949217
Change-Id: I9e4631870160d5a9412df1eec2a7b79c65668542
Roland Levillain [Wed, 5 Aug 2015 13:05:36 +0000 (13:05 +0000)]
am
75fe3e02: am
13394093: Merge "Have constant folding be more flexible."
* commit '
75fe3e02fdc0c81b81f8ffbdb982f214b4995691':
Have constant folding be more flexible.
Roland Levillain [Wed, 5 Aug 2015 12:57:11 +0000 (12:57 +0000)]
am
13394093: Merge "Have constant folding be more flexible."
* commit '
1339409345cc8b46d64570430ca3197408fda159':
Have constant folding be more flexible.
Roland Levillain [Wed, 5 Aug 2015 12:52:12 +0000 (12:52 +0000)]
Merge "Have constant folding be more flexible."
Roland Levillain [Wed, 5 Aug 2015 10:22:08 +0000 (10:22 +0000)]
am
edd54eeb: am
902ec264: Merge "Add constant folding for long unary operations in opt. compiler."
* commit '
edd54eeb8a725f121b8332f9b4db0b2774a21f38':
Add constant folding for long unary operations in opt. compiler.
Roland Levillain [Wed, 5 Aug 2015 10:11:10 +0000 (10:11 +0000)]
am
902ec264: Merge "Add constant folding for long unary operations in opt. compiler."
* commit '
902ec264e1040cbfd783c44809ed10b261bd78ee':
Add constant folding for long unary operations in opt. compiler.
Roland Levillain [Wed, 5 Aug 2015 10:03:46 +0000 (10:03 +0000)]
Merge "Add constant folding for long unary operations in opt. compiler."