Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Roll Dart to 635c47b1c9efe86b896d95bd446c6a5e2459037e. #13315

Merged
merged 1 commit into from
Oct 23, 2019
Merged

Roll Dart to 635c47b1c9efe86b896d95bd446c6a5e2459037e. #13315

merged 1 commit into from
Oct 23, 2019

Conversation

rmacnak-google
Copy link
Contributor

@rmacnak-google rmacnak-google commented Oct 23, 2019

635c47b Reland "Update BoringSSL to 4dfd5af."
2be3763 [vm/ffi] Support moves with temp in ffi call
92c69f2 Flow analysis: promote on successful execution of an "as" expression.
6461e41 Flow analysis: call initialize for params after functionExpression_begin.
5837c65 Flow analysis: test unreachability for constructor initializers.
8e23f76 Flow analysis: properly handle promotion of type parameters.
a7b092e Fix operator== for type parameter types.
06a8577 Flow analysis: recursively annotate unreachable nodes in test

@@ -1889,7 +1889,7 @@ class _RepositoryBoringSSLDirectory extends _RepositoryDirectory {
_RepositoryDirectory createSubdirectory(fs.Directory entry) {
if (entry.name == 'src')
return _RepositoryBoringSSLSourceDirectory(this, entry);
return super.createSubdirectory(entry);
return _RepositoryBoringSSLDirectory(this, entry);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks strange - what is the meaning of this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It means that all subdirectories in //third_party/boringssl (except src) are licensed like //third_party/boringssl itself, rather any becoming _RepositoryGenericThirdPartyDirectory.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm.. what if you have another src folder nested deeper in boringssl? With this it will be treated as top-level src, which is rather strange.

Copy link
Member

@aam aam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably want to update sky/packages/sky_engine/LICENSE as well.
(by the way this was my take on this: #13278)

635c47b Reland "Update BoringSSL to 4dfd5af."
2be3763 [vm/ffi] Support moves with temp in ffi call
92c69f2 Flow analysis: promote on successful execution of an "as" expression.
6461e41 Flow analysis: call initialize for params after functionExpression_begin.
5837c65 Flow analysis: test unreachability for constructor initializers.
8e23f76 Flow analysis: properly handle promotion of type parameters.
a7b092e Fix operator== for type parameter types.
06a8577 Flow analysis: recursively annotate unreachable nodes in test
@rmacnak-google
Copy link
Contributor Author

@Hixie Do you have preference between the approach to updating the license script in this PR versus the approach in #13278?

Copy link
Member

@aam aam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be able to revise license check when Ian weighs in with his opinion.

@rmacnak-google rmacnak-google merged commit dcf7b51 into flutter:master Oct 23, 2019
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 24, 2019
engine-flutter-autoroll added a commit to flutter/flutter that referenced this pull request Oct 24, 2019
…er/engine#13315) (#43392)

git@github.com:flutter/engine.git/compare/400e3b00fb4c...dcf7b51

git log 400e3b0..dcf7b51 --no-merges --oneline
2019-10-23 rmacnak@google.com Roll Dart to 635c47b1c9efe86b896d95bd446c6a5e2459037e. (flutter/engine#13315)


If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC aaclarke@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
@Hixie
Copy link
Contributor

Hixie commented Oct 24, 2019

looking at this on my phone I couldn't figure out what was going on sufficiently to have an opinion. can you find me tomorrow and walk me through it?

@aam
Copy link
Member

aam commented Oct 24, 2019

can you find me tomorrow and walk me through it?

in case it helps to have it written down:
root cause for license-check script change is presence of "third_party" folder in new version of boringssl. "third_party" is recognized and generically processed by existing _RepositoryGenericThirdPartyDirectory but we want to avoid that because "third_party" in boringssl has assembly .S files, that has to be processed specially.
In this PR we are saying everything in boringssl folder except of src folder has to be (recursively) processed specially(accepted).
In #13278 we are explicitly navigating down to third_party folder in boringssl( which is under boringssl/{linux|ios|mac|win}*/gen/crypto/third_party) and accepting contents of that folder.

Inconnu08 pushed a commit to Inconnu08/flutter that referenced this pull request Nov 26, 2019
…er/engine#13315) (flutter#43392)

git@github.com:flutter/engine.git/compare/400e3b00fb4c...dcf7b51

git log 400e3b0..dcf7b51 --no-merges --oneline
2019-10-23 rmacnak@google.com Roll Dart to 635c47b1c9efe86b896d95bd446c6a5e2459037e. (flutter/engine#13315)


If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC aaclarke@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
4 participants