summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵android-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r39android-9.0.0_r38android-9.0.0_r37android-9.0.0_r36android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16android-9.0.0_r12android-9.0.0_r11pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-qpr2-releasepie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releasepie-dr1-releasepie-dr1-devpie-devpie-b4s4-releasepie-b4s4-devColin Cross
9e1602fcb0 am: a715adced4 am: e481f8e66f Change-Id: I829b963e2150538b432e32951e5c4242780e56eb
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 am: bbd7d2e2c3 am: 748b31ab42 Change-Id: I46987eedb6dbed2c4a52acd650991864de43916c
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into master am: 9e1602fcb0Colin Cross
am: a715adced4 Change-Id: I2337379346c5b63ac6b84faf21e7c5960822b4b9
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 am: bbd7d2e2c3 Change-Id: I039388f5f5045e9385461c60efbca732f1bce254
2017-12-19Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: 9e1602fcb0 Change-Id: I6000bcab321f9ad3be79f206530a1b926c99131e
2017-12-19Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" am: 0156e0d255 Change-Id: Id57705c5c50bcb4dd5754762216176b3de781cb6
2017-12-18Merge remote-tracking branch 'aosp/upstream-master' into masterandroid-wear-p-preview-2android-wear-8.0.0_r1android-p-preview-3android-p-preview-2android-p-preview-1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7o-mr1-iot-preview-8o-mr1-iot-preview-7Colin Cross
* aosp/upstream-master: Automatic formatting cleanup of Android *.java files. Eagerly close directory content stream again when looking for dumped lambdas RELNOTES: None. reflect prefix in additional ClassReader methods for consistency with what happens during visit() RELNOTES: None. Bug: 70415451 Test: m checkbuild Change-Id: Ia4743853a34a9c0d315663959eac0dcd0fdb627b
2017-12-18Revert "Revert "Merge remote-tracking branch 'aosp/upstream-master' into ↵Colin Cross
desugar"" This reverts commit 67e182a0a1c1d59b5fa107a42ba3bacdc7255eba. Bug: 70415451 Test: m checkbuild Change-Id: I87e967894b53b0f18defc48868e4e3b8181ddd33
2017-12-18Automatic formatting cleanup of Android *.java files.jingwen
RELNOTES: None. PiperOrigin-RevId: 179425421 GitOrigin-RevId: 094caa508fa74081d861e9e8f8eb50934811bf65 Change-Id: I9019cbd3802e7d74c61cc9bb8af9a7ff9bc05e2c
2017-12-18Eagerly close directory content stream again when looking for dumped lambdaskmb
RELNOTES: None. PiperOrigin-RevId: 179245378 GitOrigin-RevId: dd6f8298529f05372d9c0c31eabf19f69d38b22e Change-Id: Iaf61b5eec2bc3f050a3aada9532e8bb3d03d723f
2017-12-18reflect prefix in additional ClassReader methods for consistency with what ↵kmb
happens during visit() RELNOTES: None. PiperOrigin-RevId: 179115377 GitOrigin-RevId: 02f05cbbcaf2f6748525bc53469689b92a4be936 Change-Id: I9704b3dbf3ab6f9bdfcda0a1c864ee7668240f76
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar" ↵Colin Cross
am: 67e182a0a1 am: d9074776c9 am: 4552d61047 Change-Id: I91c44faaf7898507b15835b32b7860fb448671c2
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar" ↵Colin Cross
am: 67e182a0a1 am: d9074776c9 Change-Id: I75ef138192f82e91d1a3d27d47800af03fe1808b
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar"Colin Cross
am: 67e182a0a1 Change-Id: I74aaa1a32094f8a2e8364d1334f68ade73566894
2017-12-15Revert "Merge remote-tracking branch 'aosp/upstream-master' into desugar"Colin Cross
This reverts commit 28068806fa84995d3bd0f9aa448058c1d55cce36. Reason for revert: Caused "Too many open files" errors. Bug: 70415451 Change-Id: I2186e7eb5dd1501fe1c1c9c2f1fb1f1b6df2cc24
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugar am: ↵Colin Cross
28068806fa am: 6b2f3e8f0f am: 970766bc54 Change-Id: I64daa5e6eb1809f2f67a49f78dbc491610d84eb5
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 28068806faColin Cross
am: 6b2f3e8f0f Change-Id: Ie9cb7954709cdb7388a3c6731a834797d4d38059
2017-12-15Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
am: 28068806fa Change-Id: I80f75b80ada6ee035fc2768b1831b2c122b37cdd
2017-12-14Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
* aosp/upstream-master: make desugar resilient to unrelated lambdas being dumped while it runs RELNOTES: None. Correct stack map frame computation. When visiting CHOP Frame (discarding n local local variables), the current implementation deletes n local slots, which is wrong when the local variable to delete is of type category 2. Bug: 70415451 Test: m checkbuild Change-Id: Iadc6396e3154261f6de83a725a3a16939253e1b1
2017-12-14make desugar resilient to unrelated lambdas being dumped while it runskmb
RELNOTES: None. PiperOrigin-RevId: 178952440 GitOrigin-RevId: 817b535d92ee7fdb4740e2a99505ab10d4b54a0d Change-Id: I1cffc3b930289b86c097414b5aba6a697e4d4e74
2017-12-14Correct stack map frame computation. When visiting CHOP Frame (discarding n ↵cnsun
local local variables), the current implementation deletes n local slots, which is wrong when the local variable to delete is of type category 2. This CL deletes local variables instead of local slots. Another change is using the Label objects to identify uninitialized values, instead of the offsets of labels, because the offsets of labels might not be computed. RELNOTES:n/a. PiperOrigin-RevId: 178762969 GitOrigin-RevId: 770b1779dfd4e673e1523bc7e6f1772d4f4dfc04 Change-Id: Ib1ae1a813a51649d5d9522bdf393f48e56432b66
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE files am: 6174695ef9 am: b6420c30b5Colin Cross
am: e128c69f6c Change-Id: I6f3dfad801596be8b59d757361199231bd2ce397
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE files am: 6174695ef9Colin Cross
am: b6420c30b5 Change-Id: I38f22dbfae7e12ef4d8cb6f88f2cd32e539be01d
2017-12-10Add MODULE_LICENSE_APACHE2 and NOTICE filesColin Cross
am: 6174695ef9 Change-Id: I2e3c41166686c3a581e6eca781f87284ea104929
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugar am: ↵Colin Cross
00ed747d46 am: e893545a77 am: c7db50bb3f Change-Id: I6ebf8d448345d5d491a7d159e64a78742932c779
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugar am: 00ed747d46Colin Cross
am: e893545a77 Change-Id: I27f8b386aab61d169e210fefa122c25dca437d81
2017-12-08Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
am: 00ed747d46 Change-Id: I7d6ad99a178a6ee94537b677402c2d09d9c57ac0
2017-12-07Add MODULE_LICENSE_APACHE2 and NOTICE filesColin Cross
Bug: 70348808 Test: none Change-Id: Ia1ddceee436ac0c8588b61721df1a872ad31d6b0
2017-12-06Merge remote-tracking branch 'aosp/upstream-master' into desugarColin Cross
* aosp/upstream-master: Improve exception message to output more information. RELNOTES:None. Remove static import of inner class InferredType's fields Automatic code cleanup. Let to push lambda arguments not only with *LOAD instructions but with SIPUSH and *CONST_*. Fix canonical option list for options that implicitly require options with allowMultiple=true Change config expansion application order, gated by startup flag --expand_configs_in_place. Specialize $closeResource(Throwable, AutoCloseable) so that desugared code does not depend on AutoCloseable, as it is not available before API 19. Fix EnclosingMethod attribute when moving interface methods to companion class RELNOTES: None. Cleanup stream use in canonical list of options. Remove unused LegacyParamsFilePreProcessor. Removed test cases from OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest. Switch on tracking of specific option priorities. Compute canonical list of options using OptionValueDescription's tracking of instances. Test: m checkbuild Change-Id: Idb762b0dabc9660d9116d1b976fb2f74aa7f5e09
2017-12-06Improve exception message to output more information.cnsun
RELNOTES:None. PiperOrigin-RevId: 177875613 GitOrigin-RevId: ddd5ac16aeffa6c4693c348f73e7365240b1abc5 Change-Id: Id8e000ab3d3ef7b35cfa008e5a84b130e0e79e57
2017-12-06Remove static import of inner class InferredType's fieldsccross
A few of the InferredType's fields were being static imported, but not all of them, and the use of the statically imported fields was inconsistent. Statically importing the inner class causes strange errors when building desugar in the Android platform build with OpenJDK8, but not OpenJDK9: external/desugar/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java:1015: error: cannot find symbol @AutoValue ^ symbol: class AutoValue location: class BytecodeTypeInference 1 error Remove the static imports to make the build work and to make the usage consistent. RELNOTES:None. PiperOrigin-RevId: 177875501 GitOrigin-RevId: b0fb55ad19e4751b61cbbf79ba60748b6e594100 Change-Id: I0c467abeeaac31fad138c7e2a90535740e68e8e9
2017-11-29Automatic code cleanup.cushon
PiperOrigin-RevId: 177261837 GitOrigin-RevId: 85d69f2397d7b54fa8b8c69b7bc9ec6d36cb1d49 Change-Id: Iab3521ac7d7a5c1340ba85fa036686a622f1065e
2017-11-29Let to push lambda arguments not only with *LOAD instructions but with ↵Googler
SIPUSH and *CONST_*. RELNOTES: None PiperOrigin-RevId: 177149410 GitOrigin-RevId: af10f2a83bdda8406a8c0a012db6d38e19d022b0 Change-Id: Ica86f3606d70b1cd25e336eb2cce5e369138ba76
2017-11-29Fix canonical option list for options that implicitly require options with ↵ccalvarin
allowMultiple=true Was filtering for the implicit options in SingleOptionValue, but forgot the check in RepeatableOptionValue. This is now fixed. RELNOTES: None. PiperOrigin-RevId: 176669853 GitOrigin-RevId: d55acc31ec7c731481a3691e6cf91c53869e9c67 Change-Id: I22d16447e5ad977ec890008e25be4d396a2523ed
2017-11-29Change config expansion application order, gated by startup flag ↵ccalvarin
--expand_configs_in_place. --config options were expanded in a fix-point expansion, where in practice, the flags that --config values expanded to ended up between the normal bazelrc options and the command line's explicit options. Since the options parser has an order-based priority scheme and it accepts multiple mentions of a single-valued option, this conflicts with users' expectations of being able to override these config expansions by using the order in which they are mentioned. This change makes it possible to expand the config values defined in your bazelrc (or blazerc) files to occur in-place: --stuff --config=something --laterstuff will interpret the options that --config=something expands to as if they had been mentioned explicitly between --stuff and --laterstuff. In order to not break users relying on complex flag combinations to configure their builds, this behavior will not yet be turned on by default. Instead, use --expand_configs_in_place as a startup flag to test this feature. --announce_rc may be helpful for debugging any differences between the fixed point and in-place expansions. Once you've debugged your problems, add "startup --expand_configs_in_place" to your blazerc to stick to the new behavior. RELNOTES: Use --expand_configs_in_place as a startup argument to change the order in which --config expansions are interpreted. PiperOrigin-RevId: 176371289 GitOrigin-RevId: 6364017ef95353969a8297c99a07c2a52102d9cc Change-Id: Id8b305db7a336132ee157cd0998330333888a139
2017-11-29Specialize $closeResource(Throwable, AutoCloseable) so that desugared code ↵cnsun
does not depend on AutoCloseable, as it is not available before API 19. This CL includes the following: 1. A type inference algorithm based on ASM. It relies on the stack map frames to compute type information at the entry of basic blocks. 2. The type inference is used to infer the types of the resources to be closed. Then for each concrete resource type, we specialize the synthetic $closeResource method to $closeResource(Throwable, <concrete resource type>). RELNOTES: None PiperOrigin-RevId: 175731437 GitOrigin-RevId: e83f3b1fb010298cbe1e16e5f7f2f39bfb045cef Change-Id: I347f8e4058a191621fb21bf2e81d7cf8f39ce6aa
2017-11-29Fix EnclosingMethod attribute when moving interface methods to companion classkmb
RELNOTES: None. PiperOrigin-RevId: 175613518 GitOrigin-RevId: f581da7375d8548ffaac61ead74cdc3519eeb5b2 Change-Id: I2333812920923fa8050022b8f482e139c37f9027
2017-11-29Cleanup stream use in canonical list of options.ccalvarin
Follow up to https://github.com/bazelbuild/bazel/commit/c50cd13c75a2a1685f5ac9bd70561ac1e50722e7 RELNOTES: None. PiperOrigin-RevId: 174498205 GitOrigin-RevId: fecf464ec3bf2593e31fa6cd25a45ce149c2dd75 Change-Id: Ife1674dc14b8276510df9730e84416863b79a59f
2017-11-29Remove unused LegacyParamsFilePreProcessor. Removed test cases from ↵apell
OptionsParserTest are implemented in ParamsFilePreProcessorTest, ShellQuotedParamsFilePreProcessorTest and UnquotedParamsFilePreProcessorTest. RELNOTES: None. PiperOrigin-RevId: 174359569 GitOrigin-RevId: 1ce985a704357c35d6691a80d94ca55372593b16 Change-Id: Ibc27b64d110861b1a2248227e1d59e4bc7fee953
2017-11-29Switch on tracking of specific option priorities.ccalvarin
Make sure that multiple calls to parse() follow each other sequentially. This is necessary for blazerc expansion, which occurs first in command order, then blazerc order. RELNOTES: None. PiperOrigin-RevId: 174343241 GitOrigin-RevId: 4871bf7f50dc889985ae25102c3fb9de869b50bc Change-Id: Ieaa99adffd4d7f33167b18635641d4d3439d5a64
2017-11-29Compute canonical list of options using OptionValueDescription's tracking of ↵ccalvarin
instances. Stop storing the canonical list of arguments separately. For the canonicalize-flags command, we want to avoid showing options that either have no values in their own right (such as expansion options and wrapper options) and instances of options that did not make it to the final value. This is work we already do in OptionValueDescription, so we can generate the canonical form from the values tracked there, instead of tracking it separately. This means the canonical list is more correct where implicit requirements are concerned: implicit requirements are not listed in the canonical form, but now the values they overwrote will be correctly absent as well. Use this improved list for the effective command line published to the BEP. RELNOTES: Published command lines should have improved lists of effective options. PiperOrigin-RevId: 173873154 GitOrigin-RevId: c50cd13c75a2a1685f5ac9bd70561ac1e50722e7 Change-Id: I9c6802dc3ab1e263048862f931f0c5f4933576ae
2017-11-15Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
am: 93d7facd1b Change-Id: Idc2f73a13852597650fde6a00198450154a2ca7e
2017-11-14Merge remote-tracking branch 'goog/stage-aosp-master' into HEADXin Li
Change-Id: Icefa18f1a9276657ec620b4850b94f6834d72f09
2017-11-13Merge commit 'f5d9b7abf28912f8a921cdca729dffa9b630c6a7' into HEADXin Li
Change-Id: I1aa282cfe76618a4a72cc50b899aa584f058da19
2017-11-03Merge remote-tracking branch 'aosp/upstream-master' into master am: ↵Colin Cross
bc20f321cd am: 2a4a26af86 am: fb6ba24633 Change-Id: I8c89cf7bd3e9745da06326d71ef68c26cff44bc2
2017-11-03Merge remote-tracking branch 'aosp/upstream-master' into master am: bc20f321cdColin Cross
am: 2a4a26af86 Change-Id: I8d8807bc92b038cd36bb43f833dd707744f2b25b
2017-11-03Merge remote-tracking branch 'aosp/upstream-master' into masterColin Cross
am: bc20f321cd Change-Id: I3b73fad6cd19c0ae322ea1d5978b025acf8c9943
2017-10-24Merge remote-tracking branch 'aosp/upstream-master' into masterandroid-o-mr1-iot-preview-6o-mr1-iot-preview-6Colin Cross
Also delete java/com/google/devtools/build/android/desugar/dependencies/MetadataCollector.java to avoid a proto dependency. * aosp/upstream-master: Record dependencies when directly calling moved interface methods. RELNOTES: None. Exclude Android dependency checking from Bazel's singlejar build. This should also address https://github.com/bazelbuild/bazel/issues/3903 RELNOTES: None. Track expansions in OptionValueDescription. Remove feature to allow expansion flags to have values. Migrate all users of OptionsParser.enableParamsFileSupport to use the ShellQuotedParamsFilePreProcessor. This covers all of the tools packaged in the ResourceProcessorBusyBox. Track Option placement within a priority category. Make option conflicts less spammy. Desugar-singlejar integration tests for double-checking default methods. Expand implicitRequirements in the location of the option that required it. Remove the implicit requirement of core_library. Clean up InvocationPolicy's use of OptionDescription. Report the structured Bazel command line via the BEP. Do not rewrite static interface method invocations from bootclasspath Downgrade the default invocation policy log levels to fine. Categorize build options for BuildConfiguration. add flags to desugar to emit metadata that can be used for double-checking correctness of default and static interface desugaring. RELNOTES: none Add new option categorization and tagging information to HelpCommand's output. Move the canonicalization of an option value to the option value itself. Test: m checkbuild Change-Id: Ie86c647a0350bea0986bd1d8df95486b3fe585c3
2017-10-24Record dependencies when directly calling moved interface methods.kmb
RELNOTES: None. PiperOrigin-RevId: 173154512 GitOrigin-RevId: a01493b751fa1a31e1cef929b36ee030402909fa Change-Id: Id96eb89cbca159e7ce7f0e72ec3c3312a7ba4071
2017-10-24Exclude Android dependency checking from Bazel's singlejar build.kmb
This should also address https://github.com/bazelbuild/bazel/issues/3903 RELNOTES: None. PiperOrigin-RevId: 172963663 GitOrigin-RevId: db1426b75d7721554a8b139696b5b4c400a260a5 Change-Id: I4cf813e365609c5f811f421f9133b2497f2c5c72
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-07 02:05:11 +0000