Skip to content

Don't use empty files to indicate presence of tasty in class path. #2569

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

Merged
merged 1 commit into from
May 29, 2017

Conversation

DarkDimius
Copy link
Contributor

Use hasTasty files instead.

Copy link
Member

@dottybot dottybot left a comment

Choose a reason for hiding this comment

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

Hello, and thank you for opening this PR! 🎉

All contributors have signed the CLA, thank you! ❤️

Commit Messages

We want to keep history, but for that to actually be useful we have
some rules on how to format our commit messages (relevant xkcd).

Please stick to these guidelines for commit messages:

  1. Separate subject from body with a blank line
  2. When fixing an issue, start your commit message with Fix #<ISSUE-NBR>:
  3. Limit the subject line to 72 characters
  4. Capitalize the subject line
  5. Do not end the subject line with a period
  6. Use the imperative mood in the subject line ("Added" instead of "Add")
  7. Wrap the body at 80 characters
  8. Use the body to explain what and why vs. how

adapted from https://chris.beams.io/posts/git-commit

Have an awesome day! ☀️

@DarkDimius DarkDimius requested a review from smarter May 29, 2017 13:57
@DarkDimius
Copy link
Contributor Author

@smarter are IDE tests run by default?

@smarter
Copy link
Member

smarter commented May 29, 2017

@DarkDimius There are no IDE tests currently :).

@@ -86,10 +86,10 @@ class InteractiveDriver(settings: List[String]) extends Driver {
else
null
prefix != null && {
val tastyFile = prefix + ".tasty"
val hasTastyFile = prefix + ".hasTasty"
Copy link
Member

Choose a reason for hiding this comment

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

This won't work correctly if YemitTasty is enabled.

@smarter
Copy link
Member

smarter commented May 29, 2017

if (f.exists) List(f)
else Nil
val prefix = classFile.getAbsolutePath.stripSuffix(".class")
List(".tasty", ".hasTasty").map(x => new File(prefix + x)).filter(_.exists)
Copy link
Member

Choose a reason for hiding this comment

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

Documentation above this method needs to be updated to talk about .hasTasty files too.

@DarkDimius
Copy link
Contributor Author

ping @smarter. The doc was updated. Anything else? In absence of tests it's tricky to know)

@DarkDimius
Copy link
Contributor Author

@smarter, why did you terminate the CI?

@@ -214,7 +214,8 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
} else if (!outTastyFile.isVirtual) {
// Create an empty file to signal that a tasty section exist in the corresponding .class
// This is much cheaper and simpler to check than doing classfile parsing
outTastyFile.create()
val hasTasty = getFileForClassfile(outF, store.name, ".hasTasty")
Copy link
Member

Choose a reason for hiding this comment

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

It turns out that getFileForClassfile will automatically create an empty file, so we are now creating both ".tasty" and ".hasTasty" files, I'll fix it :).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks!

For now, we'll only use .tasty files when we actually store a tasty
section in them.

This requires release a new version of sbt-dotty to deal with deleting
.hasTasty files.
@smarter smarter merged commit 4639a10 into scala:master May 29, 2017
@allanrenucci allanrenucci deleted the hasTasty branch December 14, 2017 19:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants