diff options
author | Paul Phillips <paulp@improving.org> | 2013-08-15 15:02:18 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-08-17 08:21:43 -0700 |
commit | 2a31f0a76b7c388d4be6d0d9dc642d455f91beca (patch) | |
tree | 6ebac6476f1e326ad097864397e2449f0d9ae552 | |
parent | 44b4dcfc959d1305b96b21cc73a8e74aea865fa0 (diff) | |
download | scala-2a31f0a76b7c388d4be6d0d9dc642d455f91beca.tar.gz scala-2a31f0a76b7c388d4be6d0d9dc642d455f91beca.tar.bz2 scala-2a31f0a76b7c388d4be6d0d9dc642d455f91beca.zip |
Pushed some noisy logging down to debuglog.
4 files changed, 11 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/CompilationUnits.scala b/src/compiler/scala/tools/nsc/CompilationUnits.scala index efe436f004..f7437e4e6c 100644 --- a/src/compiler/scala/tools/nsc/CompilationUnits.scala +++ b/src/compiler/scala/tools/nsc/CompilationUnits.scala @@ -91,7 +91,7 @@ trait CompilationUnits { self: Global => debuglog(s"removing synthetic $sym from $self") map -= sym } - def get(sym: Symbol): Option[Tree] = logResultIf[Option[Tree]](s"found synthetic for $sym in $self", _.isDefined) { + def get(sym: Symbol): Option[Tree] = debuglogResultIf[Option[Tree]](s"found synthetic for $sym in $self", _.isDefined) { map get sym } def keys: Iterable[Symbol] = map.keys diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala index 454c9db73c..14e3f5b642 100644 --- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala +++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala @@ -659,14 +659,14 @@ abstract class ClassfileParser { } accept('>') assert(xs.length > 0, tp) - logResult("new existential")(newExistentialType(existentials.toList, typeRef(pre, classSym, xs.toList))) + debuglogResult("new existential")(newExistentialType(existentials.toList, typeRef(pre, classSym, xs.toList))) } // isMonomorphicType is false if the info is incomplete, as it usually is here // so have to check unsafeTypeParams.isEmpty before worrying about raw type case below, // or we'll create a boatload of needless existentials. else if (classSym.isMonomorphicType || classSym.unsafeTypeParams.isEmpty) tp // raw type - existentially quantify all type parameters - else logResult(s"raw type from $classSym")(unsafeClassExistentialType(classSym)) + else debuglogResult(s"raw type from $classSym")(unsafeClassExistentialType(classSym)) case tp => assert(sig.charAt(index) != '<', s"sig=$sig, index=$index, tp=$tp") tp diff --git a/src/reflect/scala/reflect/internal/SymbolTable.scala b/src/reflect/scala/reflect/internal/SymbolTable.scala index c340670635..afe2e41c3e 100644 --- a/src/reflect/scala/reflect/internal/SymbolTable.scala +++ b/src/reflect/scala/reflect/internal/SymbolTable.scala @@ -111,6 +111,13 @@ abstract class SymbolTable extends macros.Universe result } + @inline + final private[scala] def debuglogResultIf[T](msg: => String, cond: T => Boolean)(result: T): T = { + if (cond(result)) + debuglog(msg + ": " + result) + + result + } // For too long have we suffered in order to sort NAMES. // I'm pretty sure there's a reasonable default for that. diff --git a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala index bebc419c7c..e73e0a542c 100644 --- a/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala +++ b/src/reflect/scala/reflect/internal/tpe/TypeMaps.scala @@ -395,7 +395,7 @@ private[internal] trait TypeMaps { s"Widened lone occurrence of $tp1 inside existential to $word bound" } if (!repl.typeSymbol.isBottomClass && count == 1 && !containsTypeParam) - logResult(msg)(repl) + debuglogResult(msg)(repl) else tp1 case _ => |