Commit Graph

4485 Commits

Author SHA1 Message Date
Grzegorz Kossakowski 207dd762f4 Move `trait-member-modified` to source-dependencies
It's not clear what the distinction between compiler-project and
source-dependencies scripted tests is so let's stick to the one that has
the biggest number of tests for incremental compiler.
2016-02-04 16:32:35 +01:00
Grzegorz Kossakowski 74ffe5d064 Add a pending test for a modified member of a trait
The test shows that name hashing optimization is broken for members
defined in traits. The problem is that modification of a member of a trait
triggers change of a hash of trait's name.

The behavior covered by this test regressed in
40ebc82531
The bug is tracked in #2436.
2016-02-04 16:32:35 +01:00
Martin Duhem e966329776 Merge pull request #2414 from smarter/fix/duplicate-defs
[0.13.10] ExtractAPI: avoid unnecessary duplication of defs with primitive types
2016-01-25 09:26:29 +01:00
Dale Wijnand 03524e3329 Merge pull request #2413 from smarter/fix/vc-return-type
[0.13.10] Always invalidate API when return type is a value class
2016-01-25 07:02:20 +00:00
Guillaume Martres 726b5c8a30 ExtractAPI: avoid unnecessary duplication of defs with primitive types
If a method's type contains a non-primitive value class then it has two
signatures: one before erasure and one after erasure. Before this
commit, we checked if this was the case using `isAnyValSubtype`, but
this is too crude since primitive value classes are also subtypes of
`AnyVal` but do not change signature after erasure.

This commit replaces `isAnyValSubtype` by `isDerivedValueClass` which
excludes primitive value classes.

In practice, for an empty class, this reduces the size of the output of
`DefaultShowAPI` from 65 lines to 25 lines.
Before:
https://gist.github.com/smarter/cf1d6fe58efda88d6ee6#file-old-api
After:
https://gist.github.com/smarter/cf1d6fe58efda88d6ee6#file-new-api
2016-01-25 02:53:52 +01:00
Guillaume Martres 0993c1c7cc Always invalidate API when return type is a value class
Before this commit, we did not do the invalidation for methods with
multiple parameter list, the comment above `hasValueClassAsReturnType`
said:

  Note: We only inspect the "outermost type" (i.e. no recursion) because
  we don't need to inspect after erasure a function that would, for
  instance, return a function that returns a subtype of AnyVal.

But this is wrong: a method with signature:
  def foo(a: A)(b: B): C
is erased to:
  def foo(a: A, b: B): C
and not, as the comment in the code suggest, to:
  def foo(a: A): B => C
