Commit Graph

557 Commits

Author SHA1 Message Date
Jason Zaugg 7d4890b68a Avoid CCE when scalac internally uses compileLate. Fixes #2452
For example, when the `--sourcepath` option is provided
and the refchecks phase compiles an annotation found
on a referenced symbol from the sourcepath.

`compileLate` assumes that all non-sentinel compiler
phases can be down cast to `GlobalPhase`.

This commit changes the two phases in SBT to extend
this instead of `Phase`. This has the knock on benefit
of simplifying the phases by letting the `GlobalPhase.run`
iterator over the list of compilation units and feed them
to us one by one.

I checked that the test case failed before making each
change.
2016-02-11 16:29:09 -05:00
eugene yokota d3962a01ff Merge pull request #2441 from Duhemm/wip/fix-2436
Include ONLY nonpublic vars in API hash of traits
2016-02-10 16:26:54 -05:00
Martin Duhem 6576844698 Hash of traits: include private fields, objects and super accessors 2016-02-10 18:15:44 +01:00
Martin Duhem 7d94251108 Also include private vals 2016-02-09 14:55:30 +01:00
Martin Duhem 8e17269c97 Include non-public vars in API hash of traits 2016-02-09 14:35:12 +01:00
Martin Duhem be8ba763fa Include ONLY non-public members in API hash of traits
The previous logic was wrong and included all members of traits in their
API hash, which degraded the performance of the incremental compiler.

This commit changes this logic so that only the non-public members of
traits are included into their API hash.

