summaryrefslogtreecommitdiff
path: root/test
Commit message (Collapse)AuthorAgeFilesLines
* Test case for SI-5183, tagged primitives in case classes (#5144)Ben Hutchison2016-05-192-0/+42
| | | Test for SI-7088, arrays containing tagged primitives
* Merge pull request #5176 from lrytz/t9671Lukas Rytz2016-05-193-16/+122
|\ | | | | SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to Object
| * SI-9066 fix null.asInstanceOf[Unit]Lukas Rytz2016-05-182-23/+23
| |
| * SI-9671, SI-7397 fix null.asInstanceOf[Int] when pt erases to ObjectLukas Rytz2016-05-183-10/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Erasure first replaces null.asInstanceOf[Int] by unbox(null). If the expected type erases to object, erasure then introduces a box operation, yielding box(unbox(null)). Note that this value is a box of zero, not null. Erasure has an optimization to replace box(unbox(x)) in case x is of primitive type. 60f1b4b extended this to the case when x is null, which is incorrect in general. The reason was to prevent creating a primitive box to be stored in the unused generic field when creating an instance of a specialized class. A special case ensures that this optimization is still performed.
* | Generate static forwarders for object members in companion interface (#5131)Jason Zaugg2016-05-193-0/+11
|/ | | | | | | | | | We used to disable generation of static forwarders when a object had a trait as a companion, as one could not add methods with bodies to an interface in JVM 6. The JVM lifted this restriction to support default methods in interfaces, so we can lift the restriction on static forwarders, too. Fixes https://github.com/scala/scala-dev/issues/59
* SI-8756 Fix generic signature for refinement of primitiveJason Zaugg2016-05-181-1/+1
| | | | | | | | | | | | Java generic signature generation was making the wrong assumption about how refinement types should erase to Java generics. This commit passes through the current value of `primitiveOk`, rather than forcing it to `true`. This flag is true when generating the signature for `f2`, but false in `i2` (as we are in a type argument position).
* SI-8756 Test to demonstrate the status quoJason Zaugg2016-05-182-0/+31
| | | | | | | | | Java generic signatures assume that refinement types should be boxed. Why did `g2` in the test seem to be immune to this bug demonstrated by `f2`? Because we opt to elide the generic signature altogether when no generics are involved.
* Merge pull request #5103 from ruippeixotog/improve-list-map-set-perfLukas Rytz2016-05-178-41/+112
|\ | | | | Improve performance and behavior of ListMap and ListSet
| * Add SerialVersionUID to ListSetRui Gonçalves2016-05-171-1/+3
| |
| * Make ListMap and ListSet implementations similarRui Gonçalves2016-05-172-4/+4
| | | | | | | | ListSet and ListMap are two collections which share the exact same internal structure. This commit makes the two approaches as similar as possible by renaming and reordering internal methods, improving their Scaladoc and their code style. The Scaladoc of the classes and companion objects is also improved in order to alert users of the time complexity of the collections' operations.
| * Improve performance and behavior of ListMap and ListSetRui Gonçalves2016-05-177-36/+105
| | | | | | | | | | | | | | | | Makes the immutable `ListMap` and `ListSet` collections more alike one another, both in their semantics and in their performance. In terms of semantics, makes the `ListSet` iterator return the elements in their insertion order, as `ListMap` already does. While, as mentioned in SI-8985, `ListMap` and `ListSet` doesn't seem to make any guarantees in terms of iteration order, I believe users expect `ListSet` and `ListMap` to behave in the same way, particularly when they are implemented in the exact same way. In terms of performance, `ListSet` has a custom builder that avoids creation in O(N^2) time. However, this significantly reduces its performance in the creation of small sets, as its requires the instantiation and usage of an auxilliary HashSet. As `ListMap` and `ListSet` are only suitable for small sizes do to their performance characteristics, the builder is removed, the default `SetBuilder` being used instead.
* | Merge remote-tracking branch 'origin/2.11.x' into ↵Jason Zaugg2016-05-174-4/+49
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | merge/2.11.x-to-2.12.x-20160517 Conflicts: build.sbt test/files/run/repl-javap-app.check test/files/run/repl-javap-app.scala
| * | SI-9740 Repl import fix -Yrepl-class-basedSom Snytt2016-05-026-73/+55
| | | | | | | | | | | | | | | | | | | | | Under `-Yrepl-class-based`, templating must follow the same scoping as under traditional object-based. The new test shows a typical case where two values of the same simple name must be imported in different scopes.
* | | Reduce boilerplate in compiler JUnit tests (#5158)Jason Zaugg2016-05-1625-258/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many JUnit tests share a compiler instance between all test cases in a class to reduce overhead. This commit refactors the mechanism to reduce the boilerplate. In the new scheme: - Using the `@ClassRule` hook in JUnit, we create a per-class map for each test class. - Per-class values are registered from the test class itself by calling `cached("someKey", () => mkExpensiveThing)` - At the end of the test, the entries in this map are `close()`-ed (if they implement `Closable`), and are released for garbage collection.)
* | | Merge pull request #5146 from som-snytt/issue/9045-msgLukas Rytz2016-05-135-3/+18
|\ \ \ | | | | | | | | SI-9045 Error on recursive ctor
| * | | SI-9045 Error on recursive ctorSom Snytt2016-05-045-3/+18
| | | | | | | | | | | | | | | | If the constructor invokes itself, say so.
* | | | Add check to scala REPL package to improve feedback about implicits (#5159)Jens2016-05-134-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the repl is started with additional compiler flags that prevent implicits being in scope (like -Yno-predef) the default message of implicits in scope using :implicits stays the same. This additional check will return the same message if predef is indeed in scope and an adjusted message if Predef is not in scope.
* | | | SI-9397 Add "_root_" to "GenUtils.scalaFactoryCall" to avoid the scala ↵Shixiong Zhu2016-05-111-0/+12
| | | | | | | | | | | | | | | | | | | | package name conflits (#5150) When a user imports some package ending with `scala`, the macro expansion of TypeTag may not work because it uses `scala.collection.immutable.List` but it's overrided. This patch adds the `_root_` prefix to avoid the scala package name conflits. Of cause, after this fix, importing a package ending with `_root_` has the same issue. However, people rarely do that.
* | | | SI-9666: Use inline group names in Regex (#4990)som-snytt2016-05-112-1/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delegate `Match group name` to the underlying `matcher`. If that fails, try explicit group names as a fall back. No attempt is made to correlate inline and explicit names. In the following case, either name is accepted: ``` new Regex("a(?<Bar>b*)c", "Bee") ``` But if names are reversed, the error is undetected: ``` new Regex("a(?<Bee>b*)(?<Bar>c)", "Bar", "Bee") ``` Throw IllegalArg on bad group name to be consistent with Java.
* | | | Merge pull request #5112 from lrytz/dropRecursiveClasspathJason Zaugg2016-05-056-254/+29
|\ \ \ \ | | | | | | | | | | Remove legacy recursive classpath implementation
| * | | | Remove abstraction layer in classpath implementationLukas Rytz2016-05-025-31/+25
| | | | |
| * | | | remove recursive classpath implementationLukas Rytz2016-04-235-226/+7
| | | | |
* | | | | Merge pull request #5132 from acdenhartog/patch-1Jason Zaugg2016-05-051-0/+7
|\ \ \ \ \ | | | | | | | | | | | | Avoid function chaining with reverse method
| * | | | | test PriorityQueue.reverseArno den Hartog2016-05-021-0/+7
| | | | | |
* | | | | | Merge pull request #5140 from lrytz/inlineDefaultMethodsJason Zaugg2016-05-053-12/+39
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | SD-140 inline the correct default method
| * | | | | SD-140 inline the correct default methodLukas Rytz2016-04-283-12/+39
| |/ / / / | | | | | | | | | | | | | | | | | | | | When inheriting multiple default methods, select the correct one to inline. Implements method resolution according to the JVM spec.
* | | | | Emit a warning when a constant expression evaluates to an ↵Olli Helenius2016-05-023-0/+8
| | | | | | | | | | | | | | | | | | | | ArithmeticException (#5123)
* | | | | SI-9752 never ignore blank lines when parsing code blocks (#5125)Antoine Gourlay2016-05-022-0/+33
| |_|_|/ |/| | | | | | | | | | | | | | | The default behavior when parsing the content of a tag text (like after `@example`) was to ignore empty lines. That's fine, except when we are in the middle of a code block, where preserving formatting matters.
* | | | Merge pull request #5094 from lrytz/classOfUnitAdriaan Moors2016-04-271-0/+12
|\ \ \ \ | |/ / / |/| | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]
| * | | Fix erasure for classOf[Unit], don't erase to classOf[BoxedUnit]Lukas Rytz2016-04-201-0/+12
| | | |
* | | | More efficient code for deciding if a mixin forwarder is needed (#5116)Lukas Rytz2016-04-254-0/+15
| | | | | | | | | | | | | | | | Also adds a warning on junit test methods that compile as default methods.
* | | | Merge pull request #5115 from lrytz/merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-254-0/+76
|\ \ \ \ | | | | | | | | | | Merge 2.11 to 2.12 apr 22
| * \ \ \ Merge commit '684c314' into merge-2.11-to-2.12-apr-22Lukas Rytz2016-04-224-0/+76
| |\ \ \ \ | | |_|/ / | |/| | / | | | |/ | | |/|
| | * | SI-9734 Narrow type when import REPL history (#5084)som-snytt2016-04-202-0/+40
| | | | | | | | | | | | | | | | | | | | Under `-Yrepl-class-based`, imports from historical `$read` instances must be singleton-typed so that path-dependent types remain so.
| | * | SI-9735 REPL prefer standard escapes for code text (#5086)som-snytt2016-04-202-0/+36
| | | | | | | | | | | | | | | | | | | | When constructing code text for compilation, the REPL should prefer standard escape sequences, in case unicode escapes are disabled.
| | * | SI-9488 - adds the same default toString format to Scala Futures as 2.12.xViktor Klang2016-03-221-2/+18
| | | | | | | | | | | | | | | | Includes tests to verify the toString representations.
* | | | Merge pull request #5109 from lrytz/pr5064Lukas Rytz2016-04-2340-65/+88
|\ \ \ \ | | | | | | | | | | SI-9684 Deprecate JavaConversions
| * | | | Rename the (deprecated) implicit conversion methods in JavaConversionsLukas Rytz2016-04-222-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide higher-priority implicit conversion methods whose names don't clash with methods in JavaConverters. This allows implicit conversions to work when importing both JavaConverters._ and JavaConversions._.
| * | | | SI-9684 Deprecate JavaConversionsSom Snytt2016-04-2238-65/+67
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implicit conversions are now in package convert as ImplicitConversions, ImplicitConversionsToScala and ImplicitConversionsToJava. Deprecated WrapAsJava, WrapAsScala and the values in package object. Improve documentation.
* / / / SI-9516 Fix the behavior of Int shift Long operations. (#5117)Sébastien Doeraene2016-04-231-0/+52
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In any shift operation where the lhs is an Int (or smaller) and the rhs is a Long, the result kind must be Int, and not Long. This is important because the lhs must *not* be promoted to a Long, as that causes an opcode for long shift to be emitted. This uses an rhs modulo 64, instead of int shifts which use an rhs module 32. Instead, the rhs must be downgraded to an Int. The new behavior is consistent with the same operations in the Java programming language.
* | | Merge pull request #5110 from sjrd/remove-duplicate-implem-of-hashcodesLukas Rytz2016-04-222-7/+6
|\ \ \ | |_|/ |/| | Remove the duplicate implem of hash codes for numbers.
| * | Remove the duplicate implem of hash codes for numbers.Sébastien Doeraene2016-04-213-15/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, there were two separate implementations of hash code for boxed number classes: * One in Statics, used by the codegen of case class methods. * One in ScalaRunTime + BoxesRunTime, used by everything else. This commit removes the variant implemented in ScalaRunTime + BoxesRunTime, and always uses Statics instead. We use Statics because the one from ScalaRunTime causes an unnecessary module load. The entry point ScalaRunTime.hash() is kept, as deprecated, for bootstrapping reasons.
| * | Bring Statics.doubleHash in sync with BoxesRunTime.hashFromDouble.Sébastien Doeraene2016-04-211-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The two algorithms were different, and could result in different hash codes for some values, namely, valid long values that were not also valid int values. The other two functions `longHash` and `floatHash` are rewritten to keep a common style with `doubleHash`, but their algorithm does not change.
* | | Merge pull request #5096 from lrytz/traitParentsLukas Rytz2016-04-2019-90/+363
|\ \ \ | | | | | | | | Ensure ClassBTypes constructed from symbol and classfile are identical
| * | | Ensure that lzycompute methods are entered into the scopeLukas Rytz2016-04-201-2/+14
| | | | | | | | | | | | | | | | | | | | For some reason this was not the case, leading to spurious inliner warnings (no inline info found for method O$lzycompute).
| * | | Ensure ClassBTypes constructed from symbol and classfile are identicalLukas Rytz2016-04-201-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A super call (invokespecial) to a default method T.m is only allowed if the interface T is a direct parent of the class. Super calls are introduced for example in Mixin when generating forwarder methods: trait T { override def clone(): Object = "hi" } trait U extends T class C extends U The class C gets a forwarder that invokes T.clone(). During code generation the interface T is added as direct parent to class C. Note that T is not a (direct) parent in the frontend type of class C. This commit stores interfaces that are added to a class during code generation in the InlineInfo classfile attribute. This allows filtering the interface list when constructing a ClassBType from a classfile.
| * | | Clean up code gen for method invocationsLukas Rytz2016-04-204-7/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code was patched many times in the history and became a bit scattered. When emitting a virtual call, the receiver in the bytecode cannot just be the method's owner (the class in which it is declared), because that class may not be accessible at the callsite. Instead we use the type of the receiver. This was basically done to fix - aladdin bug 455 (9954eaf) - SI-1430 (0bea2ab) - basically the same bug, slightly different - SI-4283 (8707c9e) - the same for field reads In this patch we extend the fix to field writes, and clean up the code. This patch basically reverts 6eb55d4b, the fix for SI-4560, which was rather a workaround than a fix. The underlying problem was that in some cases, in a method invocation `foo.bar()`, the method `bar` was not actually a member of `foo.tpe`, causing a NoSuchMethodErrors. The issue was related to trait implementation classes. The idea of the fix was to check, at code-gen time, `foo.tpe.member("bar")`, and if that returns `NoSymbol`, use `barSym.owner`. With the new trait encoding the underlying problem seems to be fixed - all tests still pass (run/t4560.scala and run/t4560b.scala).
| * | | Move test run/origins.scala to pendingLukas Rytz2016-04-123-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It tests an internal debugging tool which does not appear to work as intented. If anyone can compile and run that test and get an output that looks like the check file, I'd be interested to know. Origins does not seem to support the kind of stack traces that scalac currently emits.
| * | | SD-98 don't emit unnecessary mixin forwardersLukas Rytz2016-04-1211-54/+188
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In most cases when a class inherits a concrete method from a trait we don't need to generate a forwarder to the default method in the class. t5148 is moved to pos as it compiles without error now. the error message ("missing or invalid dependency") is still tested by t6440b.
| * | | Rewrite JUnit tests to avoid `@Test` methods in traitsLukas Rytz2016-04-121-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JUnit 4 does not support running `@Test` methods defined as default methods in parent interfaces. JUnit 5 will, but is not yet available. Currently scalac emits a forwarder to every trait method inherited by a class, so tests are correctly executed. The fix for SD-98 will change this.
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 13:23:45 +0000