so we do need to inspect the final result type of methods, because they
can be value classes that will be erased to their underlying value.
2016-01-25 02:53:34 +01:00
Eugene Yokota e64b01142b Merge branch '0.13' into 0.13.10 2016-01-24 15:57:53 -08:00
eugene yokota 14dcca6a31 Merge pull request #2418 from Duhemm/fix-2411
Fix #2411
2016-01-24 15:56:21 -08:00
Martin Duhem 1ebe86b704 Restore compiler bridge source for Scala < 2.10 2016-01-24 18:54:03 +01:00
Martin Duhem a93f1e50c8 Add second test case for sbt/sbt#2411
Thanks @smarter, see sbt/sbt#2416
2016-01-24 09:42:01 +01:00
Adriaan Moors 49431eb6f8 determine bytecode type with transformedType
... not exitingPostErasure, as this phase-travel crashes the compile
(it's only really meant for going back in time, right?)
2016-01-24 09:31:53 +01:00
Eugene Yokota 27039e2b3c Reproduce #2411 2016-01-24 08:56:46 +01:00
Dale Wijnand 395851147c Merge pull request #2409 from dwijnand/tweak-0.13.10-notes
[0.13.10] Tweak the release notes
2016-01-23 02:51:37 +00:00
Dale Wijnand 26b9d9c1ab Notes: Collapse an improvement into its fix 2016-01-22 23:19:03 +00:00
Dale Wijnand 8a12edbfa0 Notes: Reword some passages 2016-01-22 23:18:31 +00:00
Dale Wijnand 899ac9eb98 Notes: Fix links 2016-01-22 23:14:27 +00:00
Dale Wijnand 223cb2632e Notes: Sort issues, move ivy/jline to the top 2016-01-22 23:11:43 +00:00
Eugene Yokota 06658661a1 Hand merged notes 2016-01-22 14:47:37 -05:00
eugene yokota afa8603ef7 Merge pull request #2407 from eed3si9n/wip/2347
Adds CompatibilityWarningOptions
2016-01-22 13:24:41 -05:00
Eugene Yokota a9dc9be83b Adds CompatibilityWarningOptions. Fixes #2347
This addresses 0.13.10 regression, which currently warns users about
Maven incompatibility on a private configuration. This adds a config
class so the build user can control the level of the warning as well as
the target configuration to be monitored.
By default, we are only going to look at `Compile` and `Runtime`.
2016-01-22 01:39:00 -05:00
Dale Wijnand 35aed2bc20 Merge pull request #2399 from timcharper/0.13
bugfix - apply autoImports for global plugins at global configuration stage
2016-01-19 06:41:08 +00:00
Tim Harper 7d86bc70d3 bugfix - apply autoImports for global plugins at global configuration stage
Previously, the autoimports for globally defined plugins were not
imported for global configuration files, although they were imported for
project configuration files.

This patch causes an additional plugin discovery phase to happen during
global config evaluation, so that auto-plugins can be detected and their
imports subsequently included.
2016-01-18 15:05:29 -07:00
Tim Harper d6c80ba1bd add notes on running tests 2016-01-18 15:02:23 -07:00
Tim Harper d86e52830e Amend contributing build instructions to help solve potential build problems 2016-01-18 00:41:25 -07:00
eugene yokota d9f10853fb Merge pull request #2371 from dwijnand/update-sbt-plugins
Upgrade sbt plugins. Fixes #2368
2016-01-16 03:11:17 -05:00
Dale Wijnand 84cba9669c Upgrade sbt plugins. Fixes #2368
Tested manually:

  $ grep 'version.*:=' build.sbt
  version := "0.13.10-SNAPSHOT",
  $ git archive --prefix=sbt-0.13.10-SNAPSHOT/ -o ~/Desktop/sbt-0.13.10-SNAPSHOT.tgz HEAD
  $ cd ~/Desktop
  $ ls
  sbt-0.13.10-SNAPSHOT.tgz
  $ tar xfz sbt-0.13.10-SNAPSHOT.tgz
  $ cd sbt-0.13.10-SNAPSHOT/
  $ sbt info
  [info] Loading global plugins from /Users/dnw/.dotfiles/.sbt/0.13/plugins
  [info] Loading project definition from /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project
  [info] Updating {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/}sbt-0-13-10-snapshot-build...
  [info] Resolving org.fusesource.jansi#jansi;1.4 ...
  [info] Done updating.
  [warn] There may be incompatibilities among your library dependencies.
  [warn] Here are some of the libraries that were evicted:
  [warn]  * com.typesafe.sbt:sbt-site:0.8.1 -> 0.8.2
  [warn] Run 'evicted' to see detailed eviction warnings
  [info] Compiling 12 Scala sources to /Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/project/target/scala-2.10/sbt-0.13/classes...
  [info] This is sbt 0.13.9
  [info] The current project is {file:/Users/dnw/Desktop/sbt-0.13.10-SNAPSHOT/}sbtRoot 0.13.10-SNAPSHOT
  [info] The current project is built against Scala 2.10.6
  [info] Available Plugins: sbt.plugins.IvyPlugin, sbt.plugins.JvmPlugin, sbt.plugins.CorePlugin...
  [info] sbt, sbt plugins, and build definitions are using Scala 2.10.5
2016-01-16 00:24:05 +00:00
eugene yokota a5bda9d80d Merge pull request #2354 from eed3si9n/wip/internal
Inter-project dependency tracking
2016-01-13 14:26:45 -05:00
Eugene Yokota c55c3ec966 Merge branch 'backport/internal-tracking' into wip/internal 2016-01-13 12:59:51 -05:00
Eugene Yokota 98b26ae5d3 Inter-project dependency tracking. Fixes #2266
Adds `trackInternalDependencies` and `exportToInternal` settings. These
can be used to control whether to trigger compilation of a dependent
subprojects when you call `compile`. Both keys will take one of three
values: `TrackLevel.NoTracking`, `TrackLevel.TrackIfMissing`, and
`TrackLevel.TrackAlways`. By default they are both set to
`TrackLevel.TrackAlways`.

When `trackInternalDependencies` is set to `TrackLevel.TrackIfMissing`,
sbt will no longer try to compile internal (inter-project) dependencies
automatically, unless there are no `*.class` files (or JAR file when
`exportJars` is `true`) in the output directory. When the setting is
set to `TrackLevel.NoTracking`, the compilation of internal
dependencies will be skipped. Note that the classpath will still be
appended, and dependency graph will still show them as dependencies.
The motivation is to save the I/O overhead of checking for the changes
on a build with many subprojects during development. Here's how to set
all subprojects to `TrackIfMissing`.

    lazy val root = (project in file(".")).
      aggregate(....).
      settings(
        inThisBuild(Seq(
          trackInternalDependencies := TrackLevel.TrackIfMissing,
          exportJars := true
        ))
      )

The `exportToInternal` setting allows the dependee subprojects to opt
out of the internal tracking, which might be useful if you want to
track most subprojects except for a few. The intersection of the
`trackInternalDependencies` and `exportToInternal` settings will be
used to determine the actual track level. Here's an example to opt-out
one project:

    lazy val dontTrackMe = (project in file("dontTrackMe")).
      settings(
        exportToInternal := TrackLevel.NoTracking
      )
2016-01-13 12:56:28 -05:00
eugene yokota 7e88edbc25 Merge pull request #2358 from gkossakowski/compileInterface-tests
Run unit tests from compileInterface on Travis CI.
2016-01-08 20:52:18 -05:00
Grzegorz Kossakowski dd0ed7de5e Fix DependencySpecification test.
This is a fixup of 0f616294c4.
That commit assumed that dealiasing is being done for types referred in
self type. It was changed to not do that but the test wasn't updated.
Unfortunately, that mistake slipped by during PR review because unit tests
of compileInterface were not ran (see #2358).
2016-01-09 00:00:14 +01:00
Grzegorz Kossakowski e738bc3f73 Run unit tests from compileInterface on Travis CI.
Also, make the intent of the env variable clearer in travis configuration.

Fixes #2357.
2016-01-08 21:53:53 +01:00
eugene yokota d06b49d66d Merge pull request #2355 from eed3si9n/wip/scripted-more-mem
Adds more memory to internal scripted task
2016-01-08 11:22:27 -05:00
Eugene Yokota a39a5d2330 Adds more memory to internal scripted task 2016-01-08 02:15:49 -05:00
eugene yokota f9dc203247 Merge pull request #2343 from sbt/topic/inc-comp-stable-self
Assorted incremental compiler bug fixes.
2016-01-07 11:54:45 -05:00
Eugene Yokota 83b725559f Fix notes 2016-01-06 22:12:01 -05:00
Eugene Yokota 5661b0fac4 Adds release note to #2343 2016-01-06 17:52:53 -05:00
Adriaan Moors 81786a2206 Prefix name hashing debug output with [naha]
Further categorize debug output as api diff ([diff]), and
invalidation ([inv]). Since we log a ton of diagnostics,
make it a bit easier to find the relevant bits.
2016-01-06 13:56:54 -05:00
Adriaan Moors 698902ba44 API limited to static annotations to mimic pickling
Since pickled annotated types and symbols only mention
static annotations, whereas compilation from source
sees all annotations, we must explicitly filter annotations
in the API representation using the same criteria as the pickler,
so that we generate the same API when compiling from source
as when we're loading classfiles.
2016-01-06 13:56:54 -05:00
Krzysztof Romanowski d32a0eaaa0 Exclude all non static annotations from ExtractAPI 2016-01-06 13:56:54 -05:00
Adriaan Moors 0f616294c4 Extract dependencies in one pass.
Also a bit more complete: handle SelectFromTypeTree,
consider the self type an inheritance dependency,
and flatten any refinement types in inherited types,
to get to the symbols of their parents, instead of the
useless symbol of the refinement class.

Include inheritance dependencies in regular ones

Also, update test to reflect the self type is now seen as an inheritance dependency.

self types are local, so don't treat them like inherited types

note inheritanceSymbols dealiases, where allSymbols is constructed differently

fix NPE in source-dependencies/macro-annotation
2016-01-06 13:56:54 -05:00
Adriaan Moors 8c73b2f221 Refactor mkStructure
Specialize two implementations for each value of the `inherit` boolean argument.
Also use a more direct way of distinguishing declared and inherited members.

backwards compat for source-dependencies/inherited-dependencies
2016-01-06 13:56:54 -05:00
Adriaan Moors 9346e2bb4d Only include all base types for class definitions
For refinement types, the Structure was already restricted
to declarations (and not inherited members), but all base types
were still included for a refinement's parents, which would
create unwieldy, and even erroneous (cyclic) types by expanding
all constituents of an intersection type to add all base types.

Since the logic already disregarded inherited members, it seems
logical to only include direct parents, and not all ancestor types.

```
class Dep {
  def bla(c: Boolean) = if (c) new Value else "bla"
}

class Value extends java.lang.Comparable[Value] { def compareTo(that: Value): Int = 1 }
```
2016-01-06 13:56:54 -05:00
Adriaan Moors 3e03e0d1b5 Clean up ShowApi implicit overload
Motivated because we want to make it more robust & configurable.
Original motivation was to diagnose a cyclic type representation,
likely due to an f-bounded existential type, as illustrated by the following:

```
class Dep {
  // The API representation for `bla`'s result type contains a cycle
  // (an existential's type variable's bound is the existential type itself)
  // This results in a stack overflow while showing the API diff.
  // Note that the actual result type in the compiler is not cyclic
  // (the f-bounded existential for Comparable is truncated)
  def bla(c: Boolean) = if (c) new Value else "bla"
}

class Value extends java.lang.Comparable[Value] { def compareTo(that: Value): Int = 1 }
```

Limit nesting (`-Dsbt.inc.apidiff.depth=N`, where N defaults to `2`),
and number of declarations shown for a class/structural type
(via `sbt.inc.apidiff.decls`, which defaults to `0` -- no limit).

Limiting nesting is crucial in keeping the size of api diffs of large programs
within a reasonable amount of RAM...

For example, compiling the Scala library, the API diff with nesting at `4`
exhausts 4G of RAM...
2016-01-06 13:56:54 -05:00
Adriaan Moors 51524055f7 Reduce memory usage of ExtractDependenciesTraverser 2016-01-06 13:56:54 -05:00
Adriaan Moors 1ce1123054 API only tracks declared type of self variable
The only aspect of the self variable that's relevant for
incremental compilation is its explicitly declared type,
and only when it's different from the type of the class that declares it.

Technically, any self type that's a super type of the class could be ignored,
as it cannot affect external use (instantiation/subclassing) of the class.
2016-01-06 13:56:54 -05:00
Adriaan Moors 214451c51f API extraction ensures class symbol is initialized
Call `initialize` in case symbol's `info` hadn't been completed
during normal compilation.

Also, normalize to the class symbol immediately.

Add a TODO regarding only looking at class symbols,
and thus ignoring the term symbol for objects,
as the corresponding class symbol has all the relevant info.
2016-01-06 13:56:54 -05:00
Dale Wijnand 5b7c55109e Merge pull request #2349 from gkossakowski/scripted-scala-version-cleanup
Upgrade Scala version in scripted tests
2016-01-06 03:51:04 +01:00
Grzegorz Kossakowski 8c9c61815a Upgrade Scala version in scripted tests
Both continuations and macro-config set scalaVersion explicitly but since
sbt relies now on Scala 2.10 it's not needed anymore. In particular, we
can upgrade continuations to 2.10 which makes it easier to work with Java
8.
2016-01-05 23:08:50 +01:00
eugene yokota f00f6fd541 Merge pull request #2344 from smarter/0.13-dotty
Make sbt aware of Dotty
2016-01-03 20:22:13 -05:00