diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2012-09-26 16:35:05 +0200 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2012-09-26 16:35:05 +0200 |
| commit | 53cd235eacb53c3c15d9c6dbf965f708ea7fdc0d (patch) | |
| tree | 27ed60fb64cbe900d8dfb7aac80cb580b5df7fff /src | |
| parent | 1682c0df76280dbb56e452b6e914db5e24c79daf (diff) | |
| download | scala-53cd235eacb53c3c15d9c6dbf965f708ea7fdc0d.tar.gz scala-53cd235eacb53c3c15d9c6dbf965f708ea7fdc0d.tar.bz2 scala-53cd235eacb53c3c15d9c6dbf965f708ea7fdc0d.zip | |
Don't call `updateInfo` during typing.
We resort to `setInfo`, basically removing the previous info. This "fixes" a possible race condition
in typing ModuleDefs by making the typer always 'win'. See the assertion stack trace in SI-6429.
Diffstat (limited to 'src')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Symbols.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Symbols.scala b/src/reflect/scala/reflect/internal/Symbols.scala index a0e28bf735..a2632fdd4a 100644 --- a/src/reflect/scala/reflect/internal/Symbols.scala +++ b/src/reflect/scala/reflect/internal/Symbols.scala @@ -1469,7 +1469,7 @@ trait Symbols extends api.Symbols { self: SymbolTable => def makeSerializable() { info match { case ci @ ClassInfoType(_, _, _) => - updateInfo(ci.copy(parents = ci.parents :+ SerializableClass.tpe)) + setInfo(ci.copy(parents = ci.parents :+ SerializableClass.tpe)) case i => abort("Only ClassInfoTypes can be made serializable: "+ i) } |