Fixes #2436
2016-02-04 16:32:36 +01:00
Antonio Cunei 3e50fdc825 Do not create dir, if trying to output classes to a jar 2016-02-04 15:11:55 +01: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
Martin Duhem 1ebe86b704 Restore compiler bridge source for Scala < 2.10 2016-01-24 18:54:03 +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
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
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
Guillaume Martres 10265efd9c Make sbt aware of Dotty
This small set of changes, together with the compiler-bridge I wrote
(https://github.com/smarter/dotty-bridge) enables us to compile code
using Dotty in sbt, see https://github.com/smarter/dotty-example-project
for an example.
2016-01-03 20:35:29 +01:00
Grzegorz Kossakowski bad824c0b1 Do not compute name hashes for private members.
The NameHashing classes assumed that extracted API data structure have
private members filtered out already. That assumption was wrong and
resulted in bug #2324.

We fix the bug by simply reusing the same logic as used by SameAPI class.

Fixes #2324.
2015-12-18 14:32:43 -08:00
Grzegorz Kossakowski 81c0d3daa9 Document ExtractAPI's handling of private members.
Mention that private members are being extracted and included in the api
structures but ignored in many other parts of incremental compiler. I've
made a mistake of assuming that private members are ignored at api
extraction time. This manifested itself as bug #2324.
2015-12-18 14:14:11 -08:00
Grzegorz Kossakowski ae2ddab009 Add pending test for #2324 (name hashes of private members)
Add a pending test that shows a bug in calculation of name hashes.
By design, only non-private members should contribute to name hashes. The
test shows that name hashes are calcuclated for strictly private members
too.
2015-12-18 14:05:00 -08:00
eugene yokota d3cb46951b Merge pull request #2261 from Duhemm/fix-1171
Consider signatures of methods before and after erasure in ExtractAPI
2015-12-16 13:24:42 -05:00
Martin Duhem 69411c1876 Fix issues with Codacy 2015-11-12 18:50:03 +01:00
Martin Duhem a8d644eb45 Merge branch '0.13' into fix-1968 2015-11-12 09:15:47 +01:00
eugene yokota 222623071a Merge pull request #2271 from Duhemm/fix-2228
Report failed compilation if errors are registered.
2015-11-12 02:14:08 -05:00
Martin Duhem a244f4e141 Fix Codacy failure by specifying return type 2015-11-11 14:49:50 +01:00
Martin Duhem d125a36b6c Parse javac non-compile-errors in JavaErrorParser
Upon startup, javac may report errors because (for instance) because it
received incorrect flags. These errors were not correctly parsed by the
JavaErrorParser and were never reported to the user.

This commit fixes this problem by adding a new parsing rule in
JavaErrorParser: errors that start with the prefix "javac:" are now
correctly parsed and reported to the user.

Fixes sbt/sbt#2256
2015-11-11 14:33:30 +01:00
Martin Duhem 7af0fea54e Don't pass `-J<flag>` option to local Java compiler
These options can only be given to a forked Java compiler. If we run a
local java compiler, we filter these options out and emit a warning.

Fixes sbt/sbt#1968
2015-11-11 14:33:16 +01:00
Martin Duhem 4a4a3ca94e Report failed compilation if errors are registered.
In some cases, the local java compiler may report compilation errors,
but succeed in compiling the source files (for instance, if there are
encoding problems in the source). However, the command line javac will
report a failed compilation on the same input.

To have the local java compiler behave like the forked java compiler, we
now report the compilation as failed if error messages have been
registered during compilation.

Fixes sbt/sbt#2228
2015-11-11 14:21:54 +01:00
Stu Hood 9fbbaab58e Add a test that we`re able to parse inner classes. 2015-11-10 14:45:04 -08:00
Martin Duhem f5e7fdd62a Restore source compatibility with Scala 2.8 2015-11-09 16:30:11 +01:00
Martin Duhem bfc27f1179 Make sure AnyVal is involved before checking post erasure 2015-11-07 09:06:26 +01:00
Martin Duhem d41fda6584 Restore source compatibility with Scala 2.8 + cosmetic changes 2015-11-06 13:11:13 +01:00
Martin Duhem 499c5e7228 Correct fix against SO and macros problem 2015-11-06 11:27:40 +01:00
Martin Duhem f1c05cb5eb Fix source compatibility with Scala < 2.10 2015-11-05 09:26:38 +01:00
Martin Duhem 4299ff76aa Quick and dirty fix for SO 2015-11-05 07:39:50 +01:00
Martin Duhem 9764b7f6ef Don't inspect signatures post erasure if macros are involved 2015-11-04 17:45:08 +01:00
Martin Duhem 111511dc6d `afterPostErasure` didn't exist in 2.9 2015-11-04 15:04:59 +01:00
Martin Duhem efff171618 Restore source compatibility with Scala 2.11 2015-11-04 13:35:53 +01:00
Martin Duhem 46058029b5 Consider signatures of method before and after erasure in ExtractAPI
The signatures of methods that have value classes as arguments or return
type change during the erasure phase. Because we only registered
signatures before the erasure, we missed some API changes when a class
was changed to a value class (or a value class changed to a class).

This commit fixes this problem by recording the signatures of method
before and after erasure.

Fixes sbt/sbt#1171
2015-11-04 11:16:53 +01:00
Stu Hood 5a3b95cd6d Add support for parsing system classes. 2015-09-18 16:37:22 -07:00
fkorotkov cf8d7fbdff Use getPosition method to get an offset position instead of using line number 2015-09-10 16:35:09 -07:00
Martin Duhem 92ea782d94 Fix deprecation messages 2015-09-04 12:25:59 +02:00
Martin Duhem 152b040fe3 Rename binary form of compiler bridge
This will avoid all clashes between modules that may have the same name
as other components of sbt, or two different compiler bridges that would
happen to have the same name.
2015-09-04 12:23:06 +02:00
Martin Duhem 1c4a900ff5 Retrieve compiler bridge sources in temp directory
Note that they won't be downloaded again, because the component compiler
will look for a previously-compiled version of the compiler bridge
before trying to fetch the sources again. If they've already been
downlaoded, then they have been compiled and a compiled version of the
compiler bridge already exists.
2015-09-04 12:00:44 +02:00